Fix typo in method name

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index f4633d72f5e860717cb030bbd32a17f60381b10c..a320836c6eb2e056ce7143f6aead9e2dfad1616a 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,24 +1,27 @@
-if defined?(CSP_REPORT_URL)
-  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]
-  }
+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],
+  :manifest_src => %w['none'],
+  :media_src => %w['none'],
+  :object_src => %w['self'],
+  :plugin_types => %w[],
+  :script_src => %w['self'],
+  :style_src => %w['self'],
+  :worker_src => %w['none'],
+  :report_uri => []
+}

 
 

-  csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
-else
-  csp_policy = SecureHeaders::OPT_OUT
-end
+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)
+csp_policy[:report_uri] << CSP_REPORT_URL if defined?(CSP_REPORT_URL)

 
 cookie_policy = {
   :secure => SecureHeaders::OPT_OUT,
 
 cookie_policy = {
   :secure => SecureHeaders::OPT_OUT,


@@ -26,8 +29,18 @@ cookie_policy = {
 }
 
 SecureHeaders::Configuration.default do |config|
 }
 
 SecureHeaders::Configuration.default do |config|

-  config.hsts = "max-age=0"
-  config.csp = SecureHeaders::OPT_OUT
-  config.csp_report_only = csp_policy
+  config.hsts = SecureHeaders::OPT_OUT
+
+  if CSP_ENFORCE
+    config.csp = csp_policy
+    config.csp_report_only = SecureHeaders::OPT_OUT
+  elsif defined?(CSP_REPORT_URL)
+    config.csp = SecureHeaders::OPT_OUT
+    config.csp_report_only = csp_policy
+  else
+    config.csp = SecureHeaders::OPT_OUT
+    config.csp_report_only = SecureHeaders::OPT_OUT
+  end
+

   config.cookies = cookie_policy
 end
   config.cookies = cookie_policy
 end