bug symfony#31213 [WebProfilerBundle] Intercept redirections only for HTML format (javiereguiluz)

fabpot · fabpot · commit d98f7833f735 · 2019-04-24T09:02:22.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [WebProfilerBundle] Intercept redirections only for HTML format | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | symfony#31168 | License | MIT | Doc PR | - This applies the solution proposed by @bpolaszek in symfony#31168. Commits ------- 4186788 Intercept redirections only for HTML format
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -87,7 +87,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) {
+        if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) {
             $session = $request->getSession();
             if (null !== $session && $session->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) {
                 // keep current flashes for one more request if using AutoExpireFlashBag
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -58,7 +58,7 @@ public function getInjectToolbarTests()
     /**
      * @dataProvider provideRedirects
      */
-    public function testRedirectionIsIntercepted($statusCode, $hasSession)
+    public function testHtmlRedirectionIsIntercepted($statusCode, $hasSession)
     {
         $response = new Response('Some content', $statusCode);
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
@@ -71,6 +71,19 @@ public function testRedirectionIsIntercepted($statusCode, $hasSession)
         $this->assertEquals('Redirection', $response->getContent());
     }
 
+    public function testNonHtmlRedirectionIsNotIntercepted()
+    {
+        $response = new Response('Some content', '301');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals(301, $response->getStatusCode());
+        $this->assertEquals('Some content', $response->getContent());
+    }
+
     public function testToolbarIsInjected()
     {
         $response = new Response('<html><head></head><body></body></html>');

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`87`	`87`	`return;`
`88`	`88`	`}`
`89`	`89`
`90`		`- if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) {`
	`90`	`+ if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) {`
`91`	`91`	`$session = $request->getSession();`
`92`	`92`	`if (null !== $session && $session->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) {`
`93`	`93`	`// keep current flashes for one more request if using AutoExpireFlashBag`