fixed the IP address in HttpCache when calling the backend

fabpot · fabpot · commit 6a9c5102b298 · 2013-02-11T11:50:29.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -413,6 +413,10 @@ protected function fetch(Request $request, $catch = false)
         $subRequest->headers->remove('if_modified_since');
         $subRequest->headers->remove('if_none_match');
 
+        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
+        // is always called from the same process as the backend.
+        $subRequest->server->set('REMOTE_ADDR', '127.0.0.1');
+
         $response = $this->forward($subRequest, $catch);
 
         if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1034,4 +1034,12 @@ public function testEsiRecalculateContentLengthHeader()
         $this->assertEquals('Hello World!', $this->response->getContent());
         $this->assertEquals(12, $this->response->headers->get('Content-Length'));
     }
+
+    public function testClientIpIsAlwaysLocalhostForForwardedRequests()
+    {
+        $this->setNextResponse();
+        $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
+
+        $this->assertEquals('127.0.0.1', $this->kernel->getBackendRequest()->server->get('REMOTE_ADDR'));
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php
@@ -26,6 +26,7 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface
     protected $called;
     protected $customizer;
     protected $catch;
+    protected $backendRequest;
 
     public function __construct($body, $status, $headers, \Closure $customizer = null)
     {
@@ -39,9 +40,15 @@ public function __construct($body, $status, $headers, \Closure $customizer = nul
         parent::__construct(new EventDispatcher(), $this);
     }
 
+    public function getBackendRequest()
+    {
+        return $this->backendRequest;
+    }
+
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
         $this->catch = $catch;
+        $this->backendRequest = $request;
 
         return parent::handle($request, $type, $catch);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -25,6 +25,7 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
     protected $headers;
     protected $catch;
     protected $call;
+    protected $backendRequest;
 
     public function __construct($responses)
     {
@@ -42,8 +43,15 @@ public function __construct($responses)
         parent::__construct(new EventDispatcher(), $this);
     }
 
+    public function getBackendRequest()
+    {
+        return $this->backendRequest;
+    }
+
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
+        $this->backendRequest = $request;
+
         return parent::handle($request, $type, $catch);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1034,4 +1034,12 @@ public function testEsiRecalculateContentLengthHeader()`
`1034`	`1034`	`$this->assertEquals('Hello World!', $this->response->getContent());`
`1035`	`1035`	`$this->assertEquals(12, $this->response->headers->get('Content-Length'));`
`1036`	`1036`	`}`
	`1037`	`+`
	`1038`	`+ public function testClientIpIsAlwaysLocalhostForForwardedRequests()`
	`1039`	`+ {`
	`1040`	`+ $this->setNextResponse();`
	`1041`	`+ $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));`
	`1042`	`+`
	`1043`	`+ $this->assertEquals('127.0.0.1', $this->kernel->getBackendRequest()->server->get('REMOTE_ADDR'));`
	`1044`	`+ }`
`1037`	`1045`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface`
`26`	`26`	`protected $called;`
`27`	`27`	`protected $customizer;`
`28`	`28`	`protected $catch;`
	`29`	`+ protected $backendRequest;`
`29`	`30`
`30`	`31`	`public function __construct($body, $status, $headers, \Closure $customizer = null)`
`31`	`32`	`{`
`@@ -39,9 +40,15 @@ public function __construct($body, $status, $headers, \Closure $customizer = nul`
`39`	`40`	`parent::__construct(new EventDispatcher(), $this);`
`40`	`41`	`}`
`41`	`42`
	`43`	`+ public function getBackendRequest()`
	`44`	`+ {`
	`45`	`+ return $this->backendRequest;`
	`46`	`+ }`
	`47`	`+`
`42`	`48`	`public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)`
`43`	`49`	`{`
`44`	`50`	`$this->catch = $catch;`
	`51`	`+ $this->backendRequest = $request;`
`45`	`52`
`46`	`53`	`return parent::handle($request, $type, $catch);`
`47`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt`
`25`	`25`	`protected $headers;`
`26`	`26`	`protected $catch;`
`27`	`27`	`protected $call;`
	`28`	`+ protected $backendRequest;`
`28`	`29`
`29`	`30`	`public function __construct($responses)`
`30`	`31`	`{`
`@@ -42,8 +43,15 @@ public function __construct($responses)`
`42`	`43`	`parent::__construct(new EventDispatcher(), $this);`
`43`	`44`	`}`
`44`	`45`
	`46`	`+ public function getBackendRequest()`
	`47`	`+ {`
	`48`	`+ return $this->backendRequest;`
	`49`	`+ }`
	`50`	`+`
`45`	`51`	`public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)`
`46`	`52`	`{`
	`53`	`+ $this->backendRequest = $request;`
	`54`	`+`
`47`	`55`	`return parent::handle($request, $type, $catch);`
`48`	`56`	`}`
`49`	`57`