X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7dc87f1e141000bb23339ae5c8d985f6093a8864..3acff4c57e3459dae420903c02c717cd5c07319f:/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 52f8e9da5e..1461eeccaa 100644
--- 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 :login_required, :only => :ping
+  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,9 +14,27 @@ 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
+    if current_user.andand.is_admin || !current_user.andand.is_active
+      super
+    else
+      # active non-admin users can list nodes that are (or were
+      # recently) working
+      @objects = model_class.where('last_ping_at >= ?', Time.now - 1.hours)
+    end
   end
 end