X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0a658f812d1db5fed5ab9da8fd0b77fd57a33532..33b9b5e6b376194ea68e628ab74256274172d130:/services/api/test/unit/user_test.rb diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb index c9be478afb..7de3faec7c 100644 --- a/services/api/test/unit/user_test.rb +++ b/services/api/test/unit/user_test.rb @@ -141,10 +141,11 @@ class UserTest < ActiveSupport::TestCase [false, [], [], nil, true, true, false], [false, [], [], 'arvados', true, true, false], - [false, [], [], 'arvados', false, false, true], # since we are not creating repo and vm login, this blaklisted name is not a problem + [false, [], [], 'arvados', true, false, false], # blacklisted username + [false, [], [], 'arvados', false, false, true], # since we are not creating repo and vm login, this blacklisted name is not a problem - [false, [], [], 'arvados@example.com', false, false, true], # since we are not creating repo and vm login, this blaklisted name is not a problem - [false, [], [], 'arva.dos@example.com', true, true, true], # not blaklisted name + [false, [], [], 'arvados@example.com', false, false, true], # since we are not creating repo and vm login, this blacklisted name is not a problem + [true, 'active-notify@example.com', 'inactive-notify@example.com', 'arvados@ex.com', false, false, true], # since we are not creating repo and vm login, this blacklisted name is not a problem [true, 'active-notify@example.com', 'inactive-notify@example.com', 'root@example.com', true, false, false], # blacklisted name after removing -._ characters [true, 'active-notify@example.com', 'inactive-notify@example.com', 'roo_t@example.com', false, true, true], # not blacklisted name @@ -154,15 +155,15 @@ class UserTest < ActiveSupport::TestCase [false, [], [], '^^incorrect_format@example.com', true, true, false], - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'foo@example.com', true, true, true], # existing repository name 'foo' - [true, 'active-notify@example.com', 'inactive-notify@example.com', 'foo@example.com', true, false, true], # existing repository name 'foo' - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'foo@example.com', false, true, true], # existing repository name 'foo' - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'foo@example.com', false, false, true], # existing repository name 'foo', but we are not creating repo or login link + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_repo@example.com', true, true, true], # existing repository name 'auto_setup_repo' + [true, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_repo@example.com', true, false, true], # existing repository name 'auto_setup_repo' + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_repo@example.com', false, true, true], # existing repository name 'auto_setup_repo' + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_repo@example.com', false, false, true], # existing repository name 'auto_setup_repo', but we are not creating repo or login link - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'xyz_can_login_to_vm@example.com', true, true, true], # existing vm login name - [true, 'active-notify@example.com', 'inactive-notify@example.com', 'xyz_can_login_to_vm@example.com', true, false, true], # existing vm login name - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'xyz_can_login_to_vm@example.com', false, true, true], # existing vm login name - [false, 'active-notify@example.com', 'inactive-notify@example.com', 'xyz_can_login_to_vm@example.com', false, false, true], # existing vm login name, but we are not creating repo or login link + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_vm_login@example.com', true, true, true], # existing vm login name + [true, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_vm_login@example.com', true, false, true], # existing vm login name + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_vm_login@example.com', false, true, true], # existing vm login name + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'auto_setup_vm_login@example.com', false, false, true], # existing vm login name, but we are not creating repo or login link [true, 'active-notify@example.com', 'inactive-notify@example.com', '*!*@example.com', true, false, false], # username is invalid format [false, 'active-notify@example.com', 'inactive-notify@example.com', '*!*@example.com', false, false, true], # since no repo and vm login, username is ok (not validated) @@ -192,7 +193,7 @@ class UserTest < ActiveSupport::TestCase [true, 'active-notify@example.com', 'inactive-notify@example.com', 'r00t@example.com', false, false, true], # no repo or vm login, so format not checked [true, 'active-notify@example.com', 'inactive-notify@example.com', 'r00t@example.com', true, false, true], # valid format - ].each do |active, active_recipients, inactive_recipients, email, auto_setup_vm, auto_setup_repo, valid_username| + ].each do |active, active_recipients, inactive_recipients, email, auto_setup_vm, auto_setup_repo, ok_to_auto_setup| test "create new user with auto setup #{active} #{email} #{auto_setup_vm} #{auto_setup_repo}" do auto_setup_new_users = Rails.configuration.auto_setup_new_users auto_setup_new_users_with_vm_uuid = Rails.configuration.auto_setup_new_users_with_vm_uuid @@ -211,7 +212,7 @@ class UserTest < ActiveSupport::TestCase Rails.configuration.auto_setup_new_users_with_repository = auto_setup_repo - create_user_and_verify_setup_and_notifications active, active_recipients, inactive_recipients, email, valid_username + create_user_and_verify_setup_and_notifications active, active_recipients, inactive_recipients, email, ok_to_auto_setup ensure Rails.configuration.auto_setup_new_users = auto_setup_new_users Rails.configuration.auto_setup_new_users_with_vm_uuid = auto_setup_new_users_with_vm_uuid @@ -443,7 +444,7 @@ class UserTest < ActiveSupport::TestCase end end - def create_user_and_verify_setup_and_notifications (active, active_recipients, inactive_recipients, email, valid_username) + def create_user_and_verify_setup_and_notifications (active, active_recipients, inactive_recipients, email, ok_to_auto_setup) Rails.configuration.new_user_notification_recipients = active_recipients Rails.configuration.new_inactive_user_notification_recipients = inactive_recipients @@ -463,7 +464,7 @@ class UserTest < ActiveSupport::TestCase g[:uuid].match /-f+$/ end.first - if !Rails.configuration.auto_setup_new_users || !valid_username + if !Rails.configuration.auto_setup_new_users || !ok_to_auto_setup # verify that the user is not added to "All groups" by auto_setup verify_link_exists false, group[:uuid], user.uuid, 'permission', 'can_read', nil, nil @@ -479,15 +480,8 @@ class UserTest < ActiveSupport::TestCase username = user.email.partition('@')[0] if email - # check vm uuid - vm_uuid = Rails.configuration.auto_setup_new_users_with_vm_uuid - if vm_uuid - verify_link_exists true, vm_uuid, user.uuid, 'permission', 'can_login', 'username', username - else - verify_link_exists false, vm_uuid, user.uuid, 'permission', 'can_login', 'username', username - end - # check repo + repo_names = [] if Rails.configuration.auto_setup_new_users_with_repository repos = Repository.where('name like ?', "%#{username}%") assert_not_nil repos, 'repository not found' @@ -495,9 +489,33 @@ class UserTest < ActiveSupport::TestCase repo_uuids = [] repos.each do |repo| repo_uuids << repo[:uuid] + repo_names << repo[:name] + end + if username == 'auto_setup_repo' + begin + repo_names.delete('auto_setup_repo') + ensure + assert_equal true, repo_names.any?, 'Repository name for username foo is not unique' + end end verify_link_exists true, repo_uuids, user.uuid, 'permission', 'can_manage', nil, nil end + + # if username is existing vm login name, make sure the username used to generate any repo is unique + if username == 'auto_setup_vm_login' || username == 'auto_setup_repo' + if repo_names.any? + assert repo_names.first.start_with? username + assert_not_nil /\d$/.match(repo_names.first) + end + end + + # check vm uuid + vm_uuid = Rails.configuration.auto_setup_new_users_with_vm_uuid + if vm_uuid + verify_link_exists true, vm_uuid, user.uuid, 'permission', 'can_login', 'username', (username == 'auto_setup_repo' ? repo_names.first : username) + else + verify_link_exists false, vm_uuid, user.uuid, 'permission', 'can_login', 'username', (username == 'auto_setup_repo' ? repo_names.first : username) + end end # check email notifications @@ -506,7 +524,7 @@ class UserTest < ActiveSupport::TestCase new_user_email_subject = "#{Rails.configuration.email_subject_prefix}New user created notification" if Rails.configuration.auto_setup_new_users - new_user_email_subject = valid_username ? "#{Rails.configuration.email_subject_prefix}New user created and setup notification" : + new_user_email_subject = ok_to_auto_setup ? "#{Rails.configuration.email_subject_prefix}New user created and setup notification" : "#{Rails.configuration.email_subject_prefix}New user created, but not setup notification" end @@ -531,7 +549,7 @@ class UserTest < ActiveSupport::TestCase if active assert_nil new_inactive_user_email, 'Expected no inactive user email after setting up active user' - if (not active_recipients.empty?) && valid_username then + if (not active_recipients.empty?) && ok_to_auto_setup then assert_not_nil new_user_email, 'Expected new user email after setup' assert_equal Rails.configuration.user_notifier_email_from, new_user_email.from[0] assert_equal active_recipients, new_user_email.to[0]