Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit b54cce19ba77 · 2022-12-09T15:23:03.000+01:00
* 6.0:
  [HttpFoundation] IPv4-mapped IPv6 addresses incorrectly rejected
  Minor (comment only), part 2
  [RateLimiter] Add typecast to Reservation::wait
  [FrameworkBundle] Remove check of undefined service in mailer assertions
  [VarDumper] Ignore \Error in __debugInfo()
diff --git a/IpUtils.php b/IpUtils.php
@@ -114,17 +114,17 @@ public static function checkIp6(string $requestIp, string $ip): bool
         }
 
         // Check to see if we were given a IP4 $requestIp or $ip by mistake
-        if (str_contains($requestIp, '.') || str_contains($ip, '.')) {
-            return self::$checkedIps[$cacheKey] = false;
-        }
-
         if (!filter_var($requestIp, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
             return self::$checkedIps[$cacheKey] = false;
         }
 
         if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
+            if (!filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+                return self::$checkedIps[$cacheKey] = false;
+            }
+
             if ('0' === $netmask) {
                 return (bool) unpack('n*', @inet_pton($address));
             }
@@ -133,6 +133,10 @@ public static function checkIp6(string $requestIp, string $ip): bool
                 return self::$checkedIps[$cacheKey] = false;
             }
         } else {
+            if (!filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+                return self::$checkedIps[$cacheKey] = false;
+            }
+
             $address = $ip;
             $netmask = 128;
         }
diff --git a/Tests/IpUtilsTest.php b/Tests/IpUtilsTest.php
@@ -78,6 +78,7 @@ public function getIpv6Data()
             [false, '0.0.0.0/8', '::1'],
             [false,  '::1', '127.0.0.1'],
             [false,  '::1', '0.0.0.0/8'],
+            [true, '::ffff:10.126.42.2', '::ffff:10.0.0.0/0'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -114,17 +114,17 @@ public static function checkIp6(string $requestIp, string $ip): bool`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// Check to see if we were given a IP4 $requestIp or $ip by mistake`
`117`		`- if (str_contains($requestIp, '.') \|\| str_contains($ip, '.')) {`
`118`		`- return self::$checkedIps[$cacheKey] = false;`
`119`		`- }`
`120`		`-`
`121`	`117`	`if (!filter_var($requestIp, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {`
`122`	`118`	`return self::$checkedIps[$cacheKey] = false;`
`123`	`119`	`}`
`124`	`120`
`125`	`121`	`if (str_contains($ip, '/')) {`
`126`	`122`	`[$address, $netmask] = explode('/', $ip, 2);`
`127`	`123`
	`124`	`+ if (!filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {`
	`125`	`+ return self::$checkedIps[$cacheKey] = false;`
	`126`	`+ }`
	`127`	`+`
`128`	`128`	`if ('0' === $netmask) {`
`129`	`129`	`return (bool) unpack('n*', @inet_pton($address));`
`130`	`130`	`}`
`@@ -133,6 +133,10 @@ public static function checkIp6(string $requestIp, string $ip): bool`
`133`	`133`	`return self::$checkedIps[$cacheKey] = false;`
`134`	`134`	`}`
`135`	`135`	`} else {`
	`136`	`+ if (!filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {`
	`137`	`+ return self::$checkedIps[$cacheKey] = false;`
	`138`	`+ }`
	`139`	`+`
`136`	`140`	`$address = $ip;`
`137`	`141`	`$netmask = 128;`
`138`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public function getIpv6Data()`
`78`	`78`	`[false, '0.0.0.0/8', '::1'],`
`79`	`79`	`[false, '::1', '127.0.0.1'],`
`80`	`80`	`[false, '::1', '0.0.0.0/8'],`
	`81`	`+ [true, '::ffff:10.126.42.2', '::ffff:10.0.0.0/0'],`
`81`	`82`	`];`
`82`	`83`	`}`
`83`	`84`