From 2d27c110610a848d30fe150c58bbd60ebf6fab7c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 11 Oct 2018 20:35:46 +0200
Subject: [PATCH] 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
---
 app/controllers/statuses_controller.rb        |  4 +++
 .../initializers/{ostatus.rb => 1_hosts.rb}   |  0
 .../initializers/content_security_policy.rb   | 25 +++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)
 rename config/initializers/{ostatus.rb => 1_hosts.rb} (100%)

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index d4ad3df6019..0f3fe198f40 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
similarity index 100%
rename from config/initializers/ostatus.rb
rename to config/initializers/1_hosts.rb
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 37f2c0d4505..f84116d73a7 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: