mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-26 18:21:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change glitch-soc's CSP config to match upstream's closer (#2474)

Browse source
This commit is contained in:
Claire 2023-11-20 13:02:49 +01:00 committed by GitHub
parent c34a3a83e1
commit d59196e170
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
config/initializers/content_security_policy.rb
View file

@ -14,6 +14,17 @@ def host_to_url(str)
uri.to_s uri.to_s
end end
base_host = Rails.configuration.x.web_domain
assets_host = Rails.configuration.action_controller.asset_host
assets_host ||= host_to_url(base_host)
media_host = host_to_url(ENV['S3_ALIAS_HOST'])
media_host ||= host_to_url(ENV['S3_CLOUDFRONT_HOST'])
media_host ||= host_to_url(ENV['AZURE_ALIAS_HOST'])
media_host ||= host_to_url(ENV['S3_HOSTNAME']) if ENV['S3_ENABLED'] == 'true'
media_host ||= assets_host
def sso_host def sso_host
return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true' return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true'
return unless ENV['OMNIAUTH_ONLY'] == 'true' return unless ENV['OMNIAUTH_ONLY'] == 'true'
@ -32,50 +43,35 @@ def sso_host
end end
end end
unless Rails.env.development? Rails.application.config.content_security_policy do |p|
assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}" p.base_uri :none
data_hosts = [assets_host] p.default_src :none
p.frame_ancestors :none
p.font_src :self, assets_host
p.img_src :self, :data, :blob, assets_host
p.style_src :self, assets_host
p.media_src :self, :data, assets_host
p.frame_src :self, :https
p.manifest_src :self, assets_host
if ENV['S3_ENABLED'] == 'true' || ENV['AZURE_ENABLED'] == 'true' if sso_host.present?
attachments_host = host_to_url(ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] || ENV['AZURE_ALIAS_HOST'] || ENV['S3_HOSTNAME'] || "s3-#{ENV['S3_REGION'] || 'us-east-1'}.amazonaws.com") p.form_action :self, sso_host
elsif ENV['SWIFT_ENABLED'] == 'true'
attachments_host = ENV['SWIFT_OBJECT_URL']
attachments_host = "https://#{Addressable::URI.parse(attachments_host).host}"
else else
attachments_host = nil p.form_action :self
end end
data_hosts << attachments_host unless attachments_host.nil? p.child_src :self, :blob, assets_host
p.worker_src :self, :blob, assets_host
if ENV['PAPERCLIP_ROOT_URL'] if Rails.env.development?
url = Addressable::URI.parse(assets_host) + ENV['PAPERCLIP_ROOT_URL'] webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
data_hosts << "https://#{url.host}" webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
end
data_hosts.concat(ENV['EXTRA_DATA_HOSTS'].split('|')) if ENV['EXTRA_DATA_HOSTS'] p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
data_hosts.uniq! else
p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
Rails.application.config.content_security_policy do |p| p.script_src :self, assets_host, "'wasm-unsafe-eval'"
p.base_uri :none
p.default_src :none
p.frame_ancestors :none
p.script_src :self, assets_host, "'wasm-unsafe-eval'"
p.font_src :self, assets_host
p.img_src :self, :data, :blob, *data_hosts
p.style_src :self, assets_host
p.media_src :self, :data, *data_hosts
p.frame_src :self, :https
p.child_src :self, :blob, assets_host
p.worker_src :self, :blob, assets_host
p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts
p.manifest_src :self, assets_host
if sso_host.present?
p.form_action :self, sso_host
else
p.form_action :self
end
end end
end end

2
spec/requests/content_security_policy_spec.rb
View file

@ -20,7 +20,7 @@ describe 'Content-Security-Policy' do
"form-action 'self'", "form-action 'self'",
"child-src 'self' blob: https://cb6e6126.ngrok.io", "child-src 'self' blob: https://cb6e6126.ngrok.io",
"worker-src 'self' blob: https://cb6e6126.ngrok.io", "worker-src 'self' blob: https://cb6e6126.ngrok.io",
"connect-src 'self' blob: data: ws://localhost:4000 https://cb6e6126.ngrok.io", "connect-src 'self' data: blob: https://cb6e6126.ngrok.io https://cb6e6126.ngrok.io ws://localhost:4000",
"script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'" "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'"
) )
end end