diff options
author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-06-28 11:35:45 +0200 |
---|---|---|
committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2022-07-26 09:42:32 +0000 |
commit | 1d0ddcfca1b5c8391ee910dbb7127c94b8082e74 (patch) | |
tree | 32f663c892a13c9698926e2f13a9bffd1004a241 | |
parent | 7ab50248dc12c43cd920af283b554120d9496963 (diff) | |
download | nextcloud-server-1d0ddcfca1b5c8391ee910dbb7127c94b8082e74.tar.gz nextcloud-server-1d0ddcfca1b5c8391ee910dbb7127c94b8082e74.zip |
Refactor local IP if and set strict to true for in_array
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r-- | lib/private/Http/Client/LocalAddressChecker.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php index b233f34b19c..749a1a97c8a 100644 --- a/lib/private/Http/Client/LocalAddressChecker.php +++ b/lib/private/Http/Client/LocalAddressChecker.php @@ -36,13 +36,13 @@ class LocalAddressChecker { } public function ThrowIfLocalIp(string $ip) : void { - if ((bool)filter_var($ip, FILTER_VALIDATE_IP) && !filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { - $this->logger->warning("Host $ip was not connected to because it violates local access rules"); - throw new LocalServerException('Host violates local access rules'); - } - $localIps = ['100.100.100.200']; - if ((bool)filter_var($ip, FILTER_VALIDATE_IP) && in_array($ip, $localIps)) { + if ( + (bool)filter_var($ip, FILTER_VALIDATE_IP) && + ( + !filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) || + in_array($ip, $localIps, true) + )) { $this->logger->warning("Host $ip was not connected to because it violates local access rules"); throw new LocalServerException('Host violates local access rules'); } |