aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2021-02-13 18:03:32 +0100
committerGitHub <noreply@github.com>2021-02-13 18:03:32 +0100
commit7d8e9baa77b2df4523b5dc3b9455e3b73864b966 (patch)
tree8422f5bf8c6ac471197461f784fe187411b0978d /apps/settings/lib
parent24d4c3eeab5ddd492569a7328227eb2bb75bf080 (diff)
downloadnextcloud-server-7d8e9baa77b2df4523b5dc3b9455e3b73864b966.tar.gz
nextcloud-server-7d8e9baa77b2df4523b5dc3b9455e3b73864b966.zip
Revert "use the configured forwarded headers for the setup check"
Diffstat (limited to 'apps/settings/lib')
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 47a55591a46..d732b137199 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -309,14 +309,7 @@ class CheckSetupController extends Controller {
$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
$remoteAddress = $this->request->getHeader('REMOTE_ADDR');
- $forwardedForHeaders = $this->config->getSystemValue('forwarded_for_headers', [
- 'HTTP_X_FORWARDED_FOR'
- ]);
- $hasForwardedHeaderSet = array_reduce($forwardedForHeaders, function($set, $header) {
- return $set || ($this->request->getHeader($header) !== '');
- }, false);
-
- if (empty($trustedProxies) && $hasForwardedHeaderSet) {
+ if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
return false;
}