X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1f438358f952fe296bd6aebaa1f868ddb366fb7e..d0c85cb89af65eff3e629fa3d475a289e289cff7:/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 6402fb4dad..3d8ed34b42 100644 --- a/services/api/test/unit/user_test.rb +++ b/services/api/test/unit/user_test.rb @@ -141,11 +141,13 @@ 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 - [true, 'active-notify@example.com', 'inactive-notify@example.com', 'root@example.com', true, false, false], # blacklisted name after removing -._ characters + [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@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', 'root@example.com', true, false, false], # blacklisted name + [false, 'active-notify@example.com', 'inactive-notify@example.com', 'root@example.com', true, false, false], # blacklisted name [true, 'active-notify@example.com', 'inactive-notify@example.com', 'roo_t@example.com', false, true, true], # not blacklisted name [false, [], [], '@example.com', true, false, false], # incorrect format @@ -159,10 +161,10 @@ class UserTest < ActiveSupport::TestCase [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 +194,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, new_user_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 +213,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, new_user_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,11 +445,11 @@ class UserTest < ActiveSupport::TestCase end end - def create_user_and_verify_setup_and_notifications (active, active_recipients, inactive_recipients, email, valid_username) - Rails.configuration.new_user_notification_recipients = active_recipients + def create_user_and_verify_setup_and_notifications (active, new_user_recipients, inactive_recipients, email, ok_to_auto_setup) + Rails.configuration.new_user_notification_recipients = new_user_recipients Rails.configuration.new_inactive_user_notification_recipients = inactive_recipients - assert_equal active_recipients, Rails.configuration.new_user_notification_recipients + assert_equal new_user_recipients, Rails.configuration.new_user_notification_recipients assert_equal inactive_recipients, Rails.configuration.new_inactive_user_notification_recipients ActionMailer::Base.deliveries = [] @@ -463,7 +465,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 @@ -496,10 +498,18 @@ class UserTest < ActiveSupport::TestCase ensure assert_equal true, repo_names.any?, 'Repository name for username foo is not unique' end - 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 @@ -515,8 +525,9 @@ 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" : - "#{Rails.configuration.email_subject_prefix}New user created, but not setup notification" + new_user_email_subject = (ok_to_auto_setup || active) ? + "#{Rails.configuration.email_subject_prefix}New user created and setup notification" : + "#{Rails.configuration.email_subject_prefix}New user created, but not setup notification" end ActionMailer::Base.deliveries.each do |d| @@ -527,6 +538,17 @@ class UserTest < ActiveSupport::TestCase end end + # both active and inactive user creations should result in new user creation notification mails, + # if the new user email recipients config parameter is set + if not new_user_recipients.empty? 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 new_user_recipients, new_user_email.to[0] + assert_equal new_user_email_subject, new_user_email.subject + else + assert_nil new_user_email, 'Did not expect new user email after setup' + end + if not active if not inactive_recipients.empty? then assert_not_nil new_inactive_user_email, 'Expected new inactive user email after setup' @@ -536,18 +558,8 @@ class UserTest < ActiveSupport::TestCase else assert_nil new_inactive_user_email, 'Did not expect new inactive user email after setup' end - end - - if active + else assert_nil new_inactive_user_email, 'Expected no inactive user email after setting up active user' - if (not active_recipients.empty?) && valid_username 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] - assert_equal new_user_email_subject, new_user_email.subject - else - assert_nil new_user_email, 'Did not expect new user email after setup' - end end ActionMailer::Base.deliveries = []