OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

add SWIFT object storage uri to CSP media hosts (#32439) 

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
pull/32534/head
kenkiku1021 2024-10-15 18:28:07 +09:00 committed by GitHub
parent 7d89cea0ea
commit f2378aca40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/content_security_policy.rb
View File

@ -36,7 +36,7 @@ class ContentSecurityPolicy
end end
def cdn_host_value def cdn_host_value
s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host || swift_object_url
end end
def paperclip_root_url def paperclip_root_url
@ -72,6 +72,14 @@ class ContentSecurityPolicy
host_to_url ENV.fetch('S3_HOSTNAME', nil) host_to_url ENV.fetch('S3_HOSTNAME', nil)
end end
def swift_object_url
url = ENV.fetch('SWIFT_OBJECT_URL', nil)
return if url.blank? || !url.start_with?('https://')
url += '/' unless url.end_with?('/')
url
end
def uri_from_configuration_and_string(host_string) def uri_from_configuration_and_string(host_string)
Addressable::URI.parse("#{host_protocol}://#{host_string}").tap do |uri| Addressable::URI.parse("#{host_protocol}://#{host_string}").tap do |uri|
uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/') uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')