X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b954416a70fb167b9cae0a3937de16bd9a93d239..e3f91c688e750854d515f1070fdb9e6ddc8f74fc:/config/initializers/secure_headers.rb?ds=inline

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index e53ea6cef..a320836c6 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,27 +1,46 @@
-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]
-  }
+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 => []
+}
 
-  policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
-else
-  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,
+  :httponly => SecureHeaders::OPT_OUT
+}
 
 SecureHeaders::Configuration.default do |config|
-  config.hsts = "max-age=0"
-  config.csp = SecureHeaders::OPT_OUT
-  config.csp_report_only = 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