X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b91db14a4dced9d6ea124e86be3c796e6f2c8e8c..707ed2964a24ebe940ae440af22fdcb56781fcbd:/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 c2a32f02f1..dc7e62f3e3 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -1,52 +1,30 @@ +# 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 + skip_before_filter :find_object_by_uuid, only: - [:activate, :event_stream, :current, :system, :setup] + [:activate, :current, :system, :setup] skip_before_filter :render_404_if_no_object, only: - [:activate, :event_stream, :current, :system, :setup] - before_filter :admin_required, only: [:setup, :unsetup] + [:activate, :current, :system, :setup] + before_filter :admin_required, only: [:setup, :unsetup, :update_uuid] 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 end - class ChannelStreamer - Q_UPDATE_INTERVAL = 12 - def initialize(opts={}) - @opts = opts - end - def each - return unless @opts[:channel] - @redis = Redis.new(:timeout => 0) - @redis.subscribe(@opts[:channel]) do |event| - event.message do |channel, msg| - yield msg + "\n" - end - end - end - end - - def event_stream - channel = current_user.andand.uuid - if current_user.andand.is_admin - channel = params[:uuid] || channel - end - if client_accepts_plain_text_stream - self.response.headers['Last-Modified'] = Time.now.ctime.to_s - self.response_body = ChannelStreamer.new(channel: channel) - else - render json: { - href: url_for(uuid: channel), - comment: ('To retrieve the event stream as plain text, ' + - 'use a request header like "Accept: text/plain"') - } - end - end - def activate if current_user.andand.is_admin && params[:uuid] @object = User.find params[:uuid] @@ -90,52 +68,47 @@ 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] + raise ArgumentError.new "Required uuid or user" + elsif !params[:user]['email'] + raise ArgumentError.new "Require user email" + elsif !params[:openid_prefix] + raise ArgumentError.new "Required openid_prefix parameter is missing." 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 - if object_found - @response = @object.setup_repo_vm_links params[:repo_name], - params[:vm_uuid], params[:openid_prefix] + # It's not always possible for the client to know the user's + # username when submitting this request: the username might have + # been assigned automatically in create!() above. If client + # provided a plain repository name, prefix it with the username + # now that we know what it is. + if params[:repo_name].nil? + full_repo_name = nil + elsif @object.username.nil? + raise ArgumentError. + new("cannot setup a repository because user has no username") + elsif params[:repo_name].index("/") + full_repo_name = params[:repo_name] else - @response = User.setup @object, params[:openid_prefix], - params[:repo_name], params[:vm_uuid] + full_repo_name = "#{@object.username}/#{params[:repo_name]}" end + @response = @object.setup(repo_name: full_repo_name, + vm_uuid: params[:vm_uuid], + openid_prefix: params[:openid_prefix]) + # setup succeeded. send email to user - if params[:send_notification_email] == true || params[:send_notification_email] == 'true' - UserNotifier.account_is_setup(@object).deliver + if params[:send_notification_email] + UserNotifier.account_is_setup(@object).deliver_now end - render json: { kind: "arvados#HashList", items: @response.as_api_response(nil) } + send_json kind: "arvados#HashList", items: @response.as_api_response(nil) end # delete user agreements, vm, repository, login links; set state to inactive @@ -145,12 +118,55 @@ 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 + protected def self._setup_requires_parameters { - send_notification_email: { type: 'boolean', required: true }, + user: { + type: 'object', required: false + }, + openid_prefix: { + type: 'string', required: false + }, + repo_name: { + type: 'string', required: false + }, + vm_uuid: { + type: 'string', required: false + }, + send_notification_email: { + type: 'boolean', required: false, default: false + }, + } + 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"] + if @select + @select = @select & safe_attrs + else + @select = safe_attrs + end + @filters += [['is_active', '=', true]] + end + super + end end