Fix CSP when PAPERCLIP_ROOT_URL is set to a different host

1 files changed, 8 insertions, 0 deletions

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 9da38598b..2fe1a33fa 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -15,8 +15,16 @@ if Rails.env.production?
   else
     attachments_host = nil
   end
+
   data_hosts << attachments_host unless attachments_host.nil?
 
+  if ENV['PAPERCLIP_ROOT_URL']
+    url = Addressable::URI.parse(assets_host) + ENV['PAPERCLIP_ROOT_URL']
+    data_hosts << "https://#{url.host}"
+  end
+
+  data_hosts.uniq!
+
   Rails.application.config.content_security_policy do |p|
     p.base_uri        :none
     p.default_src     :none