From 1291859c545d4677c608660568a8c4dffefa5f29 Mon Sep 17 00:00:00 2001 From: bernardhanna Date: Tue, 17 Nov 2026 13:49:44 +0000 Subject: [PATCH] Block reserved test email domains from activities and signups. Stops security-probe accounts (.invalid/.test/.example/.localhost) from landing in ambassador moderation queues, and adds a purge command for leftovers. Co-authored-by: Cursor --- .../Commands/PurgeSecurityProbeEvents.php | 111 ++++++++++++++++++ .../Controllers/Auth/RegisterController.php | 3 +- .../Controllers/ContactFormController.php | 3 +- app/Http/Requests/EventRequest.php | 4 +- app/Rules/NotReservedEmailDomain.php | 59 ++++++++++ tests/Feature/CreateEventTest.php | 7 ++ .../Feature/PurgeSecurityProbeEventsTest.php | 45 +++++++ .../Unit/Rules/NotReservedEmailDomainTest.php | 61 ++++++++++ 8 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 app/Console/Commands/PurgeSecurityProbeEvents.php create mode 100644 app/Rules/NotReservedEmailDomain.php create mode 100644 tests/Feature/PurgeSecurityProbeEventsTest.php create mode 100644 tests/Unit/Rules/NotReservedEmailDomainTest.php diff --git a/app/Console/Commands/PurgeSecurityProbeEvents.php b/app/Console/Commands/PurgeSecurityProbeEvents.php new file mode 100644 index 000000000..f2033c46d --- /dev/null +++ b/app/Console/Commands/PurgeSecurityProbeEvents.php @@ -0,0 +1,111 @@ +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%'); + }); + } +} diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index a219ad12b..16f2c08fa 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -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; @@ -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', ]); diff --git a/app/Http/Controllers/ContactFormController.php b/app/Http/Controllers/ContactFormController.php index 7068672a5..e7afba142 100644 --- a/app/Http/Controllers/ContactFormController.php +++ b/app/Http/Controllers/ContactFormController.php @@ -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; @@ -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', diff --git a/app/Http/Requests/EventRequest.php b/app/Http/Requests/EventRequest.php index 2914d922c..76af28287 100644 --- a/app/Http/Requests/EventRequest.php +++ b/app/Http/Requests/EventRequest.php @@ -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; @@ -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', @@ -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.', ]; } diff --git a/app/Rules/NotReservedEmailDomain.php b/app/Rules/NotReservedEmailDomain.php new file mode 100644 index 000000000..7796f7fe4 --- /dev/null +++ b/app/Rules/NotReservedEmailDomain.php @@ -0,0 +1,59 @@ +publishEvent(['user_email' => 'cwprobe@cwprobe.invalid']) + ->assertSessionHasErrors('user_email'); + } + #[Test] public function event_should_get_valid_slug(): void { diff --git a/tests/Feature/PurgeSecurityProbeEventsTest.php b/tests/Feature/PurgeSecurityProbeEventsTest.php new file mode 100644 index 000000000..6c8607703 --- /dev/null +++ b/tests/Feature/PurgeSecurityProbeEventsTest.php @@ -0,0 +1,45 @@ +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]); + } +} diff --git a/tests/Unit/Rules/NotReservedEmailDomainTest.php b/tests/Unit/Rules/NotReservedEmailDomainTest.php new file mode 100644 index 000000000..eda5f39a7 --- /dev/null +++ b/tests/Unit/Rules/NotReservedEmailDomainTest.php @@ -0,0 +1,61 @@ +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'], + ]; + } +}