Fix keep_disks.ping to accept a correct ping_secret in lieu of a

sufficiently authorized token.

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 0da729c79b6982886a0108ab3ed15c3168f66602..cfe657e4511ba6e66f2d49041b593f44fa50534c 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
@@ -1,5 +1,6 @@
 class Arvados::V1::KeepDisksController < ApplicationController
   skip_before_filter :require_auth_scope_all, :only => :ping
+  skip_before_filter :find_object_by_uuid, :only => :ping
 
   def self._ping_requires_parameters
     {
@@ -13,6 +14,7 @@ class Arvados::V1::KeepDisksController < ApplicationController
     }
   end
   def ping
+    @object = Node.where(uuid: (params[:id] || params[:uuid])).first
     if !@object
       if current_user.andand.is_admin
         @object = KeepDisk.new(filesystem_uuid: params[:filesystem_uuid])