Use explicit to_unsafe_h method when converting parameters to a hash

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index aa284ecdc100ba37135d7a8e5b9f38db35650218..5ca5c0aabcdda8202fef65b8fd51b2ca015e604d 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -50,7 +50,7 @@ class SiteController < ApplicationController
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
 
-    redirect_to Hash[new_params]
+    redirect_to new_params.to_unsafe_h
   end
 
   def key
@@ -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
 
@@ -144,7 +158,7 @@ class SiteController < ApplicationController
     end
 
     if anchor.present?
-      redirect_to Hash[params].merge(:anchor => anchor.join("&"))
+      redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&"))
     end
   end
 end