From fa706e5080a6c94bf0a2d2077ce20468ac09eb21 Mon Sep 17 00:00:00 2001 From: Lars Date: Sun, 15 Nov 2026 09:53:44 +0100 Subject: [PATCH] =?UTF-8?q?Halte=20die=20Anmeldung=20auf=20der=20im=20Brow?= =?UTF-8?q?ser=20ge=C3=B6ffneten=20Adresse.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .../IgnoreEmptyForwardedHeaders.php | 31 +++++++++++++ app/Http/Middleware/SanitizeIntendedUrl.php | 43 +++++++++++++++++++ app/Providers/Filament/AdminPanelProvider.php | 2 + bootstrap/app.php | 4 ++ docker/nginx/default.conf | 4 +- docs/betrieb/MVP-Stand.md | 2 +- tests/Feature/AdministrationTest.php | 36 ++++++++++++++++ 7 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 app/Http/Middleware/IgnoreEmptyForwardedHeaders.php create mode 100644 app/Http/Middleware/SanitizeIntendedUrl.php diff --git a/app/Http/Middleware/IgnoreEmptyForwardedHeaders.php b/app/Http/Middleware/IgnoreEmptyForwardedHeaders.php new file mode 100644 index 0000000..51f8294 --- /dev/null +++ b/app/Http/Middleware/IgnoreEmptyForwardedHeaders.php @@ -0,0 +1,31 @@ +headers->has($header)) { + continue; + } + + if (trim((string) $request->headers->get($header)) === '') { + $request->headers->remove($header); + } + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/SanitizeIntendedUrl.php b/app/Http/Middleware/SanitizeIntendedUrl.php new file mode 100644 index 0000000..90e50d7 --- /dev/null +++ b/app/Http/Middleware/SanitizeIntendedUrl.php @@ -0,0 +1,43 @@ +session()->get('url.intended'); + + if (is_string($intended) && ! $this->matchesOpenedHost($intended, $request)) { + $request->session()->forget('url.intended'); + } + + return $next($request); + } + + private function matchesOpenedHost(string $url, Request $request): bool + { + if ($url === '' || filter_var($url, FILTER_VALIDATE_URL) === false) { + return str_starts_with($url, '/'); + } + + $host = parse_url($url, PHP_URL_HOST); + + if (! is_string($host) || strcasecmp($host, $request->getHost()) !== 0) { + return false; + } + + $port = parse_url($url, PHP_URL_PORT); + $requestPort = (int) $request->getPort(); + + if ($port !== null) { + return (int) $port === $requestPort; + } + + return in_array($requestPort, [80, 443], true); + } +} diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index dfe9c5a..db30764 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -2,6 +2,7 @@ namespace App\Providers\Filament; +use App\Http\Middleware\SanitizeIntendedUrl; use Filament\Auth\MultiFactor\App\AppAuthentication; use Filament\Http\Middleware\Authenticate; use Filament\Http\Middleware\AuthenticateSession; @@ -49,6 +50,7 @@ public function panel(Panel $panel): Panel EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, + SanitizeIntendedUrl::class, AuthenticateSession::class, ShareErrorsFromSession::class, PreventRequestForgery::class, diff --git a/bootstrap/app.php b/bootstrap/app.php index c4409d5..82e1084 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -1,5 +1,7 @@ trustProxies(at: '*'); $middleware->prepend(UseStaffSessionCookie::class); $middleware->prepend(UseRequestRootUrl::class); + $middleware->prepend(IgnoreEmptyForwardedHeaders::class); + $middleware->web(append: SanitizeIntendedUrl::class); $middleware->redirectGuestsTo(function (Request $request) { if ($request->is('verwaltung', 'verwaltung/*')) { return '/verwaltung/login'; diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 5b7fc36..dca4e51 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -19,8 +19,8 @@ server { set $forwarded_proto $scheme; } fastcgi_param HTTP_X_FORWARDED_PROTO $forwarded_proto; - fastcgi_param HTTP_X_FORWARDED_HOST $http_x_forwarded_host; - fastcgi_param HTTP_X_FORWARDED_PORT $http_x_forwarded_port; + fastcgi_param HTTP_X_FORWARDED_HOST $http_x_forwarded_host if_not_empty; + fastcgi_param HTTP_X_FORWARDED_PORT $http_x_forwarded_port if_not_empty; fastcgi_param HTTP_X_FORWARDED_FOR $proxy_add_x_forwarded_for; fastcgi_read_timeout 120s; } diff --git a/docs/betrieb/MVP-Stand.md b/docs/betrieb/MVP-Stand.md index 0bbfdb9..a037d48 100644 --- a/docs/betrieb/MVP-Stand.md +++ b/docs/betrieb/MVP-Stand.md @@ -13,7 +13,7 @@ ## Bedienbar Der Systemverwalter vergibt diese Rollen und kann sie dem eigenen Konto geben. Ein Konto darf mehrere Rollen tragen. -Auf der Testinstanz steht `APP_URL` noch auf dem Platzhalter. Solange das so ist, baut die Anwendung Links aus der Adresse, die der Browser tatsächlich geöffnet hat. +Auf der Testinstanz steht `APP_URL` noch auf dem Platzhalter. Solange das so ist, baut die Anwendung Links aus der Adresse, die der Browser tatsächlich geöffnet hat. Ein Zugriff direkt über die IP, ohne Reverse Proxy, bleibt dabei auf dieser Adresse; die Anmeldung springt nicht auf `verwaltung/` als Host. ## Testdaten diff --git a/tests/Feature/AdministrationTest.php b/tests/Feature/AdministrationTest.php index 9d1c391..34edb10 100644 --- a/tests/Feature/AdministrationTest.php +++ b/tests/Feature/AdministrationTest.php @@ -14,6 +14,42 @@ class AdministrationTest extends TestCase { use RefreshDatabase; + public function test_guest_redirect_keeps_the_address_opened_in_the_browser(): void + { + config(['app.url' => 'https://CHANGE-ME.example']); + + $response = $this->withHeaders([ + 'X-Forwarded-Host' => '', + 'X-Forwarded-Port' => '', + 'X-Forwarded-Proto' => '', + ])->get('http://192.168.2.144:3011/verwaltung'); + + $response->assertRedirect('http://192.168.2.144:3011/verwaltung/login'); + + $intended = session('url.intended'); + $this->assertIsString($intended); + $this->assertSame('192.168.2.144', parse_url($intended, PHP_URL_HOST)); + $this->assertSame(3011, parse_url($intended, PHP_URL_PORT)); + $this->assertSame('/verwaltung', parse_url($intended, PHP_URL_PATH)); + } + + public function test_login_drops_an_intended_address_that_leaves_the_opened_host(): void + { + config(['app.url' => 'https://CHANGE-ME.example']); + + $this->withSession(['url.intended' => 'http:///verwaltung']) + ->get('http://192.168.2.144:3011/verwaltung/login') + ->assertOk(); + + $this->assertNull(session('url.intended')); + + $this->withSession(['url.intended' => 'http://192.168.2.144:3011/verwaltung']) + ->get('http://192.168.2.144:3011/verwaltung/login') + ->assertOk(); + + $this->assertSame('http://192.168.2.144:3011/verwaltung', session('url.intended')); + } + public function test_guests_and_members_cannot_open_the_administration(): void { $this->get('/verwaltung')->assertRedirect('/verwaltung/login');