fix CSP / X-Frame-Options for media embeds #9558
Merged
Conversation
This file contains 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
jomo
changed the title
jomo
force-pushed
the
fix-frame-options
branch
from
2cc61f8
to
a32dc05
Compare
jomo
force-pushed
the
fix-frame-options
branch
from
a32dc05
to
dc282d0
Compare
Gargron
approved these changes
Dec 18, 2018
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
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.
Currently media is prevented from being embedded on external sites (example). This seems to be an oversight from #8957.
https://github.com/tootsuite/mastodon/blob/cb2435aaf5679a48c9e3867e0565dcca87cd6f2b/app/controllers/statuses_controller.rb#L22-L24
The code is basically borrowed from
statuses_controller.rband now being added tomedia_controller.rb.