mirror of https://github.com/tootsuite/mastodon
add SWIFT object storage uri to CSP media hosts (#32439)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>pull/32534/head
parent
7d89cea0ea
commit
f2378aca40
|
@ -36,7 +36,7 @@ class ContentSecurityPolicy
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
def paperclip_root_url
|
||||
|
@ -72,6 +72,14 @@ class ContentSecurityPolicy
|
|||
host_to_url ENV.fetch('S3_HOSTNAME', nil)
|
||||
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)
|
||||
Addressable::URI.parse("#{host_protocol}://#{host_string}").tap do |uri|
|
||||
uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
|
||||
|
|
Loading…
Reference in New Issue