Merge pull request #26514 from nextcloud/backport/26439/stable21

[stable21] Increase subnet matcher
nextcloud · Apr 12, 2021 · 87212ab · 87212ab
2 parents dcbe928 + b5838c5
commit 87212ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/private/Security/Normalizer/IpAddress.php b/lib/private/Security/Normalizer/IpAddress.php
@@ -93,7 +93,7 @@ private function getIPv6Subnet(string $ip, int $maskBits = 48): string {
 	}
 
 	/**
-	 * Gets either the /32 (IPv4) or the /128 (IPv6) subnet of an IP address
+	 * Gets either the /32 (IPv4) or the /64 (IPv6) subnet of an IP address
 	 *
 	 * @return string
 	 */
@@ -106,7 +106,7 @@ public function getSubnet(): string {
 		}
 		return $this->getIPv6Subnet(
 			$this->ip,
-			128
+			64
 		);
 	}
 

diff --git a/tests/lib/Security/Normalizer/IpAddressTest.php b/tests/lib/Security/Normalizer/IpAddressTest.php
@@ -37,11 +37,19 @@ public function subnetDataProvider() {
 			],
 			[
 				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-				'2001:db8:85a3::8a2e:370:7334/128',
+				'2001:db8:85a3::/64',
+			],
+			[
+				'2001:db8:3333:4444:5555:6666:7777:8888',
+				'2001:db8:3333:4444::/64',
+			],
+			[
+				'::1234:5678',
+				'::/64',
 			],
 			[
 				'[::1]',
-				'::1/128',
+				'::/64',
 			],
 		];
 	}