Merge branch '3.0' into 3.1

nicolas-grekas · nicolas-grekas · commit e770e2ec1a28 · 2016-06-29T14:32:15.000+02:00
* 3.0: [FrameworkBundle] Fix fixtures [HttpKernel] Inline ValidateRequestListener logic into HttpKernel fixed HttpKernel dependencies after symfony#18688 Conflicts: src/Symfony/Component/HttpKernel/HttpKernel.php src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -61,9 +61,5 @@
             <argument type="service" id="request_stack" />
             <tag name="kernel.event_subscriber" />
         </service>
-
-        <service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
-            <tag name="kernel.event_subscriber" />
-        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt
@@ -1,5 +1,5 @@
  --------------------- ----------------------------------------------------------------- 
-  [32mParameter[39m             [32mValue[39m                                                            
+ [32m Parameter           [39m [32m Value                                                           [39m 
  --------------------- ----------------------------------------------------------------- 
   twig.form.resources   ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...  
  --------------------- -----------------------------------------------------------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
@@ -3,7 +3,7 @@
 [33m=================================[39m
 
  ------------------- -------------------------------------------------------- 
-  [32mService ID[39m          [32mClass name[39m                                              
+ [32m Service ID        [39m [32m Class name                                             [39m 
  ------------------- -------------------------------------------------------- 
   alias_1             alias for "service_1"                                   
   alias_2             alias for "service_2"                                   
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
@@ -3,7 +3,7 @@
 [33m=============================================[39m
 
  ------------------- -------------------------------------------------------- 
-  [32mService ID[39m          [32mClass name[39m                                              
+ [32m Service ID        [39m [32m Class name                                             [39m 
  ------------------- -------------------------------------------------------- 
   alias_1             alias for "service_1"                                   
   alias_2             alias for "service_2"                                   
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
@@ -3,7 +3,7 @@
 [33m====================================================================[39m
 
  -------------- ------- ------- ------- ----------------------- 
-  [32mService ID[39m     [32mattr1[39m   [32mattr2[39m   [32mattr3[39m   [32mClass name[39m             
+ [32m Service ID   [39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name            [39m 
  -------------- ------- ------- ------- ----------------------- 
   definition_2   val1    val2            Full\Qualified\Class2  
     "                            val3                           
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
@@ -1,5 +1,5 @@
  ------------------ ----------------------------- 
-  [32mOption[39m             [32mValue[39m                        
+ [32m Option           [39m [32m Value                       [39m 
  ------------------ ----------------------------- 
   Service ID         -                            
   Class              Full\Qualified\Class1        
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
@@ -1,5 +1,5 @@
  ------------------ ------------------------------------------------------- 
-  [32mOption[39m             [32mValue[39m                                                  
+ [32m Option           [39m [32m Value                                                 [39m 
  ------------------ ------------------------------------------------------- 
   Service ID         -                                                      
   Class              Full\Qualified\Class2                                  
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
@@ -3,7 +3,7 @@
 [33m=======================================[39m
 
  ------- ------------------- ---------- 
-  [32mOrder[39m   [32mCallable[39m            [32mPriority[39m  
+ [32m Order [39m [32m Callable          [39m [32m Priority [39m 
  ------- ------------------- ---------- 
   #1      global_function()   255       
   #2      \Closure()          -1        
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
@@ -6,7 +6,7 @@
 [33m--------------[39m
 
  ------- ------------------- ---------- 
-  [32mOrder[39m   [32mCallable[39m            [32mPriority[39m  
+ [32m Order [39m [32m Callable          [39m [32m Priority [39m 
  ------- ------------------- ---------- 
   #1      global_function()   255       
   #2      \Closure()          -1        
@@ -16,7 +16,7 @@
 [33m--------------[39m
 
  ------- ----------------------------------------------------------------------------------- ---------- 
-  [32mOrder[39m   [32mCallable[39m                                                                            [32mPriority[39m  
+ [32m Order [39m [32m Callable                                                                          [39m [32m Priority [39m 
  ------- ----------------------------------------------------------------------------------- ---------- 
   #1      Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()   0         
  ------- ----------------------------------------------------------------------------------- ---------- 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt
@@ -1,5 +1,5 @@
  --------------- --------- 
-  [32mParameter[39m       [32mValue[39m    
+ [32m Parameter     [39m [32m Value   [39m 
  --------------- --------- 
   database_name   symfony  
  --------------- --------- 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt
@@ -3,7 +3,7 @@
 [33m============================[39m
 
  ----------- -------------------------- 
-  [32mParameter[39m   [32mValue[39m                     
+ [32m Parameter [39m [32m Value                    [39m 
  ----------- -------------------------- 
   array       [12,"Hello world!",true]  
   boolean     true                      
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
@@ -1,5 +1,5 @@
  --------- ---------- ------------ ----------- --------------- 
-  [32mName[39m      [32mMethod[39m     [32mScheme[39m       [32mHost[39m        [32mPath[39m           
+ [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path          [39m 
  --------- ---------- ------------ ----------- --------------- 
   route_1   GET|HEAD   http|https   localhost   /hello/{name}  
   route_2   PUT|POST   http|https   localhost   /name/add      
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "symfony/browser-kit": "~2.8|~3.0",
-        "symfony/console": "~2.8|~3.0",
+        "symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2",
         "symfony/css-selector": "~2.8|~3.0",
         "symfony/dom-crawler": "~2.8|~3.0",
         "symfony/polyfill-intl-icu": "~1.0",
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -24,6 +25,7 @@
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
@@ -117,6 +119,13 @@ public function terminateWithException(\Exception $exception)
      */
     private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
     {
+        if (self::MASTER_REQUEST === $type && $request::getTrustedProxies()) {
+            try {
+                $request->getClientIps();
+            } catch (ConflictingHeadersException $e) {
+                throw new BadRequestHttpException('The request headers contain conflicting information regarding the origin of this request.', $e);
+            }
+        }
         $this->requestStack->push($request);
 
         // request
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -302,6 +302,33 @@ public function testVerifyRequestStackPushPopDuringHandle()
         $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST);
     }
 
+    /**
+     * @expectedException Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+     */
+    public function testInconsistentClientIpsOnMasterRequests()
+    {
+        $kernel = $this->getHttpKernel(new EventDispatcher());
+        $request = new Request();
+        $request->setTrustedProxies(array('1.1.1.1'));
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('FORWARDED', '2.2.2.2');
+        $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
+
+        $kernel->handle($request, $kernel::MASTER_REQUEST, false);
+    }
+
+    public function testInconsistentClientIpsOnSubRequests()
+    {
+        $kernel = $this->getHttpKernel(new EventDispatcher());
+        $request = new Request();
+        $request->setTrustedProxies(array('1.1.1.1'));
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('FORWARDED', '2.2.2.2');
+        $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $kernel->handle($request, $kernel::SUB_REQUEST, false));
+    }
+
     private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = array())
     {
         if (null === $controller) {
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/event-dispatcher": "~2.8|~3.0",
-        "symfony/http-foundation": "~2.8|~3.0",
+        "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2",
         "symfony/debug": "~2.8|~3.0",
         "psr/log": "~1.0"
     },

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
  --------------------- -----------------------------------------------------------------
 -  [32mParameter[39m             [32mValue[39m
 + [32m Parameter           [39m [32m Value                                                           [39m
  --------------------- -----------------------------------------------------------------
   twig.form.resources   ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
  --------------------- -----------------------------------------------------------------
-Original file line number
+Diff line change
 [33m--------------[39m
  ------- ------------------- ----------
 -  [32mOrder[39m   [32mCallable[39m            [32mPriority[39m
 + [32m Order [39m [32m Callable          [39m [32m Priority [39m
  ------- ------------------- ----------
   #1      global_function()   255
   #2      \Closure()          -1
 [33m--------------[39m
  ------- ----------------------------------------------------------------------------------- ----------
 -  [32mOrder[39m   [32mCallable[39m                                                                            [32mPriority[39m
 + [32m Order [39m [32m Callable                                                                          [39m [32m Priority [39m
  ------- ----------------------------------------------------------------------------------- ----------
   #1      Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()   0
  ------- ----------------------------------------------------------------------------------- ----------