Merge pull request #60565 from nextcloud/backport/60546/stable33

[stable33] fix: handle NAT64 addresses in isLocalAddress

Author: sorbaugh

lib/private/Net/IpAddressClassifier.php

@@ -9,6 +9,7 @@
 
 namespace OC\Net;
 
+use IPLib\Address\IPv4;
 use IPLib\Address\IPv6;
 use IPLib\Factory;
 use IPLib\ParseStringFlag;
@@ -42,7 +43,15 @@ public function isLocalAddress(string $ip): bool {
 		}
 		/* Replace by normalized form */
 		if ($parsedIp instanceof IPv6) {
-			$ip = (string)($parsedIp->toIPv4() ?? $parsedIp);
+			$ipv4 = $parsedIp->toIPv4();
+			$ipv6Bytes = $parsedIp->getBytes();
+			if ($ipv4) {
+				$ip = (string)$ipv4;
+			} elseif (array_slice($ipv6Bytes, 0, 4) === [0x00, 0x64, 0xFF, 0x9B]) {
+				$ip = (string)IPv4::fromBytes(array_slice($ipv6Bytes, -4, 4));
+			} else {
+				$ip = (string)$parsedIp;
+			}
 		} else {
 			$ip = (string)$parsedIp;
 		}

tests/lib/Net/IpAddressClassifierTest.php

@@ -51,6 +51,7 @@ public static function localIpAddressData(): array {
 			['::1'],
 			['100.100.100.200'],
 			['192.0.0.1'],
+			['64:ff9b::a9fe:a9fe'], // NAT64 of 169.254.169.254
 		];
 	}