Reduce CSP configuration changes with upstream (#2536)

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

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)
+require_relative '../../app/lib/content_security_policy'
-  return if str.blank?
 
-  uri = Addressable::URI.parse("http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}")
+policy = ContentSecurityPolicy.new
-  uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
+assets_host = policy.assets_host
-  uri.to_s
+media_hosts = policy.media_hosts
-end
 
 def sso_host
   return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true'
@@ -32,38 +30,14 @@ def sso_host
   end
 end
 
-unless Rails.env.development?
+Rails.application.config.content_security_policy do |p|
-  assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || Rails.configuration.x.local_domain}"
-  data_hosts = [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}"
-  else
-    attachments_host = nil
-  end
-
-  data_hosts << attachments_host unless attachments_host.nil?
-
-  if ENV['PAPERCLIP_ROOT_URL']
-    url = Addressable::URI.parse(assets_host) + ENV['PAPERCLIP_ROOT_URL']
-    data_hosts << "https://#{url.host}"
-  end
-
-  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.img_src         :self, :data, :blob, *media_hosts
   p.style_src       :self, assets_host
-    p.media_src       :self, :data, *data_hosts
+  p.media_src       :self, :data, *media_hosts
   p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
 
@@ -75,7 +49,15 @@ unless Rails.env.development?
 
   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
+
+  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}" }
+
+    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

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