From 3c34f4af280bd58afedcfbb844fa5463a5dd7383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Sat, 14 Nov 2026 22:35:08 +0100 Subject: [PATCH] fix(http): restrict trusted proxy headers to Traefik and prefer X-Real-Ip --- app/Providers/AppServiceProvider.php | 6 ++ bootstrap/middlewares.php | 5 +- .../App/Http/Middleware/TrustProxiesTest.php | 57 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/Feature/App/Http/Middleware/TrustProxiesTest.php diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index aa512299..ae83cce6 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -47,6 +47,12 @@ class AppServiceProvider extends ServiceProvider ); $this->app->singleton('clientIp', function () { + $realIp = request()->header('X-Real-Ip'); + + if (\is_string($realIp) && \filter_var($realIp, \FILTER_VALIDATE_IP) !== false) { + return $realIp; + } + return request()->ip() ?? request()->getClientIp(); }); diff --git a/bootstrap/middlewares.php b/bootstrap/middlewares.php index c0a5e3e2..c5dc5e15 100644 --- a/bootstrap/middlewares.php +++ b/bootstrap/middlewares.php @@ -57,7 +57,10 @@ $redirectUsers = function (Request $request) { }; return function (Middleware $middleware) use ($redirectGuests, $redirectUsers): void { - $middleware->trustProxies(at: '*'); + $middleware->trustProxies( + at: '*', + headers: Request::HEADER_X_FORWARDED_TRAEFIK, + ); $middleware->redirectGuestsTo($redirectGuests); $middleware->redirectUsersTo($redirectUsers); diff --git a/tests/Feature/App/Http/Middleware/TrustProxiesTest.php b/tests/Feature/App/Http/Middleware/TrustProxiesTest.php new file mode 100644 index 00000000..cf002000 --- /dev/null +++ b/tests/Feature/App/Http/Middleware/TrustProxiesTest.php @@ -0,0 +1,57 @@ + '203.0.113.42', + 'HTTP_X_FORWARDED_FOR' => '198.51.100.10', + ]); + $this->app->instance('request', $request); + $this->app->forgetInstance('clientIp'); + + // WHEN + $clientIp = $this->app->make('clientIp'); + + // THEN + expect($clientIp)->toBe('203.0.113.42'); + }); + + it('falls back to request ip when X-Real-Ip is invalid or absent', function (): void { + // GIVEN + /** @var \Tests\TestCase $this */ + $request = Request::create('/', 'GET', [], [], [], [ + 'HTTP_X_REAL_IP' => 'not-an-ip', + 'REMOTE_ADDR' => '198.51.100.25', + ]); + $this->app->instance('request', $request); + $this->app->forgetInstance('clientIp'); + + // WHEN + $clientIp = $this->app->make('clientIp'); + + // THEN + expect($clientIp)->toBe('198.51.100.25'); + }); + + it('trusts X-Forwarded-For and ignores RFC 7239 Forwarded header', function (): void { + // GIVEN + /** @var \Tests\TestCase $this */ + $response = $this->withHeaders([ + 'X-Forwarded-For' => '203.0.113.99', + 'Forwarded' => 'for=198.51.100.77', + ])->get('/'); + + // WHEN + $resolvedIp = request()->ip(); + + // THEN + $response->assertStatus(200); + expect($resolvedIp)->toBe('203.0.113.99'); + }); +});