Preserve schemes in security policy

[rails.git] / config / initializers / secure_headers.rb

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index b0b45aa13125f355fd56ca74b31217f0d970af8f..ba9aa496f4468601293db2a7bd13abed81e404a5 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,20 +1,23 @@
 if defined?(CSP_REPORT_URL)
   csp_policy = {
+    :preserve_schemes => true,
     :default_src => %w['self'],
     :child_src => %w['self'],
     :connect_src => %w['self'],
     :font_src => %w['none'],
     :form_action => %w['self'],
     :frame_ancestors => %w['self'],
+    :frame_src => %w['self'],
     :img_src => %w['self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr],
     :media_src => %w['none'],
     :object_src => %w['self'],
     :plugin_types => %w[],
     :script_src => %w['self'],
-    :style_src => %w['self' 'unsafe-inline'],
+    :style_src => %w['self'],
     :report_uri => [CSP_REPORT_URL]
   }
 
+  csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK)
   csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK)
   csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
 else