Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions app/Console/Commands/PurgeSecurityProbeEvents.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?php

namespace App\Console\Commands;

use App\Event;
use App\Rules\NotReservedEmailDomain;
use App\User;
use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Builder;

/**
* Soft-delete leftover security/probe test activities and their probe users.
*
* Matches reserved test email TLDs (.invalid, .test, .example, .localhost)
* and known CW probe title/description markers from authorized testing.
*
* Usage:
* php artisan events:purge-security-probes
* php artisan events:purge-security-probes --delete
* php artisan events:purge-security-probes --delete --users
*/
class PurgeSecurityProbeEvents extends Command
{
protected $signature = 'events:purge-security-probes
{--delete : Soft-delete matched events (default: dry-run)}
{--users : Also soft-delete users whose email uses a reserved test domain}';

protected $description = 'Soft-delete security/probe test activities (and optionally probe users) that use reserved .invalid/.test email domains.';

public function handle(): int
{
$shouldDelete = (bool) $this->option('delete');
$purgeUsers = (bool) $this->option('users');

$this->info(sprintf(
'Scanning for security probe events… (mode: %s)',
$shouldDelete ? 'DELETE' : 'DRY-RUN'
));

$eventsQuery = $this->probeEventsQuery();
$count = (clone $eventsQuery)->count();

$this->info("Matched events: {$count}");

if ($count > 0) {
(clone $eventsQuery)
->orderBy('id')
->limit(50)
->get(['id', 'title', 'user_email', 'country_iso', 'status'])
->each(function (Event $event): void {
$this->line(sprintf(
' #%d [%s] %s <%s> (%s)',
$event->id,
$event->status,
$event->title,
$event->user_email,
$event->country_iso
));
});

if ($count > 50) {
$this->line(' … and '.($count - 50).' more');
}
}

if ($shouldDelete && $count > 0) {
// Soft-delete without firing organizer notification emails.
$deleted = $eventsQuery->delete();
$this->info("Soft-deleted events: {$deleted}");
} elseif (! $shouldDelete) {
$this->comment('Dry-run only. Re-run with --delete to soft-delete.');
}

if ($purgeUsers) {
$usersQuery = User::query()->where(function (Builder $query): void {
foreach (NotReservedEmailDomain::RESERVED_TLDS as $tld) {
$query->orWhere('email', 'like', '%.'.$tld);
}
});

$userCount = (clone $usersQuery)->count();
$this->info("Matched probe users: {$userCount}");

if ($shouldDelete && $userCount > 0) {
$deletedUsers = $usersQuery->delete();
$this->info("Soft-deleted users: {$deletedUsers}");
} elseif (! $shouldDelete) {
$this->comment('Dry-run only for users. Re-run with --delete --users to soft-delete.');
}
}

return self::SUCCESS;
}

private function probeEventsQuery(): Builder
{
return Event::query()->where(function (Builder $query): void {
foreach (NotReservedEmailDomain::RESERVED_TLDS as $tld) {
$query->orWhere('user_email', 'like', '%.'.$tld);
}

$query->orWhere('title', 'like', 'CW Probe%')
->orWhere('title', 'like', 'CW pending probe%')
->orWhere('title', 'like', 'CW marker test%')
->orWhere('title', 'like', 'CW Probe Create%')
->orWhere('description', 'like', '%authorized security testing%')
->orWhere('description', 'like', '%cwmark benign%')
->orWhere('description', 'like', '%Benign baseline description for tester probe%');
});
}
}
3 changes: 2 additions & 1 deletion app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use App\Rules\NotReservedEmailDomain;
use App\User;
use Illuminate\Auth\Events\Registered;
use Illuminate\Foundation\Auth\RegistersUsers;
Expand Down Expand Up @@ -49,7 +50,7 @@ protected function validator(array $data): \Illuminate\Contracts\Validation\Vali
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'email' => ['required', 'string', 'email', 'max:255', 'unique:users', new NotReservedEmailDomain],
'password' => ['required', 'string', 'confirmed', Password::defaults()],
'privacy' => 'required',
]);
Expand Down
3 changes: 2 additions & 1 deletion app/Http/Controllers/ContactFormController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Controllers;

use App\Rules\NotReservedEmailDomain;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Log;
Expand All @@ -22,7 +23,7 @@ public function submit(Request $request)
$validated = $request->validate([
'first_name' => 'required|string|max:255',
'last_name' => 'required|string|max:255',
'email' => 'required|email|max:255',
'email' => ['required', 'email', 'max:255', new NotReservedEmailDomain],
'phone' => 'nullable|string|max:50',
'subject' => 'required|string',
'message' => 'required|string',
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Requests/EventRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Requests;

use App\Rules\NotReservedEmailDomain;
use App\Rules\validAudience;
use App\Rules\validTheme;
use Illuminate\Foundation\Http\FormRequest;
Expand Down Expand Up @@ -45,7 +46,7 @@ public function rules(): array
'ages' => 'required',
'is_extracurricular_event' => 'required|boolean',
'country_iso' => 'required|exists:countries,iso',
'user_email' => 'required',
'user_email' => ['required', 'email', 'max:255', new NotReservedEmailDomain],
'organizer_type' => 'required',
'leading_teacher_tag' => 'nullable',

Expand Down Expand Up @@ -82,6 +83,7 @@ public function messages(): array
'event_url.url' => 'The activity\'s web page address should be a valid URL.',
'event_url.required' => 'The activity\'s web page is required for online activities.',
'user_email.required' => 'Please enter a valid email address.',
'user_email.email' => 'Please enter a valid email address.',
];
}

