X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96c91757fc23023f2d56019252a9f89f2482266f..d85621c7aea365b1548d5301af292528dd8b329d:/app/controllers/site_controller.rb?ds=inline

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index aa284ecdc..6e26e798f 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -69,6 +69,14 @@ class SiteController < ApplicationController
       require_user
     end
 
+    if %w[potlatch potlatch2].include?(editor)
+      append_content_security_policy_directives(
+        :object_src => %w[*],
+        :plugin_types => %w[application/x-shockwave-flash],
+        :script_src => %w['unsafe-inline']
+      )
+    end
+
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
@@ -107,10 +115,16 @@ class SiteController < ApplicationController
   def offline; end
 
   def preview
-    render :text => RichText.new(params[:format], params[:text]).to_html
+    render :html => RichText.new(params[:type], params[:text]).to_html
   end
 
   def id
+    append_content_security_policy_directives(
+      :connect_src => %w[taginfo.openstreetmap.org *.mapillary.com],
+      :img_src => %w[*],
+      :script_src => %w[dev.virtualearth.net]
+    )
+
     render "id", :layout => false
   end