Merge pull request #10022 from colinux/csp-host-legacy

Tech: configure les CSP pour répondre à un host défini par `APP_HOST_LEGACY`
This commit is contained in:
Colin Darie 2024-02-21 20:26:06 +00:00 committed by GitHub
commit 67895a5aee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 0 deletions

View file

@ -5,6 +5,11 @@ APPLICATION_NAME="demarches-simplifiees.fr"
APPLICATION_SHORTNAME="d-s.fr" APPLICATION_SHORTNAME="d-s.fr"
APPLICATION_BASE_URL="https://www.demarches-simplifiees.fr" APPLICATION_BASE_URL="https://www.demarches-simplifiees.fr"
# When migrating app to a new domain, configure APP_HOST to the new domain
# and APP_HOST_LEGACY to the legacy domain.
# The app will be able to answer to boths during the transition.
# APP_HOST_LEGACY=""
# If defined to "staging", tell the app that it's running on a staging instance # If defined to "staging", tell the app that it's running on a staging instance
DS_ENV="staging" DS_ENV="staging"

View file

@ -121,4 +121,5 @@ Rails.application.configure do
# config.action_cable.disable_request_forgery_protection = true # config.action_cable.disable_request_forgery_protection = true
config.hosts << ENV.fetch("APP_HOST") config.hosts << ENV.fetch("APP_HOST")
config.hosts << ENV.fetch("APP_HOST_LEGACY") if ENV.key?("APP_HOST_LEGACY")
end end

View file

@ -22,6 +22,7 @@ Rails.application.config.content_security_policy do |policy|
connect_whitelist = ["wss://*.crisp.chat", "*.crisp.chat", "app.franceconnect.gouv.fr", "openmaptiles.geo.data.gouv.fr", "openmaptiles.github.io", "tiles.geo.api.gouv.fr", "data.geopf.fr"] connect_whitelist = ["wss://*.crisp.chat", "*.crisp.chat", "app.franceconnect.gouv.fr", "openmaptiles.geo.data.gouv.fr", "openmaptiles.github.io", "tiles.geo.api.gouv.fr", "data.geopf.fr"]
connect_whitelist << ENV.fetch('APP_HOST') connect_whitelist << ENV.fetch('APP_HOST')
connect_whitelist << ENV.fetch('APP_HOST_LEGACY') if ENV.key?('APP_HOST_LEGACY')
connect_whitelist << "*.amazonaws.com" if Rails.configuration.active_storage.service == :amazon connect_whitelist << "*.amazonaws.com" if Rails.configuration.active_storage.service == :amazon
connect_whitelist += [URI(ENV["SENTRY_DSN_JS"]).host, URI(ENV["SENTRY_DSN_RAILS"]).host].compact.uniq connect_whitelist += [URI(ENV["SENTRY_DSN_JS"]).host, URI(ENV["SENTRY_DSN_RAILS"]).host].compact.uniq
connect_whitelist << URI(DS_PROXY_URL).host if DS_PROXY_URL.present? connect_whitelist << URI(DS_PROXY_URL).host if DS_PROXY_URL.present?