Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (#28561)

Browse Source
This commit is contained in:
Claire
2024-01-05 11:45:36 +01:00
committed by GitHub
parent 964a0ecf37
commit 5f4643b895
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/lib/content_security_policy.rb
View File

@@ -10,7 +10,7 @@ class ContentSecurityPolicy
end
def media_hosts
[assets_host, cdn_host_value].compact
[assets_host, cdn_host_value, paperclip_root_url].compact
end
private
@@ -23,6 +23,15 @@ class ContentSecurityPolicy
s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host
end
def paperclip_root_url
root_url = ENV.fetch('PAPERCLIP_ROOT_URL', nil)
return if root_url.blank?
(Addressable::URI.parse(assets_host) + root_url).tap do |uri|
uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
end.to_s
end
def url_from_base_host
host_to_url(base_host)
end