Merge branch 'glitch'

2 files changed, 16 insertions, 12 deletions

diff --git a/config/initializers/ostatus.rb b/config/initializers/1_hosts.rb
index 5773b7290..5773b7290 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 7be45f950..6a649b772 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -2,20 +2,24 @@
 # 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.frame_ancestors :none
-  p.object_src  :none
-  p.script_src  :self
-  p.base_uri :none
-#  p.default_src :self, :https
-#  p.font_src    :self, :https, :data
-#  p.img_src     :self, :https, :data
-#  p.style_src   :self, :https, :unsafe_inline
-#
-#  # Specify URI for violation reports
-#  # p.report_uri "/csp-violation-report-endpoint"
+if Rails.env.production?
+  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
 end
 
+
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only