From: Tom Clegg <tom@curoverse.com>
Date: Fri, 24 Jan 2014 16:45:36 +0000 (-0800)
Subject: Fix keep_disks.ping to accept a correct ping_secret in lieu of a
X-Git-Tag: 1.1.0~2722^2~37^2~25
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/59994ce0b7623c84d2d633c7c0bac0966245932c

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 0da729c79b..cfe657e451 100644
--- 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])