Merge remote-tracking branch 'upstream/pull/1850'

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index e53ea6cef3d2e222a0d873e2cf2c4be0f53112ee..b0b45aa13125f355fd56ca74b31217f0d970af8f 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,27 +1,34 @@
 if defined?(CSP_REPORT_URL)
 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'),
+  csp_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[],
+    :script_src => %w['self'],
+    :style_src => %w['self' 'unsafe-inline'],

     :report_uri => [CSP_REPORT_URL]
   }
 
     :report_uri => [CSP_REPORT_URL]
   }
 

-  policy[:script_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
 else

-  policy = SecureHeaders::OPT_OUT
+  csp_policy = SecureHeaders::OPT_OUT

 end
 
 end
 

+cookie_policy = {
+  :secure => SecureHeaders::OPT_OUT,
+  :httponly => SecureHeaders::OPT_OUT
+}
+

 SecureHeaders::Configuration.default do |config|
 SecureHeaders::Configuration.default do |config|

-  config.hsts = "max-age=0"
+  config.hsts = SecureHeaders::OPT_OUT

   config.csp = SecureHeaders::OPT_OUT
   config.csp = SecureHeaders::OPT_OUT

-  config.csp_report_only = policy
+  config.csp_report_only = csp_policy
+  config.cookies = cookie_policy

 end
 end