projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11345-nodemanager-retry-after' refs #11345
[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 2cb68fdd70c01482b548b4f46055f88e56e21b07..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
@@
-2,6
+2,7
@@
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 :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
def find_objects_for_index
# all users can list all keep services
@@
-10,10
+11,10
@@
class Arvados::V1::KeepServicesController < ApplicationController
end
def accessible
end
def accessible
- if request.headers['X-
Keep-Proxy-Required']
+ if request.headers['X-
External-Client'] == '1'
@objects = model_class.where('service_type=?', 'proxy')
else
@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
end
render_list
end