diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-04 00:14:49 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2019-05-04 00:47:51 +0200 |
| commit | 58720aa2bdc45ec220903e0786984e803c87e8c9 (patch) | |
| tree | 9314a235a248e33ba61cddc79c5a3b843bd6a696 /config | |
| parent | 9f25ab9792532fff9a0b067a24cfd0c20b99644b (diff) | |
Fix CSP when dealing with S3 hosts
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/content_security_policy.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 12b764a5a..9da38598b 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -7,9 +7,11 @@ if Rails.env.production? data_hosts = [assets_host] if ENV['S3_ENABLED'] == 'true' - attachments_host = ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] || ENV['S3_HOSTNAME'] || "s3-#{ENV['S3_REGION'] || 'us-east-1'}.amazonaws.com" + attachments_host = "https://#{ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] || ENV['S3_HOSTNAME'] || "s3-#{ENV['S3_REGION'] || 'us-east-1'}.amazonaws.com"}" + attachments_host = "https://#{Addressable::URI.parse(attachments_host).host}" elsif ENV['SWIFT_ENABLED'] == 'true' attachments_host = ENV['SWIFT_OBJECT_URL'] + attachments_host = "https://#{Addressable::URI.parse(attachments_host).host}" else attachments_host = nil end |