Don't try and modify policy if we don't have one
authorTom Hughes <tom@compton.nu>
Thu, 2 Mar 2017 10:39:18 +0000 (10:39 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 2 Mar 2017 10:39:18 +0000 (10:39 +0000)
config/initializers/secure_headers.rb

index cd428d7dd2a9084de15f367c45d7ac512540e175..d1863fdd21e1090947cb88cc97790c9d285ced2a 100644 (file)
@@ -1,24 +1,24 @@
-policy = if defined?(CSP_REPORT_URL)
-           {
-             :default_src => %w('self'),
-             :child_src => %w('self'),
-             :connect_src => %w('self'),
-             :font_src => %w('none'),
-             :form_action => %w('self'),
-             :frame_ancestors => %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('none'),
-             :script_src => %w('self'),
-             :style_src => %w('self' 'unsafe-inline'),
-             :report_uri => [CSP_REPORT_URL]
-           }
-         else
-           SecureHeaders::OPT_OUT
-         end
+if defined?(CSP_REPORT_URL)
+  policy = {
+    :default_src => %w('self'),
+    :child_src => %w('self'),
+    :connect_src => %w('self'),
+    :font_src => %w('none'),
+    :form_action => %w('self'),
+    :frame_ancestors => %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('none'),
+    :script_src => %w('self'),
+    :style_src => %w('self' 'unsafe-inline'),
+    :report_uri => [CSP_REPORT_URL]
+  }
 
-policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
+  policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
+else
+  policy = SecureHeaders::OPT_OUT
+end
 
 SecureHeaders::Configuration.default do |config|
   config.csp = SecureHeaders::OPT_OUT