Only send user IDs to matomo when configured to do so

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index d3b5a568deabf421ce10a6b3fe89e41558a39912..53ab768088a5b18db05ba9bde6dd690f289d3e57 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -18,14 +18,19 @@ csp_policy = {
   :report_uri => []
 }
 
   :report_uri => []
 }
 

-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[:connect_src] << Settings.matomo["location"] if defined?(Settings.matomo)
+csp_policy[:img_src] << Settings.matomo["location"] if defined?(Settings.matomo)
+csp_policy[:script_src] << Settings.matomo["location"] if defined?(Settings.matomo)

 
 

-csp_policy[:img_src] << Settings.storage_url if Settings.key?(:storage_url)
+csp_policy[:img_src] << Settings.avatar_storage_url if Settings.key?(:avatar_storage_url)
+csp_policy[:img_src] << Settings.trace_image_storage_url if Settings.key?(:trace_image_storage_url)

 
 csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url)
 
 
 csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url)
 

+cookie_policy = {
+  :httponly => { :only => ["_osm_session"] }
+}
+

 SecureHeaders::Configuration.default do |config|
   config.hsts = SecureHeaders::OPT_OUT
   config.referrer_policy = "strict-origin-when-cross-origin"
 SecureHeaders::Configuration.default do |config|
   config.hsts = SecureHeaders::OPT_OUT
   config.referrer_policy = "strict-origin-when-cross-origin"


@@ -40,4 +45,6 @@ SecureHeaders::Configuration.default do |config|
     config.csp = SecureHeaders::OPT_OUT
     config.csp_report_only = SecureHeaders::OPT_OUT
   end
     config.csp = SecureHeaders::OPT_OUT
     config.csp_report_only = SecureHeaders::OPT_OUT
   end

+
+  config.cookies = cookie_policy

 end
 end