mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix CSP with S3/SWIFT hosts

This commit is contained in:
Thibaut Girka 2018-08-28 21:41:03 +02:00 committed by ThibG
parent 4a9e3f80e8
commit c4b3479173
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/initializers/content_security_policy.rb
View File

@ -4,6 +4,16 @@
if Rails.env.production? if Rails.env.production?
assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}" assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}"
data_hosts = [assets_host]
if ENV['S3_ENABLED'] == 'true'
attachments_host = ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] || ENV['S3_HOSTNAME'] || "s3-#{ENV['S3_REGION'] || 'us-east-1'}.amazonaws.com"
elsif ENV['SWIFT_ENABLED'] == 'true'
attachments_host = ENV['SWIFT_OBJECT_URL']
else
attachments_host = nil
end
data_hosts << attachments_host unless attachments_host.nil?
Rails.application.config.content_security_policy do |p| Rails.application.config.content_security_policy do |p|
p.base_uri :none p.base_uri :none
@ -13,9 +23,10 @@ if Rails.env.production?
p.font_src :self, assets_host p.font_src :self, assets_host
p.img_src :self, :https, :data, :blob p.img_src :self, :https, :data, :blob
p.style_src :self, :unsafe_inline, assets_host p.style_src :self, :unsafe_inline, assets_host
p.media_src :self, :data, assets_host p.media_src :self, :data, *data_hosts
p.frame_src :self, :https p.frame_src :self, :https
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url p.worker_src :self, assets_host
p.connect_src :self, :blob, Rails.configuration.x.streaming_api_base_url, *data_hosts
end end
end end