mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-12 18:03:03 +00:00
dcded13a99
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
38 lines
1.6 KiB
Ruby
38 lines
1.6 KiB
Ruby
# Define an application-wide content security policy
|
|
# For further information see the following documentation
|
|
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
|
|
|
|
if Rails.env.production?
|
|
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|
|
|
p.base_uri :none
|
|
p.default_src :none
|
|
p.frame_ancestors :none
|
|
p.script_src :self, assets_host
|
|
p.font_src :self, assets_host
|
|
p.img_src :self, :https, :data, :blob
|
|
p.style_src :self, :unsafe_inline, assets_host
|
|
p.media_src :self, :data, *data_hosts
|
|
p.frame_src :self, :https
|
|
p.worker_src :self, assets_host
|
|
p.connect_src :self, :blob, Rails.configuration.x.streaming_api_base_url, *data_hosts
|
|
p.manifest_src :self, :https
|
|
end
|
|
end
|
|
|
|
# Report CSP violations to a specified URI
|
|
# For further information see the following documentation:
|
|
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
|
|
# Rails.application.config.content_security_policy_report_only = true
|