X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a570f59187efa0a298d31bae2b224de9762bb42f..ba87362e7fe237c00df01967e02d182c15039f5d:/app/controllers/site_controller.rb?ds=inline diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 1fc916e7f..58f0a11c9 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -7,17 +7,29 @@ class SiteController < ApplicationController before_action :redirect_browse_params, :only => :index before_action :redirect_map_params, :only => [:index, :edit, :export] before_action :require_oauth, :only => [:index] + before_action :require_user, :only => [:id] before_action :update_totp, :only => [:index] authorize_resource :class => false + content_security_policy(:only => :edit) do |policy| + policy.frame_src(*policy.frame_src, :blob) + end + + content_security_policy(:only => :id) do |policy| + policy.connect_src("*") + policy.img_src(*policy.img_src, "*", :blob) + policy.script_src(*policy.script_src, :unsafe_eval) + policy.style_src(*policy.style_src, :unsafe_inline) + end + def index session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless Settings.status == "database_readonly" || Settings.status == "database_offline" end def permalink lon, lat, zoom = ShortLink.decode(params[:code]) - new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset) + new_params = params.except(:host, :controller, :action, :code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset) if new_params.key? :m new_params.delete :m @@ -25,35 +37,37 @@ class SiteController < ApplicationController new_params[:mlon] = lon end - if params.key? :node - new_params[:controller] = "browse" - new_params[:action] = "node" - new_params[:id] = params[:node] - elsif params.key? :way - new_params[:controller] = "browse" - new_params[:action] = "way" - new_params[:id] = params[:way] - elsif params.key? :relation - new_params[:controller] = "browse" - new_params[:action] = "relation" - new_params[:id] = params[:relation] - elsif params.key? :changeset - new_params[:controller] = "browse" - new_params[:action] = "changeset" - new_params[:id] = params[:changeset] - else - new_params[:controller] = "site" - new_params[:action] = "index" - end - new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}" new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers - redirect_to new_params.to_unsafe_h + options = new_params.to_unsafe_h.to_options + + path = if params.key? :node + node_path(params[:node], options) + elsif params.key? :way + way_path(params[:way], options) + elsif params.key? :relation + relation_path(params[:relation], options) + elsif params.key? :changeset + changeset_path(params[:changeset], options) + else + root_url(options) + end + + redirect_to path end def key expires_in 7.days, :public => true + @key = YAML.load_file(Rails.root.join("config/key.yml")) + @key.each_value do |layer_data| + layer_data.each do |entry| + entry["name"] = Array(entry["name"]) + end + layer_data.each_cons(2) do |entry, next_entry| + entry["max_zoom"] = next_entry["min_zoom"] - 1 if entry["name"] == next_entry["name"] && !entry["max_zoom"] && next_entry["min_zoom"] + end + end render :layout => false end @@ -68,15 +82,6 @@ class SiteController < ApplicationController require_user end - 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'] - ) - end - begin if params[:node] bbox = Node.visible.find(params[:node]).bbox.to_unscaled @@ -105,6 +110,7 @@ class SiteController < ApplicationController end def copyright + @title = t ".title" @locale = params[:copyright_locale] || I18n.locale end @@ -116,22 +122,31 @@ class SiteController < ApplicationController @locale = params[:about_locale] || I18n.locale end + def communities + @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF") + end + def export; end - def offline; end + def offline + flash.now[:warning] = if Settings.status == "database_offline" + t("layouts.osm_offline") + else + t("layouts.osm_read_only") + end + render :html => nil, :layout => true + end def preview - render :html => RichText.new(params[:type], params[:text]).to_html + if params[:text].blank? + flash.now[:warning] = t("layouts.nothing_to_preview") + render :partial => "layouts/flash" + else + render :html => RichText.new(params[:type], params[:text]).to_html + end end def id - append_content_security_policy_directives( - :connect_src => %w[*], - :img_src => %w[* blob:], - :script_src => %w[dev.virtualearth.net 'unsafe-eval'], - :style_src => %w['unsafe-inline'] - ) - render :layout => false end @@ -145,7 +160,7 @@ class SiteController < ApplicationController elsif params[:relation] redirect_to relation_path(params[:relation]) elsif params[:note] - redirect_to browse_note_path(params[:note]) + redirect_to note_path(params[:note]) elsif params[:query] redirect_to search_path(:query => params[:query]) end @@ -162,6 +177,6 @@ class SiteController < ApplicationController anchor << "layers=N" end - redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present? + redirect_to params.to_unsafe_h.merge(:only_path => true, :anchor => anchor.join("&")) if anchor.present? end end