diff --git a/src/CachetCoreServiceProvider.php b/src/CachetCoreServiceProvider.php index e80dbe38..66c53c95 100644 --- a/src/CachetCoreServiceProvider.php +++ b/src/CachetCoreServiceProvider.php @@ -39,6 +39,7 @@ use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Foundation\Application; use Illuminate\Foundation\Console\AboutCommand; +use Illuminate\Http\Middleware\TrustProxies; use Illuminate\Routing\Router; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Event; @@ -81,6 +82,18 @@ private function configureSettingsCache(): void } } + /** + * Configure Laravel to respect forwarded request headers from Cachet's trusted proxies. + */ + private function configureTrustedProxies(): void + { + $trustedProxies = config('cachet.trusted_proxies'); + + if ($trustedProxies) { + TrustProxies::at($trustedProxies); + } + } + /** * Bootstrap any application services. */ @@ -90,6 +103,8 @@ public function boot(): void $this->mergeConfigFrom(__DIR__.'/../config/cachet.php', 'cachet'); } + $this->configureTrustedProxies(); + Route::middlewareGroup('cachet', config('cachet.middleware', [])); Route::middlewareGroup('cachet:api', config('cachet.api_middleware', [])); Route::middlewareGroup('cachet:mcp', config('cachet.mcp_middleware', [])); diff --git a/tests/Feature/TrustedProxiesTest.php b/tests/Feature/TrustedProxiesTest.php new file mode 100644 index 00000000..74d8f47f --- /dev/null +++ b/tests/Feature/TrustedProxiesTest.php @@ -0,0 +1,40 @@ +set('cachet.trusted_proxies', '*'); + } + + #[DefineEnvironment('trustAllProxies')] + public function test_it_respects_the_forwarded_scheme_from_trusted_proxies(): void + { + $request = Request::create('/', server: [ + 'HTTP_X_FORWARDED_PROTO' => 'https', + 'REMOTE_ADDR' => '127.0.0.1', + ]); + + app(TrustProxies::class)->handle($request, function (Request $request): Response { + $this->assertTrue($request->isSecure()); + + return new Response; + }); + } +}