Format closed_at correctly in changeset API responses

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1a4c9f148425eef9621568d8d822fd0a49a1a916..471e9f3c5636d75d54765fc2854919e9a4da11e1 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -6,13 +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 :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 :require_oauth, :only => [:index]

+  before_action :update_totp, :only => [:index]
+
+  authorize_resource :class => false

 
   def 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 Settings.status == "database_readonly" || Settings.status == "database_offline"

   end
 
   def permalink
   end
 
   def permalink


@@ -49,7 +49,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


@@ -68,6 +68,15 @@ class SiteController < ApplicationController
       require_user
     end
 
       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
+

     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat


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

-    elsif params[:gpx]
-      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


@@ -106,10 +115,17 @@ 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
   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 "id", :layout => false
   end
 
     render "id", :layout => false
   end
 


@@ -132,9 +148,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)}"


@@ -142,8 +156,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