Remove expand_bbox endpoint

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

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index daddd762df65cbdaace333765f6769a425993eb7..b24eb5c4264250c9f65c5ba5bd27bd91322a670f 100644 (file)
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -21,7 +21,10 @@ csp_policy = {
 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] << 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)
+
+csp_policy[:img_src] << Settings.storage_url if Settings.key?(:storage_url)
+
+csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url)

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


@@ -31,10 +34,10 @@ cookie_policy = {
 SecureHeaders::Configuration.default do |config|
   config.hsts = SecureHeaders::OPT_OUT
 
 SecureHeaders::Configuration.default do |config|
   config.hsts = SecureHeaders::OPT_OUT
 

-  if CSP_ENFORCE
+  if Settings.csp_enforce

     config.csp = csp_policy
     config.csp_report_only = SecureHeaders::OPT_OUT
     config.csp = csp_policy
     config.csp_report_only = SecureHeaders::OPT_OUT

-  elsif defined?(CSP_REPORT_URL)
+  elsif Settings.key?(:csp_report_url)

     config.csp = SecureHeaders::OPT_OUT
     config.csp_report_only = csp_policy
   else
     config.csp = SecureHeaders::OPT_OUT
     config.csp_report_only = csp_policy
   else