Merge branch 'master' into 13804-no-shutdown-wanted-nodes

[arvados.git] / 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 3b89067522a753c387bbe0d705bade83856b1990..d2126ec5f7793ffe6e502d182ea3d852d8c5ceb6 100644 (file)
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -128,23 +128,27 @@ class Arvados::V1::UsersController < ApplicationController
   def merge
     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
 
-    dst_auth = ApiClientAuthorization.validate(token: params[:new_user_token])
-    if !dst_auth
+    new_auth = ApiClientAuthorization.validate(token: params[:new_user_token])
+    if !new_auth
       return send_error("invalid new_user_token", status: 401)
     end
-    if !dst_auth.api_client.andand.is_trusted
+    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
-    dst_user = dst_auth.user
+    new_user = new_auth.user
 
-    if current_user.uuid == dst_user.uuid
+    if current_user.uuid == new_user.uuid
       return send_error("cannot merge user to self", status: 422)
     end
 
-    if !dst_user.can?(write: params[:new_owner_uuid])
-      return send_error("new_owner_uuid is not writable", status: 403)
+    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
 
     redirect = params[:redirect_to_new_user]
@@ -154,13 +158,27 @@ class Arvados::V1::UsersController < ApplicationController
 
     @object = current_user
     act_as_system_user do
-      @object.merge(new_owner_uuid: params[:new_owner_uuid], redirect_to_user_uuid: redirect && dst_user.uuid)
+      @object.merge(new_owner_uuid: params[:new_owner_uuid], redirect_to_user_uuid: redirect && new_user.uuid)
     end
     show
   end
 
   protected
 
+  def self._merge_requires_parameters
+    {
+      new_owner_uuid: {
+        type: 'string', required: true,
+      },
+      new_user_token: {
+        type: 'string', required: true,
+      },
+      redirect_to_new_user: {
+        type: 'boolean', required: false,
+      },
+    }
+  end
+
   def self._setup_requires_parameters
     {
       user: {