From 19e14654ccde8fb8e8412d3f4575bbcff3184a33 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 27 Dec 2023 09:54:05 +0100 Subject: [PATCH] Reduce CSP configuration changes with upstream (#2536) --- app/lib/content_security_policy.rb | 6 +- .../initializers/content_security_policy.rb | 72 +++++++------------ spec/requests/content_security_policy_spec.rb | 2 +- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/app/lib/content_security_policy.rb b/app/lib/content_security_policy.rb index 966e41f03b..8f0278e37e 100644 --- a/app/lib/content_security_policy.rb +++ b/app/lib/content_security_policy.rb @@ -10,11 +10,15 @@ class ContentSecurityPolicy end def media_hosts - [assets_host, cdn_host_value].compact + [assets_host, cdn_host_value].concat(extra_data_hosts).compact end private + def extra_data_hosts + ENV.fetch('EXTRA_DATA_HOSTS', '').split('|') + end + def url_from_configured_asset_host Rails.configuration.action_controller.asset_host end diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index a2b84433a7..a8b61e356f 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -6,13 +6,11 @@ # See the Securing Rails Applications Guide for more information: # https://guides.rubyonrails.org/security.html#content-security-policy-header -def host_to_url(str) - return if str.blank? +require_relative '../../app/lib/content_security_policy' - uri = Addressable::URI.parse("http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}") - uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/') - uri.to_s -end +policy = ContentSecurityPolicy.new +assets_host = policy.assets_host +media_hosts = policy.media_hosts def sso_host return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true' @@ -32,51 +30,35 @@ def sso_host end end -unless Rails.env.development? - assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || Rails.configuration.x.local_domain}" - data_hosts = [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, :data, :blob, *media_hosts + p.style_src :self, assets_host + p.media_src :self, :data, *media_hosts + p.frame_src :self, :https + p.manifest_src :self, assets_host - if ENV['S3_ENABLED'] == 'true' || ENV['AZURE_ENABLED'] == 'true' - attachments_host = host_to_url(ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] || ENV['AZURE_ALIAS_HOST'] || ENV['S3_HOSTNAME'] || "s3-#{ENV['S3_REGION'] || 'us-east-1'}.amazonaws.com") - elsif ENV['SWIFT_ENABLED'] == 'true' - attachments_host = ENV.fetch('SWIFT_OBJECT_URL') - attachments_host = "https://#{Addressable::URI.parse(attachments_host).host}" + if sso_host.present? + p.form_action :self, sso_host else - attachments_host = nil + p.form_action :self end - data_hosts << attachments_host unless attachments_host.nil? + p.child_src :self, :blob, assets_host + p.worker_src :self, :blob, assets_host - if ENV['PAPERCLIP_ROOT_URL'] - url = Addressable::URI.parse(assets_host) + ENV['PAPERCLIP_ROOT_URL'] - data_hosts << "https://#{url.host}" - end + if Rails.env.development? + webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public]) + webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" } - data_hosts.concat(ENV['EXTRA_DATA_HOSTS'].split('|')) if ENV['EXTRA_DATA_HOSTS'] - - data_hosts.uniq! - - 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, :data, :blob, *data_hosts - p.style_src :self, assets_host - p.media_src :self, :data, *data_hosts - p.frame_src :self, :https - p.manifest_src :self, assets_host - - if sso_host.present? - p.form_action :self, sso_host - else - p.form_action :self - end - - p.child_src :self, :blob, assets_host - p.worker_src :self, :blob, assets_host - p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts - p.script_src :self, assets_host, "'wasm-unsafe-eval'" + p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *webpacker_urls + p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host + else + p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url + p.script_src :self, assets_host, "'wasm-unsafe-eval'" end end diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb index d327ac1b45..7610e698cd 100644 --- a/spec/requests/content_security_policy_spec.rb +++ b/spec/requests/content_security_policy_spec.rb @@ -20,7 +20,7 @@ describe 'Content-Security-Policy' do "form-action 'self'", "child-src 'self' blob: https://cb6e6126.ngrok.io", "worker-src 'self' blob: https://cb6e6126.ngrok.io", - "connect-src 'self' blob: data: ws://localhost:4000 https://cb6e6126.ngrok.io", + "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://localhost:4000", "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'" ) end