mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
cbd0ee1d07
* Update devise-two-factor to unreleased fork for Rails 6 support Update tests to match new `rotp` version. * Update nsa gem to unreleased fork for Rails 6 support * Update rails to 6.1.3 and rails-i18n to 6.0 * Update to unreleased fork of pluck_each for Ruby 6 support * Run "rails app:update" * Add missing ActiveStorage config file * Use config.ssl_options instead of removed ApplicationController#force_ssl Disabled force_ssl-related tests as they do not seem to be easily testable anymore. * Fix nonce directives by removing Rails 5 specific monkey-patching * Fix fixture_file_upload deprecation warning * Fix yield-based test failing with Rails 6 * Use Rails 6's index_with when possible * Use ActiveRecord::Cache::Store#delete_multi from Rails 6 This will yield better performances when deleting an account * Disable Rails 6.1's automatic preload link headers Since Rails 6.1, ActionView adds preload links for javascript files in the Links header per default. In our case, that will bloat headers too much and potentially cause issues with reverse proxies. Furhermore, we don't need those links, as we already output them as HTML link tags. * Switch to Rails 6.0 default config * Switch to Rails 6.1 default config * Do not include autoload paths in the load path
62 lines
2.4 KiB
Ruby
62 lines
2.4 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
|
|
|
|
def host_to_url(str)
|
|
"http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}" unless str.blank?
|
|
end
|
|
|
|
base_host = Rails.configuration.x.web_domain
|
|
|
|
assets_host = Rails.configuration.action_controller.asset_host
|
|
assets_host ||= host_to_url(base_host)
|
|
|
|
media_host = host_to_url(ENV['S3_ALIAS_HOST'])
|
|
media_host ||= host_to_url(ENV['S3_CLOUDFRONT_HOST'])
|
|
media_host ||= host_to_url(ENV['S3_HOSTNAME']) if ENV['S3_ENABLED'] == 'true'
|
|
media_host ||= assets_host
|
|
|
|
Rails.application.config.content_security_policy do |p|
|
|
p.base_uri :none
|
|
p.default_src :none
|
|
p.frame_ancestors :none
|
|
p.font_src :self, assets_host
|
|
p.img_src :self, :https, :data, :blob, assets_host
|
|
p.style_src :self, assets_host
|
|
p.media_src :self, :https, :data, assets_host
|
|
p.frame_src :self, :https
|
|
p.manifest_src :self, assets_host
|
|
|
|
if Rails.env.development?
|
|
webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
|
|
|
|
p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
|
|
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
|
|
p.child_src :self, :blob, assets_host
|
|
p.worker_src :self, :blob, assets_host
|
|
else
|
|
p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
|
|
p.script_src :self, assets_host
|
|
p.child_src :self, :blob, assets_host
|
|
p.worker_src :self, :blob, assets_host
|
|
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
|
|
|
|
Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
|
|
|
|
Rails.application.config.content_security_policy_nonce_directives = %w(style-src)
|
|
|
|
PgHero::HomeController.content_security_policy do |p|
|
|
p.script_src :self, :unsafe_inline, assets_host
|
|
p.style_src :self, :unsafe_inline, assets_host
|
|
end
|
|
|
|
PgHero::HomeController.after_action do
|
|
request.content_security_policy_nonce_generator = nil
|
|
end
|