X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/252a5f7f290567f7cbcc9897a879c0a7ebe64e90..3facf89bf048487ee718fe15d012b489f2d407b7:/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb diff --git a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb index 56d0d85a82..59e359232e 100644 --- a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb +++ b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb @@ -1,8 +1,15 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +require 'safe_json' + class Arvados::V1::ApiClientAuthorizationsController < ApplicationController accept_attribute_as_json :scopes, Array - before_filter :current_api_client_is_trusted - before_filter :admin_required, :only => :create_system_auth - skip_before_filter :render_404_if_no_object, :only => :create_system_auth + before_action :current_api_client_is_trusted, :except => [:current] + before_action :admin_required, :only => :create_system_auth + skip_before_action :render_404_if_no_object, :only => [:create_system_auth, :current] + skip_before_action :find_object_by_uuid, :only => [:create_system_auth, :current] def self._create_system_auth_requires_parameters { @@ -15,7 +22,7 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController new(user_id: system_user.id, api_client_id: params[:api_client_id] || current_api_client.andand.id, created_by_ip_address: remote_ip, - scopes: Oj.load(params[:scopes] || '["all"]')) + scopes: SafeJSON.load(params[:scopes] || '["all"]')) @object.save! show end @@ -40,6 +47,11 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController super end + def current + @object = Thread.current[:api_client_authorization] + show + end + protected def default_orders @@ -69,20 +81,51 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController val.is_a?(String) && (attr == 'uuid' || attr == 'api_token') } end - @objects = model_class. - includes(:user, :api_client). - where('user_id=?', current_user.id) - super - wanted_scopes.compact.each do |scope_list| - sorted_scopes = scope_list.sort - @objects = @objects.select { |auth| auth.scopes.sort == sorted_scopes } + if current_api_client_authorization.andand.api_token != Rails.configuration.SystemRootToken + @objects = model_class.where('user_id=?', current_user.id) end + if wanted_scopes.compact.any? + # We can't filter on scopes effectively using AR/postgres. + # Instead we get the entire result set, do our own filtering on + # scopes to get a list of UUIDs, then start a new query + # (restricted to the selected UUIDs) so super can apply the + # offset/limit/order params in the usual way. + @request_limit = @limit + @request_offset = @offset + @limit = @objects.count + @offset = 0 + super + wanted_scopes.compact.each do |scope_list| + if @objects.respond_to?(:where) && scope_list.length < 2 + @objects = @objects. + where('scopes in (?)', + [scope_list.to_yaml, SafeJSON.dump(scope_list)]) + else + if @objects.respond_to?(:where) + # Eliminate rows with scopes=['all'] before doing the + # expensive filter. They are typically the majority of + # rows, and they obviously won't match given + # scope_list.length>=2, so loading them all into + # ActiveRecord objects is a huge waste of time. + @objects = @objects. + where('scopes not in (?)', + [['all'].to_yaml, SafeJSON.dump(['all'])]) + end + sorted_scopes = scope_list.sort + @objects = @objects.select { |auth| auth.scopes.sort == sorted_scopes } + end + end + @limit = @request_limit + @offset = @request_offset + @objects = model_class.where('uuid in (?)', @objects.collect(&:uuid)) + end + super end def find_object_by_uuid uuid_param = params[:uuid] || params[:id] - if (uuid_param != current_api_client_authorization.andand.uuid and - not Thread.current[:api_client].andand.is_trusted) + if (uuid_param != current_api_client_authorization.andand.uuid && + !Thread.current[:api_client].andand.is_trusted) return forbidden end @limit = 1 @@ -110,8 +153,10 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController # The @filters test here also prevents a non-trusted token from # filtering on its own scopes, and discovering whether any _other_ # equally scoped tokens exist (403=yes, 200=no). - if (@objects.andand.count == 1 and - @objects.first.uuid == current_api_client_authorization.andand.uuid and + return forbidden if !@objects + full_set = @objects.except(:limit).except(:offset) if @objects + if (full_set.count == 1 and + full_set.first.uuid == current_api_client_authorization.andand.uuid and (@filters.map(&:first) & %w(uuid api_token)).any?) return true end