From 586a8c1b37fb58ebcbca0f95a8f8167a4d91b76d Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Tue, 13 May 2025 11:01:10 +0100
Subject: [PATCH] Fix config issue

---
 app/Http/Middleware/TrustProxies.php | 25 +++++++++++++++++++++++++
 bootstrap/app.php                    |  3 ++-
 routes/middleware.php                |  0
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Middleware/TrustProxies.php
 create mode 100644 routes/middleware.php

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
new file mode 100644
index 00000000..00d266b7
--- /dev/null
+++ b/app/Http/Middleware/TrustProxies.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Middleware\TrustProxies as LaravelTrustProxies;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class TrustProxies extends LaravelTrustProxies
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (config('cachet.trusted_proxies')) {
+            LaravelTrustProxies::at(explode(',', config('cachet.trusted_proxies')));
+        }
+
+        return parent::handle($request, $next);
+    }
+}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 7a91fe70..b9f19126 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use App\Http\Middleware\TrustProxies;
 use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
@@ -26,7 +27,7 @@ return Application::configure(basePath: dirname(__DIR__))
     ->withMiddleware(function (Middleware $middleware) {
         $middleware->redirectGuestsTo(fn () => route('login'));
         $middleware->redirectUsersTo(AppServiceProvider::HOME);
-        $middleware->trustProxies(at: explode(',', config('cachet.trusted_proxies')));
+        $middleware->append(TrustProxies::class);
 
         $middleware->throttleApi();
     })
diff --git a/routes/middleware.php b/routes/middleware.php
new file mode 100644
index 00000000..e69de29b