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

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index 97952f7cbc08c80f8f97f294018f5a9fc016554c..e710019da30b70fcc7e8b98e870b63573ccfb3cd 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -18,9 +18,9 @@ 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.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[: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)


@@ -28,7 +28,7 @@ csp_policy[:img_src] << Settings.trace_image_storage_url if Settings.key?(:trace
 csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url)
 
 cookie_policy = {
 csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url)
 
 cookie_policy = {

-  :httponly => { :only => ["_osm_session"] }
+  :httponly => { :only => %w[_osm_session _osm_totp_token] }

 }
 
 SecureHeaders::Configuration.default do |config|
 }
 
 SecureHeaders::Configuration.default do |config|