X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3ef580c47029ff0fbf959b044f29c183f41cb609..d45255b6af1ce80d640ecdb21c0af7aa0b95370f:/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 7a1f699911..59c9f39489 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -1,11 +1,34 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class Arvados::V1::UsersController < ApplicationController accept_attribute_as_json :prefs, Hash + accept_param_as_json :updates + + skip_before_action :find_object_by_uuid, only: + [:activate, :current, :system, :setup, :merge, :batch_update] + skip_before_action :render_404_if_no_object, only: + [:activate, :current, :system, :setup, :merge, :batch_update] + before_action :admin_required, only: [:setup, :unsetup, :update_uuid, :batch_update] - skip_before_filter :find_object_by_uuid, only: - [:activate, :current, :system, :setup] - skip_before_filter :render_404_if_no_object, only: - [:activate, :current, :system, :setup] - before_filter :admin_required, only: [:setup, :unsetup] + # Internal API used by controller to update local cache of user + # records from LoginCluster. + def batch_update + @objects = [] + params[:updates].andand.each do |uuid, attrs| + begin + u = User.find_or_create_by(uuid: uuid) + rescue ActiveRecord::RecordNotUnique + retry + end + u.update_attributes!(attrs) + @objects << u + end + @offset = 0 + @limit = -1 + render_list + end def current if current_user @@ -22,8 +45,11 @@ class Arvados::V1::UsersController < ApplicationController end def activate + if params[:id] and params[:id].match(/\D/) + params[:uuid] = params.delete :id + end if current_user.andand.is_admin && params[:uuid] - @object = User.find params[:uuid] + @object = User.find_by_uuid params[:uuid] else @object = current_user end @@ -64,36 +90,17 @@ class Arvados::V1::UsersController < ApplicationController # create user object and all the needed links def setup - @object = nil if params[:uuid] - @object = User.find_by_uuid params[:uuid] + @object = User.find_by_uuid(params[:uuid]) if !@object return render_404_if_no_object end - object_found = true + elsif !params[:user] || params[:user].empty? + raise ArgumentError.new "Required uuid or user" + elsif !params[:user]['email'] + raise ArgumentError.new "Require user email" else - if !params[:user] - raise ArgumentError.new "Required uuid or user" - else - if params[:user]['uuid'] - @object = User.find_by_uuid params[:user]['uuid'] - if @object - object_found = true - end - end - - if !@object - if !params[:user]['email'] - raise ArgumentError.new "Require user email" - end - - if !params[:openid_prefix] - raise ArgumentError.new "Required openid_prefix parameter is missing." - end - - @object = model_class.create! resource_attrs - end - end + @object = model_class.create! resource_attrs end # It's not always possible for the client to know the user's @@ -106,24 +113,22 @@ class Arvados::V1::UsersController < ApplicationController elsif @object.username.nil? raise ArgumentError. new("cannot setup a repository because user has no username") - elsif object_found and - params[:repo_name].start_with?("#{@object.username}/") + elsif params[:repo_name].index("/") full_repo_name = params[:repo_name] else full_repo_name = "#{@object.username}/#{params[:repo_name]}" end - if object_found - @response = @object.setup_repo_vm_links full_repo_name, - params[:vm_uuid], params[:openid_prefix] - else - @response = User.setup @object, params[:openid_prefix], - full_repo_name, params[:vm_uuid] - end + @response = @object.setup(repo_name: full_repo_name, + vm_uuid: params[:vm_uuid]) # setup succeeded. send email to user - if params[:send_notification_email] == true || params[:send_notification_email] == 'true' - UserNotifier.account_is_setup(@object).deliver_now + if params[:send_notification_email] + begin + UserNotifier.account_is_setup(@object).deliver_now + rescue => e + logger.warn "Failed to send email to #{@object.email}: #{e}" + end end send_json kind: "arvados#HashList", items: @response.as_api_response(nil) @@ -136,16 +141,102 @@ class Arvados::V1::UsersController < ApplicationController show end + # Change UUID to a new (unused) uuid and transfer all owned/linked + # objects accordingly. + def update_uuid + @object.update_uuid(new_uuid: params[:new_uuid]) + show + end + + def merge + if (params[:old_user_uuid] || params[:new_user_uuid]) + if !current_user.andand.is_admin + return send_error("Must be admin to use old_user_uuid/new_user_uuid", status: 403) + end + if !params[:old_user_uuid] || !params[:new_user_uuid] + return send_error("Must supply both old_user_uuid and new_user_uuid", status: 422) + end + new_user = User.find_by_uuid(params[:new_user_uuid]) + if !new_user + return send_error("User in new_user_uuid not found", status: 422) + end + @object = User.find_by_uuid(params[:old_user_uuid]) + if !@object + return send_error("User in old_user_uuid not found", status: 422) + end + else + if !Thread.current[:api_client].andand.is_trusted + return send_error("supplied API token is not from a trusted client", status: 403) + elsif Thread.current[:api_client_authorization].scopes != ['all'] + return send_error("cannot merge with a scoped token", status: 403) + end + + new_auth = ApiClientAuthorization.validate(token: params[:new_user_token]) + if !new_auth + return send_error("invalid new_user_token", status: 401) + end + + if new_auth.user.uuid[0..4] == Rails.configuration.ClusterID + if !new_auth.api_client.andand.is_trusted + return send_error("supplied new_user_token is not from a trusted client", status: 403) + elsif new_auth.scopes != ['all'] + return send_error("supplied new_user_token has restricted scope", status: 403) + end + end + new_user = new_auth.user + @object = current_user + end + + if @object.uuid == new_user.uuid + return send_error("cannot merge user to self", status: 422) + end + + if !params[:new_owner_uuid] + return send_error("missing new_owner_uuid", status: 422) + end + + if !new_user.can?(write: params[:new_owner_uuid]) + return send_error("cannot move objects into supplied new_owner_uuid: new user does not have write permission", status: 403) + end + + act_as_system_user do + @object.merge(new_owner_uuid: params[:new_owner_uuid], + new_user_uuid: new_user.uuid, + redirect_to_new_user: params[:redirect_to_new_user]) + end + show + end + protected + def self._merge_requires_parameters + { + new_owner_uuid: { + type: 'string', required: true, + }, + new_user_token: { + type: 'string', required: false, + }, + redirect_to_new_user: { + type: 'boolean', required: false, + }, + old_user_uuid: { + type: 'string', required: false, + }, + new_user_uuid: { + type: 'string', required: false, + } + } + end + def self._setup_requires_parameters { + uuid: { + type: 'string', required: false + }, user: { type: 'object', required: false }, - openid_prefix: { - type: 'string', required: false - }, repo_name: { type: 'string', required: false }, @@ -158,11 +249,19 @@ class Arvados::V1::UsersController < ApplicationController } end + def self._update_uuid_requires_parameters + { + new_uuid: { + type: 'string', required: true, + }, + } + end + 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. - safe_attrs = ["uuid", "is_active", "email", "first_name", "last_name"] + safe_attrs = ["uuid", "is_active", "email", "first_name", "last_name", "username"] if @select @select = @select & safe_attrs else @@ -172,4 +271,8 @@ class Arvados::V1::UsersController < ApplicationController end super end + + def nullable_attributes + super + [:email, :first_name, :last_name, :username] + end end