X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3c4774a5f7b11fa9d3a3640f699488608e3473d6..68f7df96d681d83c04beb36a173bd056a0a248cb:/config/initializers/secure_headers.rb

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index f30a4b86c..bb901e375 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -6,15 +6,17 @@ if defined?(CSP_REPORT_URL)
     :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],
     :media_src => %w['none'],
     :object_src => %w['self'],
     :plugin_types => %w[],
     :script_src => %w['self'],
-    :style_src => %w['self' 'unsafe-inline'],
+    :style_src => %w['self'],
     :report_uri => [CSP_REPORT_URL]
   }
 
+  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)
 else
@@ -27,7 +29,7 @@ cookie_policy = {
 }
 
 SecureHeaders::Configuration.default do |config|
-  config.hsts = "max-age=0"
+  config.hsts = SecureHeaders::OPT_OUT
   config.csp = SecureHeaders::OPT_OUT
   config.csp_report_only = csp_policy
   config.cookies = cookie_policy