diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-03-26 18:38:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 18:38:45 +0100 |
| commit | 5100c7eb6a120ef389628e6c294822566620fe00 (patch) | |
| tree | ede6eef101d0cae213b70868e872c20ad896826a /apps | |
| parent | f8d1487dcdd0c9b5f41b1e65447d1ff70dd141d8 (diff) | |
| parent | 14addf3fdbebe77329d04dabcf1240e79292476c (diff) | |
| download | nextcloud-server-5100c7eb6a120ef389628e6c294822566620fe00.tar.gz nextcloud-server-5100c7eb6a120ef389628e6c294822566620fe00.zip | |
Merge pull request #44483 from nextcloud/fix/setup-check-validate-trusted-proxies
fix(settings): Also verify that `trusted_proxies` only contains IP addresses (with range)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/SetupChecks/ForwardedForHeaders.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/settings/lib/SetupChecks/ForwardedForHeaders.php b/apps/settings/lib/SetupChecks/ForwardedForHeaders.php index daf84e265af..98252c31247 100644 --- a/apps/settings/lib/SetupChecks/ForwardedForHeaders.php +++ b/apps/settings/lib/SetupChecks/ForwardedForHeaders.php @@ -59,6 +59,16 @@ class ForwardedForHeaders implements ISetupCheck { 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 */ |