diff options
author | Daniel Kesselberg <mail@danielkesselberg.de> | 2019-02-17 21:55:55 +0100 |
---|---|---|
committer | Daniel Kesselberg <mail@danielkesselberg.de> | 2019-02-17 23:53:06 +0100 |
commit | 600bc222975cb8ec41c0191150e5d0ec9ebd51d0 (patch) | |
tree | 7386ebe78337d019104c614965f2a8a9c6344385 /settings | |
parent | a80bae398ab2dd5683ca7c80eb7648e5c3dce426 (diff) | |
download | nextcloud-server-600bc222975cb8ec41c0191150e5d0ec9ebd51d0.tar.gz nextcloud-server-600bc222975cb8ec41c0191150e5d0ec9ebd51d0.zip |
Warning if x-forwarded-host present but trusted_proxies empty
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'settings')
-rw-r--r-- | settings/Controller/CheckSetupController.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index d21874e025d..920bf59ea55 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -289,9 +289,14 @@ class CheckSetupController extends Controller { $trustedProxies = $this->config->getSystemValue('trusted_proxies', []); $remoteAddress = $this->request->getHeader('REMOTE_ADDR'); - if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies)) { + if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host')) { + return false; + } + + if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) { return $remoteAddress !== $this->request->getRemoteAddress(); } + // either not enabled or working correctly return true; } |