Merge pull request #44495 from nextcloud/backport/44483/stable28

nextcloud · Apr 17, 2024 · c4370b6 · c4370b6
2 parents 66abfb4 + 3203db8
commit c4370b6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/apps/settings/lib/SetupChecks/ForwardedForHeaders.php b/apps/settings/lib/SetupChecks/ForwardedForHeaders.php
@@ -59,6 +59,16 @@ public function run(): SetupResult {
 			return SetupResult::error($this->l10n->t('Your "trusted_proxies" setting is not correctly set, it should be an array.'));
 		}
 
+		foreach ($trustedProxies as $proxy) {
+			$addressParts = explode('/', $proxy, 2);
+			if (filter_var($addressParts[0], FILTER_VALIDATE_IP) === false || !ctype_digit($addressParts[1] ?? '24')) {
+				return SetupResult::error(
+					$this->l10n->t('Your "trusted_proxies" setting is not correctly set, it should be an array of IP addresses - optionally with range in CIDR notation.'),
+					$this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+				);
+			}
+		}
+
 		if (($remoteAddress === '') && ($detectedRemoteAddress === '')) {
 			if (\OC::$CLI) {
 				/* We were called from CLI */