upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-10 10:21:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #43192 from nextcloud/backport/42794/stable28

Browse source 
[stable28] fix(Request): Catch exceptions in `isTrustedProxy`
This commit is contained in:
Ferdinand Thiessen 2024-02-01 12:16:51 +01:00 committed by GitHub
commit 6bdee0564e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/AppFramework/Http/Request.php
View file

@ -573,7 +573,14 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @return boolean true if $remoteAddress matches any entry in $trustedProxies, false otherwise
*/
protected function isTrustedProxy($trustedProxies, $remoteAddress) {
return IpUtils::checkIp($remoteAddress, $trustedProxies);
try {
return IpUtils::checkIp($remoteAddress, $trustedProxies);
} catch (\Throwable) {
// We can not log to our log here as the logger is using `getRemoteAddress` which uses the function, so we would have a cyclic dependency
// Reaching this line means `trustedProxies` is in invalid format.
error_log('Nextcloud trustedProxies has malformed entries');
return false;
}
}
/**