Merge branch 'master' into 2290-user-activity

[arvados.git] / services / api / app / controllers / arvados / v1 / nodes_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/nodes_controller.rb b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index f85eceac0e1ed3f9f296714160f04f87513a7361..1461eeccaa1481fc568eb2a0a8d91a8be8b18562 100644 (file)
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -1,5 +1,7 @@
 class Arvados::V1::NodesController < ApplicationController
   skip_before_filter :require_auth_scope_all, :only => :ping
+  skip_before_filter :find_object_by_uuid, :only => :ping
+  skip_before_filter :render_404_if_no_object, :only => :ping
 
   def create
     @object = Node.new
@@ -12,10 +14,18 @@ class Arvados::V1::NodesController < ApplicationController
     { ping_secret: true }
   end
   def ping
+    @object = Node.where(uuid: (params[:id] || params[:uuid])).first
+    if !@object
+      return render_not_found
+    end
     @object.ping({ ip: params[:local_ipv4] || request.env['REMOTE_ADDR'],
                    ping_secret: params[:ping_secret],
                    ec2_instance_id: params[:instance_id] })
-    show
+    if @object.info[:ping_secret] == params[:ping_secret]
+      render json: @object.as_api_response(:superuser)
+    else
+      raise "Invalid ping_secret after ping"
+    end
   end
 
   def find_objects_for_index