mirror of https://github.com/tootsuite/mastodon
Set Content-Security-Policy rules through RoR's config (#8957)
* Set CSP rules in RoR's configuration * Override CSP setting in the embed controller to allow framespull/8958/head
parent
9ece873d62
commit
2d27c11061
|
@ -19,6 +19,10 @@ class StatusesController < ApplicationController
|
||||||
before_action :set_referrer_policy_header, only: [:show]
|
before_action :set_referrer_policy_header, only: [:show]
|
||||||
before_action :set_cache_headers
|
before_action :set_cache_headers
|
||||||
|
|
||||||
|
content_security_policy only: :embed do |p|
|
||||||
|
p.frame_ancestors(false)
|
||||||
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html do
|
format.html do
|
||||||
|
|
|
@ -2,17 +2,20 @@
|
||||||
# For further information see the following documentation
|
# For further information see the following documentation
|
||||||
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
|
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
|
||||||
|
|
||||||
# Rails.application.config.content_security_policy do |p|
|
assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}"
|
||||||
# p.default_src :self, :https
|
|
||||||
# p.font_src :self, :https, :data
|
Rails.application.config.content_security_policy do |p|
|
||||||
# p.img_src :self, :https, :data
|
p.base_uri :none
|
||||||
# p.object_src :none
|
p.default_src :none
|
||||||
# p.script_src :self, :https
|
p.frame_ancestors :none
|
||||||
# p.style_src :self, :https, :unsafe_inline
|
p.script_src :self, assets_host
|
||||||
#
|
p.font_src :self, assets_host
|
||||||
# # Specify URI for violation reports
|
p.img_src :self, :https, :data, :blob
|
||||||
# # p.report_uri "/csp-violation-report-endpoint"
|
p.style_src :self, :unsafe_inline, assets_host
|
||||||
# end
|
p.media_src :self, :data, assets_host
|
||||||
|
p.frame_src :self, :https
|
||||||
|
p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url
|
||||||
|
end
|
||||||
|
|
||||||
# Report CSP violations to a specified URI
|
# Report CSP violations to a specified URI
|
||||||
# For further information see the following documentation:
|
# For further information see the following documentation:
|
||||||
|
|
Loading…
Reference in New Issue