Do not inject web debug toolbar on attachments #18971
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
peterrehm
commented
Jun 5, 2016
| Q | A |
|---|---|
| Branch? | 2.7 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #18965 |
| License | MIT |
| Doc PR | - |
|
👍 Status: reviewed |
|
👍 |
| @@ -112,6 +112,11 @@ public function onKernelResponse(FilterResponseEvent $event) | |||
| */ | |||
| protected function injectToolbar(Response $response, Request $request) | |||
| { | |||
| // The toolbar shall not be injected if the header enforces a download of the content | |||
| if (false !== strpos($response->headers->get('Content-Disposition'), 'attachment')) { | |||
There was a problem hiding this comment.
This should be moved in the condition starting at line 96 instead
| @@ -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 !== strpos($response->headers->get('Content-Disposition'), 'attachment') | |||
There was a problem hiding this comment.
The content-disposition types are case-insensitive according to https://tools.ietf.org/html/rfc2183
Also this current check will also trigger for Content-Disposition: <something-else>; filename=attachment which is probably not intended.
There was a problem hiding this comment.
Updated accordingly. The question is now the check, I am now checking for attachment; instead.
| @@ -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 !== strpos(strtolower($response->headers->get('Content-Disposition')), 'attachment;') | |||
There was a problem hiding this comment.
stripos instead of strpos+strtolower?
|
Thank you @peterrehm. |
fabpot
added a commit
that referenced
this pull request
Jun 8, 2016
This PR was squashed before being merged into the 2.7 branch (closes #18971). Discussion ---------- Do not inject web debug toolbar on attachments | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18965 | License | MIT | Doc PR | - Commits ------- 4a7d836 Do not inject web debug toolbar on attachments
Merged
This was referenced Jun 30, 2016
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.