Merge pull request #3660 from CachetHQ/trusted-proxy-env-fix

Fix use of env
cachethq · Jun 24, 2019 · 342be3d · 342be3d
2 parents 5bb38fd + a3bbeb5
commit 342be3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -13,6 +13,7 @@
 
 use Fideloper\Proxy\TrustProxies as Middleware;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 
 /**
  * This is the trust proxies middleware class.
@@ -42,6 +43,8 @@ class TrustProxies extends Middleware
      */
     public function __construct()
     {
-        $this->proxies = empty(env('TRUSTED_PROXIES')) ? '*' : explode(',', trim(env('TRUSTED_PROXIES')));
+        $proxies = Config::get('trustedproxies.proxies');
+
+        $this->proxies = empty($proxies) ? '*' : explode(',', trim($proxies));
     }
 }
diff --git a/config/trustedproxy.php b/config/trustedproxy.php
@@ -24,7 +24,7 @@
      * of your proxy (e.g. if using ELB or similar).
      *
      */
-    'proxies' => null, // [<ip addresses>,], '*'
+    'proxies' => env('TRUSTED_PROXIES'), // [<ip addresses>,], '*'
 
     /*
      * To trust one or more specific proxies that connect