Expand Down
59 changes: 59 additions & 0 deletions app/Rules/NotReservedEmailDomain.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php

namespace App\Rules;

use Closure;
use Illuminate\Contracts\Validation\ValidationRule;

/**
* Rejects emails on RFC 2606 / RFC 6761 reserved testing domains
* (.invalid, .test, .example, .localhost) so probe accounts cannot
* create pending activities that land in ambassador moderation queues.
*/
class NotReservedEmailDomain implements ValidationRule
{
public const RESERVED_TLDS = [
'invalid',
'test',
'example',
'localhost',
];

public function validate(string $attribute, mixed $value, Closure $fail): void
{
if ($value === null || $value === '') {
return;
}

$email = strtolower(trim((string) $value));
$at = strrpos($email, '@');

if ($at === false) {
return;
}

$domain = substr($email, $at + 1);
$labels = explode('.', $domain);
$tld = end($labels);

if ($tld !== false && in_array($tld, self::RESERVED_TLDS, true)) {
$fail('Please enter a real email address. Test domains are not allowed.');
}
}

public static function matches(string $email): bool
{
$email = strtolower(trim($email));
$at = strrpos($email, '@');

if ($at === false) {
return false;
}

$domain = substr($email, $at + 1);
$labels = explode('.', $domain);
$tld = end($labels);

return $tld !== false && in_array($tld, self::RESERVED_TLDS, true);
}
}
7 changes: 7 additions & 0 deletions tests/Feature/CreateEventTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,13 @@ public function event_should_have_a_description(): void

}

#[Test]
public function event_rejects_reserved_test_email_domains(): void
{
$this->publishEvent(['user_email' => 'cwprobe@cwprobe.invalid'])
->assertSessionHasErrors('user_email');
}

#[Test]
public function event_should_get_valid_slug(): void
{
Expand Down
45 changes: 45 additions & 0 deletions tests/Feature/PurgeSecurityProbeEventsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Tests\Feature;

use App\Event;
use App\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use PHPUnit\Framework\Attributes\Test;
use Tests\TestCase;

final class PurgeSecurityProbeEventsTest extends TestCase
{
use DatabaseMigrations;

#[Test]
public function it_soft_deletes_probe_events_and_users(): void
{
$probeUser = User::factory()->create(['email' => 'cwtester@cwprobe.invalid']);
$realUser = User::factory()->create(['email' => 'teacher@school.be']);

$probeEvent = Event::factory()->create([
'title' => 'CW Probe Event 123',
'user_email' => 'cwtester@cwprobe.invalid',
'description' => 'Benign test activity for authorized security testing.',
'status' => 'PENDING',
'creator_id' => $probeUser->id,
]);

$realEvent = Event::factory()->create([
'title' => 'Real Belgium coding club',
'user_email' => 'teacher@school.be',
'description' => 'A real workshop for students.',
'status' => 'PENDING',
'creator_id' => $realUser->id,
]);

$this->artisan('events:purge-security-probes', ['--delete' => true, '--users' => true])
->assertSuccessful();

$this->assertSoftDeleted($probeEvent);
$this->assertDatabaseHas('events', ['id' => $realEvent->id, 'deleted_at' => null]);
$this->assertSoftDeleted($probeUser);
$this->assertDatabaseHas('users', ['id' => $realUser->id, 'deleted_at' => null]);
}
}
61 changes: 61 additions & 0 deletions tests/Unit/Rules/NotReservedEmailDomainTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php

namespace Tests\Unit\Rules;

use App\Rules\NotReservedEmailDomain;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use Tests\TestCase;

final class NotReservedEmailDomainTest extends TestCase
{
#[Test]
#[DataProvider('reservedEmails')]
public function it_rejects_reserved_test_domains(string $email): void
{
$this->assertTrue(NotReservedEmailDomain::matches($email));

$failed = false;
(new NotReservedEmailDomain)->validate('email', $email, function () use (&$failed): void {
$failed = true;
});

$this->assertTrue($failed);
}

#[Test]
#[DataProvider('allowedEmails')]
public function it_allows_normal_email_domains(string $email): void
{
$this->assertFalse(NotReservedEmailDomain::matches($email));

$failed = false;
(new NotReservedEmailDomain)->validate('email', $email, function () use (&$failed): void {
$failed = true;
});

$this->assertFalse($failed);
}

public static function reservedEmails(): array
{
return [
['cwtester@example.invalid'],
['tester.massassign@codeweek-test.invalid'],
['probe@cwprobe.invalid'],
['user@something.test'],
['user@foo.example'],
['user@localhost'],
];
}

public static function allowedEmails(): array
{
return [
['teacher@school.be'],
['organiser@codeweek.eu'],
['person@example.com'],
['person@gmail.com'],
];
}
}
Loading