lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix use of env
This commit is contained in:
James Brooks
2019-06-24 18:57:43 +01:00
committed by GitHub
parent 5bb38fddfc a3bbeb541e
commit 342be3d756
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Middleware/TrustProxies.php
View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware; use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Config;
/** /**
* This is the trust proxies middleware class. * This is the trust proxies middleware class.
@@ -42,6 +43,8 @@ class TrustProxies extends Middleware
*/ */
public function __construct() 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));
} }
} }

2
config/trustedproxy.php
View File

@@ -24,7 +24,7 @@ return [
* of your proxy (e.g. if using ELB or similar). * 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 * To trust one or more specific proxies that connect