X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/224701a0e17975957d3fcc0262c50806e2a7698d..4c5352de29ca583c41d9babf795983ee4ea3b78e:/services/api/app/controllers/arvados/v1/users_controller.rb diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb index 224dd29156..131ee5236b 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -8,9 +8,14 @@ class Arvados::V1::UsersController < ApplicationController before_filter :admin_required, only: [:setup, :unsetup] def current - @object = current_user - show + if current_user + @object = current_user + show + else + send_error("Not logged in", status: 401) + end end + def system @object = system_user show @@ -136,7 +141,7 @@ class Arvados::V1::UsersController < ApplicationController } end - def apply_filters + def apply_filters(model_class=nil) return super if @read_users.any? &:is_admin if params[:uuid] != current_user.andand.uuid # Non-admin index/show returns very basic information about readable users.