X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/43c411ec1441ee1710dc33389d7451f7414a170f..391d87d025449737ad6c7836ae66a980aef4c57a:/services/api/app/controllers/arvados/v1/nodes_controller.rb?ds=sidebyside

diff --git a/services/api/app/controllers/arvados/v1/nodes_controller.rb b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index 67a5fab6ad..d04448229c 100644
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -1,5 +1,5 @@
 class Arvados::V1::NodesController < ApplicationController
-  skip_before_filter :login_required, :only => :ping
+  skip_before_filter :require_auth_scope_all, :only => :ping
 
   def create
     @object = Node.new
@@ -8,10 +8,27 @@ class Arvados::V1::NodesController < ApplicationController
     show
   end
 
+  def self._ping_requires_parameters
+    { ping_secret: true }
+  end
   def ping
     @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