Made it possible to configure proxies via env

In reference to #146

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 69fcbe943bbb825647a5be958b1ead653d7217cd..c3102571da2b0d515f87a7c5f42e2373c306c7b2 100644 (file)
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Middleware;
 
 
 namespace BookStack\Http\Middleware;
 

+use Closure;

 use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
 
 use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
 


@@ -26,4 +27,21 @@ class TrustProxies extends Middleware
         Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
         Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
     ];
         Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
         Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
     ];

+
+    /**
+     * Handle the request, Set the correct user-configured proxy information.
+     * @param Request $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $setProxies = config('app.proxies');
+        if ($setProxies !== '**' && $setProxies !== '*' && $setProxies !== '') {
+            $setProxies = explode(',', $setProxies);
+        }
+        $this->proxies = $setProxies;
+
+        return parent::handle($request, $next);
+    }

 }
 }

diff --git a/config/app.php b/config/app.php
index d8def5c957ea66a25df41701144faa19a163b65b..3be50b6c59d28655c9fd82380f88156bef4b93e9 100755 (executable)
--- a/config/app.php
+++ b/config/app.php
@@ -234,4 +234,6 @@ return [
 
     ],
 
 
     ],
 

+    'proxies' => env('APP_PROXIES', ''),
+

 ];
 ];