Fix image and media loading when using external storage server

Fixes #2479
glitch-soc · Nov 21, 2023 · 6cfa024 · 6cfa024
1 parent 769ab0c
commit 6cfa024
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
@@ -48,9 +48,9 @@ def sso_host
   p.default_src     :none
   p.frame_ancestors :none
   p.font_src        :self, assets_host
-  p.img_src         :self, :data, :blob, assets_host
+  p.img_src         :self, :data, :blob, assets_host, media_host
   p.style_src       :self, assets_host
-  p.media_src       :self, :data, assets_host
+  p.media_src       :self, :data, assets_host, media_host
   p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
 

diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
@@ -12,9 +12,9 @@
       "default-src 'none'",
       "frame-ancestors 'none'",
       "font-src 'self' https://cb6e6126.ngrok.io",
-      "img-src 'self' data: blob: https://cb6e6126.ngrok.io",
+      "img-src 'self' data: blob: https://cb6e6126.ngrok.io https://cb6e6126.ngrok.io",
       "style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='",
-      "media-src 'self' data: https://cb6e6126.ngrok.io",
+      "media-src 'self' data: https://cb6e6126.ngrok.io https://cb6e6126.ngrok.io",
       "frame-src 'self' https:",
       "manifest-src 'self' https://cb6e6126.ngrok.io",
       "form-action 'self'",