From 2d27c110610a848d30fe150c58bbd60ebf6fab7c Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 11 Oct 2018 20:35:46 +0200 Subject: Set Content-Security-Policy rules through RoR's config (#8957) * Set CSP rules in RoR's configuration * Override CSP setting in the embed controller to allow frames --- config/initializers/content_security_policy.rb | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'config/initializers/content_security_policy.rb') diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 37f2c0d45..f84116d73 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -2,17 +2,20 @@ # For further information see the following documentation # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -# Rails.application.config.content_security_policy do |p| -# p.default_src :self, :https -# p.font_src :self, :https, :data -# p.img_src :self, :https, :data -# p.object_src :none -# p.script_src :self, :https -# p.style_src :self, :https, :unsafe_inline -# -# # Specify URI for violation reports -# # p.report_uri "/csp-violation-report-endpoint" -# end +assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}" + +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, assets_host + p.frame_src :self, :https + p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url +end # Report CSP violations to a specified URI # For further information see the following documentation: -- cgit From edc7f895beb80ea00b5c2c933975b210a19eb017 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 12 Oct 2018 01:43:09 +0200 Subject: Fix CSP headers blocking media and development environment (#8962) Regression from #8957 --- config/initializers/content_security_policy.rb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'config/initializers/content_security_policy.rb') diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index f84116d73..962b871a2 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -2,19 +2,29 @@ # For further information see the following documentation # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}" +base_host = Rails.configuration.x.web_domain +assets_host = Rails.configuration.action_controller.asset_host +assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}" 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.img_src :self, :https, :data, :blob, assets_host p.style_src :self, :unsafe_inline, assets_host - p.media_src :self, :data, assets_host + p.media_src :self, :https, :data, assets_host p.frame_src :self, :https - p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url + + 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, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls + p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host + else + p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url + p.script_src :self, assets_host + end end # Report CSP violations to a specified URI -- cgit From 8ab081ec3245e70acb7878b7842cfa07ca050464 Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 12 Oct 2018 19:07:30 +0200 Subject: Add manifest_src to CSP, add blob to connect_src (#8967) --- config/initializers/content_security_policy.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/initializers/content_security_policy.rb') diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 962b871a2..59cfbba17 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -15,14 +15,15 @@ Rails.application.config.content_security_policy do |p| p.style_src :self, :unsafe_inline, 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, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls + p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host else - p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url + p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url p.script_src :self, assets_host end end -- cgit