mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix CSP (#268)

Browse Source
This commit is contained in:
Rintan 2020-03-09 11:05:55 +09:00 committed by GitHub
parent d7b2001716
commit 663b2f91e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/content_security_policy.rb
View File

@ -9,7 +9,6 @@ end
base_host = Rails.configuration.x.web_domain base_host = Rails.configuration.x.web_domain
assets_host = Rails.configuration.action_controller.asset_host assets_host = Rails.configuration.action_controller.asset_host
assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
assets_host ||= host_to_url(base_host) assets_host ||= host_to_url(base_host)
media_host = host_to_url(ENV['S3_ALIAS_HOST']) media_host = host_to_url(ENV['S3_ALIAS_HOST'])
@ -21,7 +20,7 @@ Rails.application.config.content_security_policy do |p|
p.base_uri :none p.base_uri :none
p.default_src :none p.default_src :none
p.frame_ancestors :none p.frame_ancestors :none
p.font_src :self, assets_host, google_font_host p.font_src :self, assets_host
p.img_src :self, :https, :data, :blob, assets_host p.img_src :self, :https, :data, :blob, assets_host
p.style_src :self, :unsafe_inline, assets_host p.style_src :self, :unsafe_inline, assets_host
p.media_src :self, :https, :data, assets_host p.media_src :self, :https, :data, assets_host