Check for local IPs nested in IPv6 as well

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Jun 28, 2022 · ae30410 · ae30410
1 parent 0c04991
commit ae30410
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php
@@ -52,7 +52,9 @@ public function ThrowIfLocalIp(string $ip) : void {
 			$delimiter = strrpos($ip, ':'); // Get last colon
 			$ipv4Address = substr($ip, $delimiter + 1);
 
-			if (!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+			if (
+				!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) ||
+				in_array($ipv4Address, $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');
 			}