X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5b33f3f8e31c62bc3e5db1d5b120533c3afdde68..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 48b847cdd..52fea6133 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -6,14 +6,13 @@ class SiteController < ApplicationController before_action :set_locale before_action :redirect_browse_params, :only => :index before_action :redirect_map_params, :only => [:index, :edit, :export] - before_action :require_user, :only => [:welcome] before_action :require_oauth, :only => [:index] before_action :update_totp, :only => [:index] + authorize_resource :class => false + 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 Settings.status == "database_readonly" || Settings.status == "database_offline" end def permalink @@ -50,7 +49,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 @@ -71,32 +70,41 @@ class SiteController < ApplicationController if %w[potlatch potlatch2].include?(editor) append_content_security_policy_directives( + :connect_src => %w[*], :object_src => %w[*], :plugin_types => %w[application/x-shockwave-flash], :script_src => %w['unsafe-inline'] ) + elsif %w[id].include?(editor) + append_content_security_policy_directives( + :frame_src => %w[blob:] + ) end - if params[:node] - bbox = Node.find(params[:node]).bbox.to_unscaled - @lat = bbox.centre_lat - @lon = bbox.centre_lon - @zoom = 18 - elsif params[:way] - bbox = Way.find(params[:way]).bbox.to_unscaled - @lat = bbox.centre_lat - @lon = bbox.centre_lon - @zoom = 17 - elsif params[:note] - note = Note.find(params[:note]) - @lat = note.lat - @lon = note.lon - @zoom = 17 - elsif params[:gpx] && @user - trace = Trace.visible_to(@user).find(params[:gpx]) - @lat = trace.latitude - @lon = trace.longitude - @zoom = 16 + begin + if params[:node] + bbox = Node.visible.find(params[:node]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 18 + elsif params[:way] + bbox = Way.visible.find(params[:way]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 17 + elsif params[:note] + note = Note.visible.find(params[:note]) + @lat = note.lat + @lon = note.lon + @zoom = 17 + elsif params[:gpx] && current_user + trace = Trace.visible_to(current_user).find(params[:gpx]) + @lat = trace.latitude + @lon = trace.longitude + @zoom = 16 + end + rescue ActiveRecord::RecordNotFound + # don't try and derive a location from a missing/deleted object end end @@ -108,24 +116,27 @@ class SiteController < ApplicationController def help; end - def about; end + def about + @locale = params[:about_locale] || I18n.locale + end def export; end 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] + :connect_src => %w[*], + :img_src => %w[* blob:], + :script_src => %w[dev.virtualearth.net 'unsafe-eval'], + :style_src => %w['unsafe-inline'] ) - render "id", :layout => false + render :layout => false end private @@ -147,9 +158,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 +166,6 @@ class SiteController < ApplicationController 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