Allow iD to access wikipedia

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index c727f86d9a55ab5084da81ce8ad637040024e500..394f7b9b38cd0a4cfc88b32e44b3457802cffbdf 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
-    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
@@ -120,9 +118,9 @@ class SiteController < ApplicationController
 
   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 'unsafe-eval']
     )
 
     render "id", :layout => false
@@ -147,9 +145,7 @@ class SiteController < ApplicationController
   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)}"
@@ -157,8 +153,6 @@ class SiteController < ApplicationController
       anchor << "layers=N"
     end
 
-    if anchor.present?
-      redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&"))
-    end
+    redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present?
   end
 end