Redirect to the login page if auth failure has no origin

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 6c3e2c5cf2d272f4ee120153acb83a1fda3142b7..fb50b6aad39e0401ee64e469aa874019e9d1e221 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -38,8 +38,8 @@
 class AmfController < ApplicationController
   include Potlatch
 
-  skip_before_filter :verify_authenticity_token
-  before_filter :check_api_writable
+  skip_before_action :verify_authenticity_token
+  before_action :check_api_writable
 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.
@@ -376,8 +376,9 @@ class AmfController < ApplicationController
           timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S")
           old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
           unless old_way.nil?
-            points = old_way.get_nodes_revert(timestamp)
-            unless old_way.visible
+            if old_way.visible
+              points = old_way.get_nodes_revert(timestamp)
+            else
               return [-1, "Sorry, the way was deleted at that time - please revert to a previous version.", id]
             end
           end
@@ -610,7 +611,8 @@ class AmfController < ApplicationController
   # 3. new way id,
   # 4. hash of renumbered nodes (old id=>new id),
   # 5. way version,
-  # 6. hash of node versions (node=>version)
+  # 6. hash of changed node versions (node=>version)
+  # 7. hash of deleted node versions (node=>version)
 
   def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:
     amf_handle_error("'putway' #{originalway}", "way", originalway) do
@@ -621,7 +623,7 @@ class AmfController < ApplicationController
       return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
       return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
 
-      return -2, "Server error - way is only #{points.length} points long." if pointlist.length < 2
+      return -2, "Server error - way is only #{pointlist.length} points long." if pointlist.length < 2
 
       return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(attributes)
       attributes = strip_non_xml_chars attributes
@@ -738,7 +740,11 @@ class AmfController < ApplicationController
       new_node = nil
       Node.transaction do
         if id > 0
-          node = Node.find(id)
+          begin
+            node = Node.find(id)
+          rescue ActiveRecord::RecordNotFound
+            return [-4, "node", id]
+          end
 
           unless visible || node.ways.empty?
             return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version
@@ -782,14 +788,16 @@ class AmfController < ApplicationController
   def getpoi(id, timestamp) #:doc:
     amf_handle_error("'getpoi' #{id}", "node", id) do
       id = id.to_i
-      n = Node.find(id)
-      v = n.version
-      unless timestamp == ""
-        n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
+      n = Node.where(:id => id).first
+      if n
+        v = n.version
+        unless timestamp == ""
+          n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
+        end
       end
 
       if n
-        return [0, "", n.id, n.lon, n.lat, n.tags, v]
+        return [0, "", id, n.lon, n.lat, n.tags, v]
       else
         return [-4, "node", id]
       end