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

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 17353fe96ddc398bc6c42730bd4f0882e3e47772..15ffe58a2616765eac3b34474b9dd0542447cb33 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -7,10 +7,22 @@ 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 :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
 
   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 index
     session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless Settings.status == "database_readonly" || Settings.status == "database_offline"
   end


@@ -47,6 +59,15 @@ class SiteController < ApplicationController
 
   def key
     expires_in 7.days, :public => true
 
   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
 
     render :layout => false
   end
 


@@ -61,12 +82,6 @@ class SiteController < ApplicationController
       require_user
     end
 
       require_user
     end
 

-    if %w[id].include?(editor)
-      append_content_security_policy_directives(
-        :frame_src => %w[blob:]
-      )
-    end
-

     begin
       if params[:node]
         bbox = Node.visible.find(params[:node]).bbox.to_unscaled
     begin
       if params[:node]
         bbox = Node.visible.find(params[:node]).bbox.to_unscaled


@@ -107,26 +122,25 @@ class SiteController < ApplicationController
   end
 
   def communities
   end
 
   def communities

-    @locale = I18n.locale
-    @local_chapters = OsmCommunityIndex::LocalChapter.local_chapters_with_locale(@locale)
+    @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")

   end
 
   def export; end
 
   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
   end
 
   def id
 
   def preview
     render :html => RichText.new(params[:type], params[:text]).to_html
   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
 
     render :layout => false
   end
 


@@ -140,7 +154,7 @@ class SiteController < ApplicationController
     elsif params[:relation]
       redirect_to relation_path(params[:relation])
     elsif params[:note]
     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
     elsif params[:query]
       redirect_to search_path(:query => params[:query])
     end