Refactor local IP if and set strict to true for in_array

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php
index cc916349ebdcd92f4c03b35af5720a40761e4306..34a04a75c7e34f0597e8ad9ab94de79c860c166f 100644 (file)
--- a/lib/private/Http/Client/LocalAddressChecker.php
+++ b/lib/private/Http/Client/LocalAddressChecker.php
@@ -37,13 +37,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');
                }