From 48db3b3c99a3ea240f94eda9fccc4ed84f37538f Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 23 Aug 2018 13:08:39 +0200 Subject: [PATCH] Tighten CSP while allowing CDN hosts --- .../initializers/{ostatus.rb => 1_hosts.rb} | 0 .../initializers/content_security_policy.rb | 22 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) rename config/initializers/{ostatus.rb => 1_hosts.rb} (100%) diff --git a/config/initializers/ostatus.rb b/config/initializers/1_hosts.rb similarity index 100% rename from config/initializers/ostatus.rb rename to config/initializers/1_hosts.rb diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 7be45f9503..9bf278ba2d 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -2,20 +2,22 @@ # 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']}" + Rails.application.config.content_security_policy do |p| + p.base_uri :none + p.default_src :none p.frame_ancestors :none - p.object_src :none - p.script_src :self - p.base_uri :none -# p.default_src :self, :https -# p.font_src :self, :https, :data -# p.img_src :self, :https, :data -# p.style_src :self, :https, :unsafe_inline -# -# # Specify URI for violation reports -# # p.report_uri "/csp-violation-report-endpoint" + 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: # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only