projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8198: consider X-Forwarded-For header by way of request.repote_ip while setting node...
[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 5c0375fc18002197e0ce262a058e46589980e9fc..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,9
+1,21
@@
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
def find_objects_for_index
- # all users can list all keep
disk
s
+ # all users can list all keep
service
s
@objects = model_class.where('1=1')
super
end
@objects = model_class.where('1=1')
super
end
+ def accessible
+ if request.headers['X-External-Client'] == '1'
+ @objects = model_class.where('service_type=?', 'proxy')
+ else
+ @objects = model_class.where(model_class.arel_table[:service_type].not_eq('proxy'))
+ end
+ render_list
+ end
+
end
end