bug #15706 [framework-bundle] Added support for the 0.0.0.0/0 trusted proxy (zerkms)

fabpot · fabpot · commit 81605dd7c90c · 2016-01-25T13:36:48.000+01:00
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15706). Discussion ---------- [framework-bundle] Added support for the `0.0.0.0/0` trusted proxy | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT It is relevant to my other PR: #14690 The original intention was to start accepting `0.0.0.0/0` as a trusted proxy (which is a valid CIDR notation). The prupose is to allow all requests to be treated as trusted and to eliminate using dirty `['0.0.0.0/1', '128.0.0.0/1']` workaround. Commits ------- 3188e1b Added support for the `0.0.0.0/0` trusted proxy
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -52,6 +52,10 @@ public function getConfigTreeBuilder()
                                 }
 
                                 if (false !== strpos($v, '/')) {
+                                    if ('0.0.0.0/0' === $v) {
+                                        return false;
+                                    }
+
                                     list($v, $mask) = explode('/', $v, 2);
 
                                     if (strcmp($mask, (int) $mask) || $mask < 1 || $mask > (false !== strpos($v, ':') ? 128 : 32)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -66,6 +66,7 @@ public function getTestValidTrustedProxiesData()
             array(array(), array()),
             array(array('10.0.0.0/8'), array('10.0.0.0/8')),
             array(array('::ffff:0:0/96'), array('::ffff:0:0/96')),
+            array(array('0.0.0.0/0'), array('0.0.0.0/0')),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ public function getConfigTreeBuilder()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (false !== strpos($v, '/')) {`
	`55`	`+ if ('0.0.0.0/0' === $v) {`
	`56`	`+ return false;`
	`57`	`+ }`
	`58`	`+`
`55`	`59`	`list($v, $mask) = explode('/', $v, 2);`
`56`	`60`
`57`	`61`	`if (strcmp($mask, (int) $mask) \|\| $mask < 1 \|\| $mask > (false !== strpos($v, ':') ? 128 : 32)) {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public function getTestValidTrustedProxiesData()`
`66`	`66`	`array(array(), array()),`
`67`	`67`	`array(array('10.0.0.0/8'), array('10.0.0.0/8')),`
`68`	`68`	`array(array('::ffff:0:0/96'), array('::ffff:0:0/96')),`
	`69`	`+ array(array('0.0.0.0/0'), array('0.0.0.0/0')),`
`69`	`70`	`);`
`70`	`71`	`}`
`71`	`72`