[HttpKernel] Fix forward compat with Request::setTrustedProxies()

nicolas-grekas · nicolas-grekas · commit 6ecec3557ec6 · 2017-04-05T08:52:45.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
@@ -36,7 +36,7 @@ public function testUsesRequestServerData()
 
     public function testUseRequestClientIp()
     {
-        Request::setTrustedProxies(array('192.168.0.1'));
+        Request::setTrustedProxies(array('192.168.0.1'), -1);
         list($event, $server) = $this->createRequestEvent(array('X_FORWARDED_FOR' => '192.168.0.2'));
 
         $processor = new WebProcessor();
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -464,7 +464,7 @@ protected function forward(Request $request, $catch = false, Response $entry = n
         // make sure HttpCache is a trusted proxy
         if (!in_array('127.0.0.1', $trustedProxies = Request::getTrustedProxies())) {
             $trustedProxies[] = '127.0.0.1';
-            Request::setTrustedProxies($trustedProxies);
+            Request::setTrustedProxies($trustedProxies, method_exists('Request', 'getTrustedHeaderSet') ? Request::getTrustedHeaderSet() : -1);
         }
 
         // always a "master" request (as the real master request can be in cache)
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -30,7 +30,7 @@ public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
 
         $request = new Request();
-        $request->setTrustedProxies(array('1.1.1.1'));
+        $request->setTrustedProxies(array('1.1.1.1'), -1);
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $request->headers->set('FORWARDED', 'for=2.2.2.2');
         $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1218,7 +1218,7 @@ public function testClientIpIsAlwaysLocalhostForForwardedRequests()
      */
     public function testHttpCacheIsSetAsATrustedProxy(array $existing, array $expected)
     {
-        Request::setTrustedProxies($existing);
+        Request::setTrustedProxies($existing, -1);
 
         $this->setNextResponse();
         $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -309,7 +309,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
     public function testInconsistentClientIpsOnMasterRequests()
     {
         $request = new Request();
-        $request->setTrustedProxies(array('1.1.1.1'));
+        $request->setTrustedProxies(array('1.1.1.1'), -1);
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $request->headers->set('FORWARDED', 'for=2.2.2.2');
         $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function testUsesRequestServerData()`
`36`	`36`
`37`	`37`	`public function testUseRequestClientIp()`
`38`	`38`	`{`
`39`		`- Request::setTrustedProxies(array('192.168.0.1'));`
	`39`	`+ Request::setTrustedProxies(array('192.168.0.1'), -1);`
`40`	`40`	`list($event, $server) = $this->createRequestEvent(array('X_FORWARDED_FOR' => '192.168.0.2'));`
`41`	`41`
`42`	`42`	`$processor = new WebProcessor();`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ protected function forward(Request $request, $catch = false, Response $entry = n`
`464`	`464`	`// make sure HttpCache is a trusted proxy`
`465`	`465`	`if (!in_array('127.0.0.1', $trustedProxies = Request::getTrustedProxies())) {`
`466`	`466`	`$trustedProxies[] = '127.0.0.1';`
`467`		`- Request::setTrustedProxies($trustedProxies);`
	`467`	`+ Request::setTrustedProxies($trustedProxies, method_exists('Request', 'getTrustedHeaderSet') ? Request::getTrustedHeaderSet() : -1);`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`// always a "master" request (as the real master request can be in cache)`
Original file line number	Diff line number	Diff line change
`@@ -1218,7 +1218,7 @@ public function testClientIpIsAlwaysLocalhostForForwardedRequests()`
`1218`	`1218`	`*/`
`1219`	`1219`	`public function testHttpCacheIsSetAsATrustedProxy(array $existing, array $expected)`
`1220`	`1220`	`{`
`1221`		`- Request::setTrustedProxies($existing);`
	`1221`	`+ Request::setTrustedProxies($existing, -1);`
`1222`	`1222`
`1223`	`1223`	`$this->setNextResponse();`
`1224`	`1224`	`$this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public function testVerifyRequestStackPushPopDuringHandle()`
`309`	`309`	`public function testInconsistentClientIpsOnMasterRequests()`
`310`	`310`	`{`
`311`	`311`	`$request = new Request();`
`312`		`- $request->setTrustedProxies(array('1.1.1.1'));`
	`312`	`+ $request->setTrustedProxies(array('1.1.1.1'), -1);`
`313`	`313`	`$request->server->set('REMOTE_ADDR', '1.1.1.1');`
`314`	`314`	`$request->headers->set('FORWARDED', 'for=2.2.2.2');`
`315`	`315`	`$request->headers->set('X_FORWARDED_FOR', '3.3.3.3');`