From f58a3c94831510f28c3f185ed61084c984bc7d6f Mon Sep 17 00:00:00 2001 From: Roscoe Date: Tue, 24 Feb 2026 23:36:14 +0000 Subject: [PATCH 1/3] use custom header for guestbook IP --- app/Http/Controllers/GuestbookController.php | 10 ++++++++-- app/Models/GuestbookEntry.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GuestbookController.php b/app/Http/Controllers/GuestbookController.php index ab00a11..4c40405 100644 --- a/app/Http/Controllers/GuestbookController.php +++ b/app/Http/Controllers/GuestbookController.php @@ -35,14 +35,20 @@ public function addEntry(Request $request): RedirectResponse { ->from(new Address("wah@wah.moe", "wah dot moe")) ->to(new Address("roscoe@wah.moe", "Roscoe D. Wah")) ->subject("New Guestbook Entry!") + ->category("Guestbook entry") ->html(' - + -
Name:'.htmlentities($newEntry->name).'
IP:'.$newEntry->ip.'
Agent:'.htmlentities($newEntry->agent).'
Message:'.htmlentities($newEntry->message).'
'); +') + ->text('Name: '.htmlentities($newEntry->name). + 'IP: '.$newEntry->ip. + 'Agent: '.htmlentities($newEntry->agent). + 'Message: '.htmlentities($newEntry->message) + ); MailtrapClient::initSendingEmails( apiKey: config('services.mailtrap-sdk.apiKey') diff --git a/app/Models/GuestbookEntry.php b/app/Models/GuestbookEntry.php index fda1c4b..96d5529 100644 --- a/app/Models/GuestbookEntry.php +++ b/app/Models/GuestbookEntry.php @@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry { $newEntry = new GuestbookEntry; $newEntry->name = $request->get('name'); $newEntry->message = $request->get('message'); - $newEntry->ip = $request->header('X-Forwarded-For') ?: $request->ip(); + $newEntry->ip = $request->header('X-Pandur-IP') ?: $request->ip(); $newEntry->agent = $request->userAgent(); $newEntry->flagged = true; $newEntry->save(); From bf38e8b7312664733cede433f4a5cdb1a879a1c8 Mon Sep 17 00:00:00 2001 From: Roscoe Date: Tue, 24 Feb 2026 23:50:50 +0000 Subject: [PATCH 2/3] Revert "use custom header for guestbook IP" This reverts commit f58a3c94831510f28c3f185ed61084c984bc7d6f. --- app/Http/Controllers/GuestbookController.php | 10 ++-------- app/Models/GuestbookEntry.php | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/GuestbookController.php b/app/Http/Controllers/GuestbookController.php index 4c40405..ab00a11 100644 --- a/app/Http/Controllers/GuestbookController.php +++ b/app/Http/Controllers/GuestbookController.php @@ -35,20 +35,14 @@ public function addEntry(Request $request): RedirectResponse { ->from(new Address("wah@wah.moe", "wah dot moe")) ->to(new Address("roscoe@wah.moe", "Roscoe D. Wah")) ->subject("New Guestbook Entry!") - ->category("Guestbook entry") ->html(' - + -
Name:'.htmlentities($newEntry->name).'
IP:'.$newEntry->ip.'
Agent:'.htmlentities($newEntry->agent).'
Message:'.htmlentities($newEntry->message).'
') - ->text('Name: '.htmlentities($newEntry->name). - 'IP: '.$newEntry->ip. - 'Agent: '.htmlentities($newEntry->agent). - 'Message: '.htmlentities($newEntry->message) - ); +'); MailtrapClient::initSendingEmails( apiKey: config('services.mailtrap-sdk.apiKey') diff --git a/app/Models/GuestbookEntry.php b/app/Models/GuestbookEntry.php index 96d5529..fda1c4b 100644 --- a/app/Models/GuestbookEntry.php +++ b/app/Models/GuestbookEntry.php @@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry { $newEntry = new GuestbookEntry; $newEntry->name = $request->get('name'); $newEntry->message = $request->get('message'); - $newEntry->ip = $request->header('X-Pandur-IP') ?: $request->ip(); + $newEntry->ip = $request->header('X-Forwarded-For') ?: $request->ip(); $newEntry->agent = $request->userAgent(); $newEntry->flagged = true; $newEntry->save(); From 218f22959684e6c06f113cffd8c65f547d362314 Mon Sep 17 00:00:00 2001 From: Roscoe Date: Tue, 24 Feb 2026 23:51:35 +0000 Subject: [PATCH 3/3] Default to 0.0.0.0 if IP header not found --- app/Models/GuestbookEntry.php | 2 +- config/app.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/GuestbookEntry.php b/app/Models/GuestbookEntry.php index fda1c4b..2228530 100644 --- a/app/Models/GuestbookEntry.php +++ b/app/Models/GuestbookEntry.php @@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry { $newEntry = new GuestbookEntry; $newEntry->name = $request->get('name'); $newEntry->message = $request->get('message'); - $newEntry->ip = $request->header('X-Forwarded-For') ?: $request->ip(); + $newEntry->ip = $request->header('X-Forwarded-For') ?: '0.0.0.0'; $newEntry->agent = $request->userAgent(); $newEntry->flagged = true; $newEntry->save(); diff --git a/config/app.php b/config/app.php index 4197b42..2809204 100644 --- a/config/app.php +++ b/config/app.php @@ -5,7 +5,7 @@ return [ 'name' => env('APP_NAME', 'wah.moe'), - 'version' => '2026.02.24', + 'version' => '2026.02.24-patch0', 'env' => env('APP_ENV', 'production'), 'debug' => (bool)env('APP_DEBUG', false), 'url' => env('APP_URL', 'http://localhost'),