techhub/mastodon
2
0
Fork 0
Code Activity

Add EXTRA_MEDIA_HOSTS environment variable to add extra hosts to Content-Security-Policy (#34184)

Browse Source 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Shlee
2025-03-26 18:12:15 +10:30
committed by GitHub
parent c93b2c6809
commit 803a8be998
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production.sample
View File

@@ -79,6 +79,9 @@ AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY= AWS_SECRET_ACCESS_KEY=
S3_ALIAS_HOST=files.example.com S3_ALIAS_HOST=files.example.com
# Optional list of hosts that are allowed to serve media for your instance
# EXTRA_MEDIA_HOSTS=https://data.example1.com,https://data.example2.com
# IP and session retention # IP and session retention
# ----------------------- # -----------------------
# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml # Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml

6
app/lib/content_security_policy.rb
View File

@@ -10,7 +10,7 @@ class ContentSecurityPolicy
end end
def media_hosts def media_hosts
[assets_host, cdn_host_value, paperclip_root_url].compact [assets_host, cdn_host_value, paperclip_root_url].concat(extra_media_hosts).compact
end end
def sso_host def sso_host
@@ -31,6 +31,10 @@ class ContentSecurityPolicy
private private
def extra_media_hosts
ENV.fetch('EXTRA_MEDIA_HOSTS', '').split(/(?:\s*,\s*|\s+)/)
end
def url_from_configured_asset_host def url_from_configured_asset_host
Rails.configuration.action_controller.asset_host Rails.configuration.action_controller.asset_host
end end