From: Tom Hughes Date: Sun, 8 Dec 2024 14:55:55 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5375' X-Git-Tag: live~8 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7b05c1c060f3f85f47413ec7db984180514d3ba6?hp=-c Merge remote-tracking branch 'upstream/pull/5375' --- 7b05c1c060f3f85f47413ec7db984180514d3ba6 diff --combined app/controllers/application_controller.rb index fc90e0be7,d46a68215..bde7e0287 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@@ -21,7 -21,7 +21,7 @@@ class ApplicationController < ActionCon def self.allow_thirdparty_images(**options) content_security_policy(options) do |policy| - policy.img_src("*") + policy.img_src("*", :data) end end @@@ -253,9 -253,7 +253,7 @@@ def map_layout policy = request.content_security_policy.clone - policy.child_src(*policy.child_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112") - policy.frame_src(*policy.frame_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112") - policy.connect_src(*policy.connect_src, Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url) + policy.connect_src(*policy.connect_src, "http://127.0.0.1:8111", Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url) policy.form_action(*policy.form_action, "render.openstreetmap.org") policy.style_src(*policy.style_src, :unsafe_inline)