Do not inject web debug toolbar on attachments

peterrehm · fabpot · commit 2e8ebcad9e33 · 2016-06-08T13:15:43.000+02:00
diff --git a/EventListener/WebDebugToolbarListener.php b/EventListener/WebDebugToolbarListener.php
@@ -98,6 +98,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             || $response->isRedirection()
             || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))
             || 'html' !== $request->getRequestFormat()
+            || false !== stripos($response->headers->get('Content-Disposition'), 'attachment;')
         ) {
             return;
         }
diff --git a/Tests/EventListener/WebDebugToolbarListenerTest.php b/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -82,6 +82,21 @@ public function testToolbarIsInjected()
         $this->assertEquals("<html><head></head><body>\nWDT\n</body></html>", $response->getContent());
     }
 
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnContentDispositionAttachment()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('Content-Disposition', 'attachment; filename=test.html');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
     /**
      * @depends testToolbarIsInjected
      * @dataProvider provideRedirects

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`98`	`98`	`\|\| $response->isRedirection()`
`99`	`99`	`\|\| ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))`
`100`	`100`	`\|\| 'html' !== $request->getRequestFormat()`
	`101`	`+ \|\| false !== stripos($response->headers->get('Content-Disposition'), 'attachment;')`
`101`	`102`	`) {`
`102`	`103`	`return;`
`103`	`104`	`}`