X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7e77dad2912c2eee85cc5e5876f35cf55a4cfc69..4658a55dc90567b87f484578c91f4f04db9623ab:/services/api/test/functional/arvados/v1/users_controller_test.rb diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb index 0bc941accf..07e0b71d86 100644 --- a/services/api/test/functional/arvados/v1/users_controller_test.rb +++ b/services/api/test/functional/arvados/v1/users_controller_test.rb @@ -13,6 +13,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase @initial_link_count = Link.count @vm_uuid = virtual_machines(:testvm).uuid ActionMailer::Base.deliveries = [] + Rails.configuration.Users.ActivatedUsersAreVisibleToOthers = false end test "activate a user after signing UA" do @@ -67,7 +68,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase test "respond 401 if given token exists but user record is missing" do authorize_with :valid_token_deleted_user - get :current, {format: :json} + get :current, format: :json assert_response 401 end @@ -88,6 +89,38 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_nil created['identity_url'], 'expected no identity_url' end + test "create new user with empty username" do + authorize_with :admin + post :create, params: { + user: { + first_name: "test_first_name", + last_name: "test_last_name", + username: "" + } + } + assert_response :success + created = JSON.parse(@response.body) + assert_equal 'test_first_name', created['first_name'] + assert_not_nil created['uuid'], 'expected uuid for the newly created user' + assert_nil created['email'], 'expected no email' + assert_nil created['username'], 'expected no username' + end + + test "update user with empty username" do + authorize_with :admin + user = users('spectator') + assert_not_nil user['username'] + put :update, params: { + id: users('spectator')['uuid'], + user: { + username: "" + } + } + assert_response :success + updated = JSON.parse(@response.body) + assert_nil updated['username'], 'expected no username' + end + test "create user with user, vm and repo as input" do authorize_with :admin repo_name = 'usertestrepo' @@ -118,7 +151,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage', "foo/#{repo_name}", created['uuid'], 'arvados#repository', true, 'Repository' - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', created['uuid'], 'arvados#group', true, 'Group' verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login', @@ -302,7 +335,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase # two extra links; system_group, and group verify_links_added 2 - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', response_object['uuid'], 'arvados#group', true, 'Group' verify_link response_items, 'arvados#repository', false, 'permission', 'can_manage', @@ -387,7 +420,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage', 'foo/usertestrepo', created['uuid'], 'arvados#repository', true, 'Repository' - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', created['uuid'], 'arvados#group', true, 'Group' verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login', @@ -425,7 +458,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage', 'foo/usertestrepo', created['uuid'], 'arvados#repository', true, 'Repository' - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', created['uuid'], 'arvados#group', true, 'Group' verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login', @@ -478,7 +511,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal active_user[:email], created['email'], 'expected input email' # verify links - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', created['uuid'], 'arvados#group', true, 'Group' verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage', @@ -512,7 +545,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal active_user['email'], created['email'], 'expected original email' # verify links - verify_link response_items, 'arvados#group', true, 'permission', 'can_read', + verify_link response_items, 'arvados#group', true, 'permission', 'can_write', 'All users', created['uuid'], 'arvados#group', true, 'Group' assert_equal(repos_count, repos_query.count) @@ -577,6 +610,23 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase test "setup user with send notification param true and verify email" do authorize_with :admin + Rails.configuration.Users.UserSetupMailText = %{ +<% if not @user.full_name.empty? -%> +<%= @user.full_name %>, +<% else -%> +Hi there, +<% end -%> + +Your Arvados shell account has been set up. Please visit the virtual machines page <% if Rails.configuration.Services.Workbench1.ExternalURL %>at + +<%= Rails.configuration.Services.Workbench1.ExternalURL %><%= "/" if !Rails.configuration.Services.Workbench1.ExternalURL.to_s.end_with?("/") %>users/<%= @user.uuid%>/virtual_machines <% else %><% end %> + +for connection instructions. + +Thanks, +The Arvados team. +} + post :setup, params: { send_notification_email: 'true', user: { @@ -595,7 +645,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal Rails.configuration.Users.UserNotifierEmailFrom, setup_email.from[0] assert_equal 'foo@example.com', setup_email.to[0] - assert_equal 'Welcome to Arvados - shell account enabled', setup_email.subject + assert_equal 'Welcome to Arvados - account enabled', setup_email.subject assert (setup_email.body.to_s.include? 'Your Arvados shell account has been set up'), 'Expected Your Arvados shell account has been set up in email body' assert (setup_email.body.to_s.include? "#{Rails.configuration.Services.Workbench1.ExternalURL}users/#{created['uuid']}/virtual_machines"), 'Expected virtual machines url in email body' @@ -616,7 +666,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal active_user['uuid'], json_response['uuid'] updated = User.where(uuid: active_user['uuid']).first assert_equal(true, updated.is_active) - assert_equal({read: true}, updated.group_permissions[all_users_group_uuid]) + assert_equal({read: true, write: true}, updated.group_permissions[all_users_group_uuid]) end test "non-admin user can get basic information about readable users" do @@ -624,11 +674,17 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase get(:index) check_non_admin_index check_readable_users_index [:spectator], [:inactive, :active] + json_response["items"].each do |u| + if u["uuid"] == users(:spectator).uuid + assert_equal true, u["can_write"] + assert_equal true, u["can_manage"] + end + end end test "non-admin user gets only safe attributes from users#show" do g = act_as_system_user do - create :group + create :group, group_class: "role" end users = create_list :active_user, 2, join_groups: [g] token = create :token, user: users[0] @@ -640,7 +696,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase [2, 4].each do |limit| test "non-admin user can limit index to #{limit}" do g = act_as_system_user do - create :group + create :group, group_class: "role" end users = create_list :active_user, 4, join_groups: [g] token = create :token, user: users[0] @@ -751,27 +807,6 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase "user's writable_by should include its owner_uuid") end - [ - [:admin, true], - [:active, false], - ].each do |auth_user, expect_success| - test "update_uuid as #{auth_user}" do - authorize_with auth_user - orig_uuid = users(:active).uuid - post :update_uuid, params: { - id: orig_uuid, - new_uuid: 'zbbbb-tpzed-abcde12345abcde', - } - if expect_success - assert_response :success - assert_empty User.where(uuid: orig_uuid) - else - assert_response 403 - assert_not_empty User.where(uuid: orig_uuid) - end - end - end - test "merge with redirect_to_user_uuid=false" do authorize_with :project_viewer_trustedclient tok = api_client_authorizations(:project_viewer).api_token @@ -854,7 +889,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase ['dst', :project_viewer_trustedclient]].each do |which_scoped, auth| test "refuse to merge with scoped #{which_scoped} token" do act_as_system_user do - api_client_authorizations(auth).update_attributes(scopes: ["GET /", "POST /", "PUT /"]) + api_client_authorizations(auth).update(scopes: ["GET /", "POST /", "PUT /"]) end authorize_with(:active_trustedclient) post(:merge, params: { @@ -1007,9 +1042,16 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase test "batch update" do existinguuid = 'remot-tpzed-foobarbazwazqux' newuuid = 'remot-tpzed-newnarnazwazqux' + unchanginguuid = 'remot-tpzed-nochangingattrs' + conflictinguuid1 = 'remot-tpzed-conflictingnam1' + conflictinguuid2 = 'remot-tpzed-conflictingnam2' act_as_system_user do User.create!(uuid: existinguuid, email: 'root@existing.example.com') + User.create!(uuid: unchanginguuid, email: 'root@unchanging.example.com', prefs: {'foo' => {'bar' => 'baz'}}) end + assert_equal(1, Log.where(object_uuid: unchanginguuid).count) + + Rails.configuration.Login.LoginCluster = 'remot' authorize_with(:admin) patch(:batch_update, @@ -1021,10 +1063,28 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase 'is_active' => true, 'is_admin' => true, 'prefs' => {'foo' => 'bar'}, + 'is_invited' => true }, newuuid => { 'first_name' => 'noot', 'email' => 'root@remot.example.com', + 'username' => '', + 'is_invited' => true + }, + unchanginguuid => { + 'email' => 'root@unchanging.example.com', + 'prefs' => {'foo' => {'bar' => 'baz'}}, + 'is_invited' => true + }, + conflictinguuid1 => { + 'email' => 'root@conflictingname1.example.com', + 'username' => 'active', + 'is_invited' => true + }, + conflictinguuid2 => { + 'email' => 'root@conflictingname2.example.com', + 'username' => 'federatedactive', + 'is_invited' => true }, }}) assert_response(:success) @@ -1037,10 +1097,12 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal('noot', User.find_by_uuid(newuuid).first_name) assert_equal('root@remot.example.com', User.find_by_uuid(newuuid).email) + + assert_equal(1, Log.where(object_uuid: unchanginguuid).count) end - NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "email", "first_name", - "last_name", "username"].sort + NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "is_admin", "is_invited", "email", "first_name", + "last_name", "username", "can_write", "can_manage"].sort def check_non_admin_index assert_response :success