added routes for zip export

[bookstack] / app / Http / Middleware / TrustProxies.php

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 73c11a82769d861ed0ab1793bd7eb7473466d74b..0fe0247b829e8b4412dcbd42888c1f05bac60708 100644 (file)
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -3,7 +3,7 @@
 namespace BookStack\Http\Middleware;
 
 use Closure;
 namespace BookStack\Http\Middleware;
 
 use Closure;

-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;

 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware


@@ -16,25 +16,21 @@ class TrustProxies extends Middleware
     protected $proxies;
 
     /**
     protected $proxies;
 
     /**

-     * The current proxy header mappings.
+     * The headers that should be used to detect proxies.

      *
      *

-     * @var array
+     * @var int

      */
      */

-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
+    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;

 
     /**
      * Handle the request, Set the correct user-configured proxy information.
 
     /**
      * Handle the request, Set the correct user-configured proxy information.

+     *

      * @param Request $request
      * @param Closure $next
      * @param Request $request
      * @param Closure $next

+     *

      * @return mixed
      */
      * @return mixed
      */

-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)

     {
         $setProxies = config('app.proxies');
         if ($setProxies !== '**' && $setProxies !== '*' && $setProxies !== '') {
     {
         $setProxies = config('app.proxies');
         if ($setProxies !== '**' && $setProxies !== '*' && $setProxies !== '') {