diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-11 20:35:46 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-11 20:35:46 +0200 |
| commit | 2d27c110610a848d30fe150c58bbd60ebf6fab7c (patch) | |
| tree | 3121a45cd249fd477cee659a51a655a02404688d | |
| parent | 9ece873d62a483abd86221fb9780ed4f65243e96 (diff) | |
| download | mastodon-2d27c110610a848d30fe150c58bbd60ebf6fab7c.tar mastodon-2d27c110610a848d30fe150c58bbd60ebf6fab7c.tar.gz mastodon-2d27c110610a848d30fe150c58bbd60ebf6fab7c.tar.bz2 mastodon-2d27c110610a848d30fe150c58bbd60ebf6fab7c.zip | |
Set Content-Security-Policy rules through RoR's config (#8957)
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
| -rw-r--r-- | app/controllers/statuses_controller.rb | 4 | ||||
| -rw-r--r-- | config/initializers/1_hosts.rb (renamed from config/initializers/ostatus.rb) | 0 | ||||
| -rw-r--r-- | config/initializers/content_security_policy.rb | 25 |
3 files changed, 18 insertions, 11 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index d4ad3df60..0f3fe198f 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -19,6 +19,10 @@ class StatusesController < ApplicationController before_action :set_referrer_policy_header, only: [:show] before_action :set_cache_headers + content_security_policy only: :embed do |p| + p.frame_ancestors(false) + end + def show respond_to do |format| format.html do diff --git a/config/initializers/ostatus.rb b/config/initializers/1_hosts.rb index 757f1f735..757f1f735 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/1_hosts.rb diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 37f2c0d45..f84116d73 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -2,17 +2,20 @@ # For further information see the following documentation # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -# Rails.application.config.content_security_policy do |p| -# p.default_src :self, :https -# p.font_src :self, :https, :data -# p.img_src :self, :https, :data -# p.object_src :none -# p.script_src :self, :https -# p.style_src :self, :https, :unsafe_inline -# -# # Specify URI for violation reports -# # p.report_uri "/csp-violation-report-endpoint" -# end +assets_host = Rails.configuration.action_controller.asset_host || "https://#{ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']}" + +Rails.application.config.content_security_policy do |p| + p.base_uri :none + p.default_src :none + p.frame_ancestors :none + p.script_src :self, assets_host + p.font_src :self, assets_host + p.img_src :self, :https, :data, :blob + p.style_src :self, :unsafe_inline, assets_host + p.media_src :self, :data, assets_host + p.frame_src :self, :https + p.connect_src :self, assets_host, Rails.configuration.x.streaming_api_base_url +end # Report CSP violations to a specified URI # For further information see the following documentation: |