X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e4fca76d5db9bd844530454894d07ddc729b4a9a..a3c7d9e03062e3246b0857fbae05f45d22e39169:/services/api/app/controllers/arvados/v1/groups_controller.rb diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb index a963d1fc4d..46d3a75a3a 100644 --- a/services/api/app/controllers/arvados/v1/groups_controller.rb +++ b/services/api/app/controllers/arvados/v1/groups_controller.rb @@ -7,8 +7,8 @@ require "trashable" class Arvados::V1::GroupsController < ApplicationController include TrashableController - skip_before_filter :find_object_by_uuid, only: :shared - skip_before_filter :render_404_if_no_object, only: :shared + skip_before_action :find_object_by_uuid, only: :shared + skip_before_action :render_404_if_no_object, only: :shared def self._index_requires_parameters (super rescue {}). @@ -19,6 +19,15 @@ class Arvados::V1::GroupsController < ApplicationController }) end + def self._show_requires_parameters + (super rescue {}). + merge({ + include_trash: { + type: 'boolean', required: false, description: "Show group/project even if its is_trashed attribute is true." + }, + }) + end + def self._contents_requires_parameters params = _index_requires_parameters. merge({ @@ -28,11 +37,65 @@ class Arvados::V1::GroupsController < ApplicationController recursive: { type: 'boolean', required: false, description: 'Include contents from child groups recursively.' }, + include: { + type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid)' + } }) params.delete(:select) params end + def self._create_requires_parameters + super.merge( + { + async: { + required: false, + type: 'boolean', + location: 'query', + default: false, + description: 'defer permissions update' + } + } + ) + end + + def self._update_requires_parameters + super.merge( + { + async: { + required: false, + type: 'boolean', + location: 'query', + default: false, + description: 'defer permissions update' + } + } + ) + end + + def create + if params[:async] + @object = model_class.new(resource_attrs.merge({async_permissions_update: true})) + @object.save! + render_accepted + else + super + end + end + + def update + if params[:async] + attrs_to_update = resource_attrs.reject { |k, v| + [:kind, :etag, :href].index k + }.merge({async_permissions_update: true}) + @object.update_attributes!(attrs_to_update) + @object.save! + render_accepted + else + super + end + end + def render_404_if_no_object if params[:action] == 'contents' if !params[:uuid] @@ -55,7 +118,7 @@ class Arvados::V1::GroupsController < ApplicationController def contents load_searchable_objects - send_json({ + list = { :kind => "arvados#objectList", :etag => "", :self_link => "", @@ -63,7 +126,11 @@ class Arvados::V1::GroupsController < ApplicationController :limit => @limit, :items_available => @items_available, :items => @objects.as_api_response(nil) - }) + } + if @extra_included + list[:included] = @extra_included.as_api_response(nil, {select: @select}) + end + send_json(list) end def shared @@ -76,10 +143,6 @@ class Arvados::V1::GroupsController < ApplicationController # This also returns (in the "included" field) the objects that own # those projects (users or non-project groups). # - # select groups that are readable by current user AND - # the owner_uuid is a user (but not the current user) OR - # the owner_uuid is not readable by the current user - # the owner_uuid is a group but group_class is not a project # # The intended use of this endpoint is to support clients which # wish to browse those projects which are visible to the user but @@ -88,25 +151,15 @@ class Arvados::V1::GroupsController < ApplicationController load_limit_offset_order_params load_filters_param - read_parent_check = if current_user.is_admin - "" - else - "NOT EXISTS(SELECT 1 FROM #{PERMISSION_VIEW} WHERE "+ - "user_uuid=(:user_uuid) AND target_uuid=groups.owner_uuid AND perm_level >= 1) OR " - end + @objects = exclude_home Group.readable_by(*@read_users), Group - @objects = Group.readable_by(*@read_users).where("groups.owner_uuid IN (SELECT users.uuid FROM users WHERE users.uuid != (:user_uuid)) OR "+ - read_parent_check+ - "EXISTS(SELECT 1 FROM groups as gp where gp.uuid=groups.owner_uuid and gp.group_class != 'project')", - user_uuid: current_user.uuid) apply_where_limit_order_params - owners = @objects.map(&:owner_uuid).to_a - if params["include"] == "owner_uuid" + owners = @objects.map(&:owner_uuid).to_set @extra_included = [] [Group, User].each do |klass| - @extra_included += klass.readable_by(*@read_users).where(uuid: owners).to_a + @extra_included += klass.readable_by(*@read_users).where(uuid: owners.to_a).to_a end end @@ -150,8 +203,8 @@ class Arvados::V1::GroupsController < ApplicationController table_names = Hash[klasses.collect { |k| [k, k.table_name] }] - disabled_methods = Rails.configuration.disable_api_methods - avail_klasses = table_names.select{|k, t| !disabled_methods.include?(t+'.index')} + disabled_methods = Rails.configuration.API.DisabledAPIs + avail_klasses = table_names.select{|k, t| !disabled_methods[t+'.index']} klasses = avail_klasses.keys request_filters.each do |col, op, val| @@ -178,8 +231,14 @@ class Arvados::V1::GroupsController < ApplicationController else filter_by_owner[:owner_uuid] = @object.uuid end + + if params['exclude_home_project'] + raise ArgumentError.new "Cannot use 'exclude_home_project' with a parent object" + end end + included_by_uuid = {} + seen_last_class = false klasses.each do |klass| @offset = 0 if seen_last_class # reset offset for the new next type being processed @@ -227,6 +286,10 @@ class Arvados::V1::GroupsController < ApplicationController @objects = klass.readable_by(*@read_users, {:include_trash => params[:include_trash]}). order(request_order).where(where_conds) + if params['exclude_home_project'] + @objects = exclude_home @objects, klass + end + klass_limit = limit_all - all_objects.count @limit = klass_limit apply_where_limit_order_params klass @@ -242,6 +305,19 @@ class Arvados::V1::GroupsController < ApplicationController # with limit=0 and just accumulate items_available. limit_all = all_objects.count end + + if params["include"] == "owner_uuid" + owners = klass_object_list[:items].map {|i| i[:owner_uuid]}.to_set + [Group, User].each do |ownerklass| + ownerklass.readable_by(*@read_users).where(uuid: owners.to_a).each do |ow| + included_by_uuid[ow.uuid] = ow + end + end + end + end + + if params["include"] + @extra_included = included_by_uuid.values end @objects = all_objects @@ -249,4 +325,25 @@ class Arvados::V1::GroupsController < ApplicationController @offset = offset_all end + protected + + def exclude_home objectlist, klass + # select records that are readable by current user AND + # the owner_uuid is a user (but not the current user) OR + # the owner_uuid is not readable by the current user + # the owner_uuid is a group but group_class is not a project + + read_parent_check = if current_user.is_admin + "" + else + "NOT EXISTS(SELECT 1 FROM #{PERMISSION_VIEW} WHERE "+ + "user_uuid=(:user_uuid) AND target_uuid=#{klass.table_name}.owner_uuid AND perm_level >= 1) OR " + end + + objectlist.where("#{klass.table_name}.owner_uuid IN (SELECT users.uuid FROM users WHERE users.uuid != (:user_uuid)) OR "+ + read_parent_check+ + "EXISTS(SELECT 1 FROM groups as gp where gp.uuid=#{klass.table_name}.owner_uuid and gp.group_class != 'project')", + user_uuid: current_user.uuid) + end + end