Merge pull request #25605 from nextcloud/trusted-proxy-warning-localhost

rullzer · web-flow · commit bd2e6309b5b7 · 2021-04-01T13:27:26.000+02:00
dont show trusted proxy warning when the proxy and remote are both localhost
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -319,7 +319,7 @@ private function forwardedForHeadersWorking() {
 			return false;
 		}
 
-		if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) {
+		if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true) && $remoteAddress !== '127.0.0.1') {
 			return $remoteAddress !== $this->request->getRemoteAddress();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ private function forwardedForHeadersWorking() {`
`319`	`319`	`return false;`
`320`	`320`	`}`
`321`	`321`
`322`		`- if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) {`
	`322`	`+ if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true) && $remoteAddress !== '127.0.0.1') {`
`323`	`323`	`return $remoteAddress !== $this->request->getRemoteAddress();`
`324`	`324`	`}`
`325`	`325`