Merge branch 'master' into 11652-recursive-contents

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

diff --git a/services/api/app/controllers/arvados/v1/keep_services_controller.rb b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
index 43ce94d490533541ce548d934de15f72fc7a8467..e59c5f25789e4e83a9be0a215a784df6742d8eb2 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -1,18 +1,21 @@
 class Arvados::V1::KeepServicesController < ApplicationController
 
+  skip_before_filter :find_object_by_uuid, only: :accessible
+  skip_before_filter :render_404_if_no_object, only: :accessible
+  skip_before_filter :require_auth_scope, only: :accessible
+
   def find_objects_for_index
     # all users can list all keep services
     @objects = model_class.where('1=1')
     super
   end
 
-  def accessable
-    if request.headers['X-Keep-Proxy-Required']
+  def accessible
+    if request.headers['X-External-Client'] == '1'
       @objects = model_class.where('service_type=?', 'proxy')
     else
-      @objects = model_class.where('service_type=?', 'disk')
+      @objects = model_class.where(model_class.arel_table[:service_type].not_eq('proxy'))
     end
-
     render_list
   end