[HttpFoundation] Fixes IpUtils::checkIp4 on /0 subnets

lrlopez · lrlopez · commit cee9592ee25e · 2015-10-04T00:33:49.000+02:00
| Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16055 | License | MIT | Doc PR | Not needed
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -62,12 +62,12 @@ public static function checkIp($requestIp, $ips)
     public static function checkIp4($requestIp, $ip)
     {
         if (false !== strpos($ip, '/')) {
-            if ('0.0.0.0/0' === $ip) {
+            list($address, $netmask) = explode('/', $ip, 2);
+
+            if ("0" === $netmask) {
                 return true;
             }
 
-            list($address, $netmask) = explode('/', $ip, 2);
-
             if ($netmask < 1 || $netmask > 32) {
                 return false;
             }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -35,8 +35,7 @@ public function testIpv4Provider()
             array(true, '192.168.1.1', array('192.168.1.0/24', '1.2.3.4/1')),
             array(false, '192.168.1.1', array('1.2.3.4/1', '4.3.2.1/1')),
             array(true, '1.2.3.4', '0.0.0.0/0'),
-            array(false, '1.2.3.4', '256.256.256/0'),
-            array(false, '1.2.3.4', '192.168.1.0/0'),
+            array(true, '1.2.3.4', '192.168.1.0/0'),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public static function checkIp($requestIp, $ips)`
`62`	`62`	`public static function checkIp4($requestIp, $ip)`
`63`	`63`	`{`
`64`	`64`	`if (false !== strpos($ip, '/')) {`
`65`		`- if ('0.0.0.0/0' === $ip) {`
	`65`	`+ list($address, $netmask) = explode('/', $ip, 2);`
	`66`	`+`
	`67`	`+ if ("0" === $netmask) {`
`66`	`68`	`return true;`
`67`	`69`	`}`
`68`	`70`
`69`		`- list($address, $netmask) = explode('/', $ip, 2);`
`70`		`-`
`71`	`71`	`if ($netmask < 1 \|\| $netmask > 32) {`
`72`	`72`	`return false;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ public function testIpv4Provider()`
`35`	`35`	`array(true, '192.168.1.1', array('192.168.1.0/24', '1.2.3.4/1')),`
`36`	`36`	`array(false, '192.168.1.1', array('1.2.3.4/1', '4.3.2.1/1')),`
`37`	`37`	`array(true, '1.2.3.4', '0.0.0.0/0'),`
`38`		`- array(false, '1.2.3.4', '256.256.256/0'),`
`39`		`- array(false, '1.2.3.4', '192.168.1.0/0'),`
	`38`	`+ array(true, '1.2.3.4', '192.168.1.0/0'),`
`40`	`39`	`);`
`41`	`40`	`}`
`42`	`41`