diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index a973d14e83..bc358ef83a 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -45,6 +45,6 @@ class TrustProxies extends Middleware */ public function __construct() { - $this->proxies = (string) config('firefly.trusted_proxies'); + $this->proxies = (string) config('trustedproxy.proxies'); } } diff --git a/bootstrap/app.php b/bootstrap/app.php index 2775d481f6..18fc942dda 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -33,6 +33,7 @@ use FireflyIII\Http\Middleware\Range; use FireflyIII\Http\Middleware\RedirectIfAuthenticated; use FireflyIII\Http\Middleware\SecureHeaders; use FireflyIII\Http\Middleware\StartFireflySession; +use FireflyIII\Http\Middleware\TrustProxies; use FireflyIII\Http\Middleware\VerifyCsrfToken; use Illuminate\Contracts\Debug\ExceptionHandler; use Illuminate\Contracts\Http\Kernel; @@ -95,7 +96,6 @@ $app = Application::configure(basePath: dirname(__DIR__)) health : '/up', ) ->withMiddleware(function (Middleware $middleware): void { - $middleware->trustProxies(at: envNonEmpty('TRUSTED_PROXIES', '')); // overrule the standard middleware $middleware->use( [ @@ -106,6 +106,7 @@ $app = Application::configure(basePath: dirname(__DIR__)) TrimStrings::class, ConvertEmptyStringsToNull::class, SecureHeaders::class, + TrustProxies::class, ] );