Merge remote-tracking branch 'upstream/pull/1895'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index b0552322ed6d808efbf7a82bae2e001eb9b104fc..6cbe302d61d2b928b70e5305c8f6a3b9a246efa0 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -11,9 +11,7 @@ class SiteController < ApplicationController
   before_action :update_totp, :only => [:index]
 
   def index
   before_action :update_totp, :only => [:index]
 
   def index

-    unless STATUS == :database_readonly || STATUS == :database_offline
-      session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])
-    end
+    session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline

   end
 
   def permalink
   end
 
   def permalink


@@ -50,7 +48,7 @@ class SiteController < ApplicationController
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
 
     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
   end
 
   def key


@@ -69,11 +67,11 @@ class SiteController < ApplicationController
       require_user
     end
 
       require_user
     end
 

-    if editor == "potlatch" || editor == "potlatch2"
+    if %w[potlatch potlatch2].include?(editor)

       append_content_security_policy_directives(
       append_content_security_policy_directives(

-        :object_src => %w(*),
-        :plugin_types => %w(application/x-shockwave-flash),
-        :script_src => %w('unsafe-inline')
+        :object_src => %w[*],
+        :plugin_types => %w[application/x-shockwave-flash],
+        :script_src => %w['unsafe-inline']

       )
     end
 
       )
     end
 


@@ -92,8 +90,8 @@ class SiteController < ApplicationController
       @lat = note.lat
       @lon = note.lon
       @zoom = 17
       @lat = note.lat
       @lon = note.lon
       @zoom = 17

-    elsif params[:gpx] && @user
-      trace = Trace.visible_to(@user).find(params[:gpx])
+    elsif params[:gpx] && current_user
+      trace = Trace.visible_to(current_user).find(params[:gpx])

       @lat = trace.latitude
       @lon = trace.longitude
       @zoom = 16
       @lat = trace.latitude
       @lon = trace.longitude
       @zoom = 16


@@ -115,14 +113,15 @@ class SiteController < ApplicationController
   def offline; end
 
   def preview
   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(
   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)
+      :connect_src => %w[*],
+      :img_src => %w[* blob:],
+      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org services.arcgisonline.com serviceslab.arcgisonline.com 'unsafe-eval'],
+      :style_src => %w['unsafe-inline']

     )
 
     render "id", :layout => false
     )
 
     render "id", :layout => false


@@ -147,9 +146,7 @@ class SiteController < ApplicationController
   def redirect_map_params
     anchor = []
 
   def redirect_map_params
     anchor = []
 

-    if params[:lat] && params[:lon]
-      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
-    end
+    anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon]

 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"


@@ -157,8 +154,6 @@ class SiteController < ApplicationController
       anchor << "layers=N"
     end
 
       anchor << "layers=N"
     end
 

-    if anchor.present?
-      redirect_to Hash[params].merge(:anchor => anchor.join("&"))
-    end
+    redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present?

   end
 end
   end
 end