Do not require filesystem_uuid in first keep_disks/ping request.

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

diff --git a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
index 543863dde6b0312bec963beb99d3c6f6956a8b8f..31327ad93b89443452d82ce862e02cda598f77e0 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
@@ -5,31 +5,43 @@ class Arvados::V1::KeepDisksController < ApplicationController
     {
       uuid: false,
       ping_secret: true,
-      ec2_instance_id: false,
-      local_ipv4: false,
+      node_uuid: false,
       filesystem_uuid: false,
+      service_host: false,
       service_port: true,
       service_ssl_flag: true
     }
   end
   def ping
-    if !@object and params[:filesystem_uuid] and current_user and current_user.is_admin
-      if KeepDisk.where('filesystem_uuid=?', params[:filesystem_uuid]).empty?
-        @object = KeepDisk.new filesystem_uuid: params[:filesystem_uuid]
+    if !@object
+      if current_user.andand.is_admin
+        @object = KeepDisk.new(filesystem_uuid: params[:filesystem_uuid])
         @object.save!
+
+        # In the first ping from this new filesystem_uuid, we can't
+        # expect the keep node to know the ping_secret so we made sure
+        # we got an admin token. Here we add ping_secret to params so
+        # KeepNode.ping() understands this update is properly
+        # authenticated.
         params[:ping_secret] = @object.ping_secret
       else
-        raise "ping from keep_disk with existing filesystem_uuid #{params[:filesystem_uuid]} but wrong uuid #{params[:uuid]}"
+        return render_not_found "object not found"
       end
     end
 
-    if !@object
+    params[:service_host] ||= request.env['REMOTE_ADDR']
+    if not @object.ping params
       return render_not_found "object not found"
     end
+    render json: @object.as_api_response(:superuser)
+  end
 
-    params.merge!(service_host:
-                  params[:local_ipv4] || request.env['REMOTE_ADDR'])
-    @object.ping params
-    show
+  def find_objects_for_index
+    if current_user.andand.is_admin || !current_user.andand.is_active
+      super
+    else
+      # active non-admin users can list all keep disks
+      @objects = model_class.all
+    end
   end
 end