From 5554434663a71c0572f021017472bb8a559da79a Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Thu, 17 Nov 2022 18:29:50 +0100
Subject: [PATCH] bootstrap/app.php: use Fideloper\Proxy\TrustProxies instead
 of App\Http\Middleware\TrustedProxiesMiddleware

---
 .../Middleware/TrustedProxiesMiddleware.php   | 29 -------------------
 bootstrap/app.php                             |  3 +-
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 app/Http/Middleware/TrustedProxiesMiddleware.php

diff --git a/app/Http/Middleware/TrustedProxiesMiddleware.php b/app/Http/Middleware/TrustedProxiesMiddleware.php
deleted file mode 100644
index 704a976..0000000
--- a/app/Http/Middleware/TrustedProxiesMiddleware.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Request;
-
-class TrustedProxiesMiddleware
-{
-    /**
-     *  use 0.0.0.0/0 if you trust any proxy, otherwise replace it with your proxy ips
-     *
-     * @var string[]
-     */
-    protected $trustedProxies = [
-        '0.0.0.0/0'
-    ];
-
-    protected $headers =
-        Request::HEADER_X_FORWARDED_FOR |
-        Request::HEADER_X_FORWARDED_HOST |
-        Request::HEADER_X_FORWARDED_PORT |
-        Request::HEADER_X_FORWARDED_PROTO |
-        Request::HEADER_X_FORWARDED_AWS_ELB;
-
-    public function handle(Request $request, \Closure $next){
-        Request::setTrustedProxies($this->trustedProxies, $this->headers);
-        return $next($request);
-    }
-}
\ No newline at end of file
diff --git a/bootstrap/app.php b/bootstrap/app.php
index c53d70c..8fc8c4d 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -73,7 +73,7 @@ $app->configure('app');
 */
 
 $app->middleware([
-    App\Http\Middleware\TrustedProxiesMiddleware::class
+    Fideloper\Proxy\TrustProxies::class,
 ]);
 
 // $app->routeMiddleware([
@@ -92,6 +92,7 @@ $app->middleware([
 */
 
 $app->register(App\Providers\AppServiceProvider::class);
+$app->register(Fideloper\Proxy\TrustedProxyServiceProvider::class);
 
 /*
 |--------------------------------------------------------------------------