Simplify TRUSTED_PROXIES and TRUSTED_HOSTS config (#115)

acasademont · andig · commit dac6439b9624 · 2018-07-27T17:18:33.000+02:00
diff --git a/Bootstraps/Symfony.php b/Bootstraps/Symfony.php
@@ -80,11 +80,11 @@ public function getApplication()
             $app->booted = true;
         }, $app);
 
-        if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : false) {
+        if ($trustedProxies = getenv('TRUSTED_PROXIES'])) {
             Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
         }
 
-        if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : false) {
+        if ($trustedHosts = getenv('TRUSTED_HOSTS'])) {
             Request::setTrustedHosts(explode(',', $trustedHosts));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ public function getApplication()`
`80`	`80`	`$app->booted = true;`
`81`	`81`	`}, $app);`
`82`	`82`
`83`		`- if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : false) {`
	`83`	`+ if ($trustedProxies = getenv('TRUSTED_PROXIES'])) {`
`84`	`84`	`Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);`
`85`	`85`	`}`
`86`	`86`
`87`		`- if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : false) {`
	`87`	`+ if ($trustedHosts = getenv('TRUSTED_HOSTS'])) {`
`88`	`88`	`Request::setTrustedHosts(explode(',', $trustedHosts));`
`89`	`89`	`}`
`90`	`90`