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 /app/controllers/statuses_controller.rb | |
| 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
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 4 |
1 files changed, 4 insertions, 0 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 |