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

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index 361fb32838afcd6f00eeab8f4c15e38deab7ea27..b0b45aa13125f355fd56ca74b31217f0d970af8f 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,5 +1,5 @@
 if defined?(CSP_REPORT_URL)
-  policy = {
+  csp_policy = {
     :default_src => %w['self'],
     :child_src => %w['self'],
     :connect_src => %w['self'],
@@ -15,13 +15,20 @@ if defined?(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
-  policy = SecureHeaders::OPT_OUT
+  csp_policy = SecureHeaders::OPT_OUT
 end
 
+cookie_policy = {
+  :secure => SecureHeaders::OPT_OUT,
+  :httponly => SecureHeaders::OPT_OUT
+}
+
 SecureHeaders::Configuration.default do |config|
-  config.hsts = "max-age=0"
+  config.hsts = SecureHeaders::OPT_OUT
   config.csp = SecureHeaders::OPT_OUT
-  config.csp_report_only = policy
+  config.csp_report_only = csp_policy
+  config.cookies = cookie_policy
 end