projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[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..d2a512bde75f68c790360813b47872b748481be1 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,20
@@
class Arvados::V1::KeepServicesController < ApplicationController
class Arvados::V1::KeepServicesController < ApplicationController
+ skip_before_filter :find_object_by_uuid, only: :accessible
+ skip_before_filter :render_404_if_no_object, only: :accessible
+
def find_objects_for_index
# all users can list all keep services
@objects = model_class.where('1=1')
super
end
def find_objects_for_index
# all users can list all keep services
@objects = model_class.where('1=1')
super
end
- def access
a
ble
- if request.headers['X-
Keep-Proxy-Required']
+ def access
i
ble
+ 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
end
-
render_list
end
render_list
end