[ARVADOS] updated: 0a658f812d1db5fed5ab9da8fd0b77fd57a33532
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 21 14:13:00 EDT 2014
Summary of changes:
sdk/cli/bin/crunch-job | 2 +-
services/api/app/models/user.rb | 3 +-
services/api/db/structure.sql | 1 -
services/api/test/unit/user_test.rb | 57 ++++++++++++++++++++++---------------
4 files changed, 36 insertions(+), 27 deletions(-)
via 0a658f812d1db5fed5ab9da8fd0b77fd57a33532 (commit)
via 1e30d46f1d678ca297ed3d9a1d5833cd59e27c84 (commit)
via 0b10fae767ce774b62a2bd2922a77578341d87e1 (commit)
from 7153f88758f73a339673b399cd43dceae8c86e4f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 0a658f812d1db5fed5ab9da8fd0b77fd57a33532
Author: radhika <radhika at curoverse.com>
Date: Thu Aug 21 13:56:28 2014 -0400
3153: username regexp is updated
diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 0053ce0..77da32c 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -431,11 +431,10 @@ class User < ArvadosModel
username = self.email.partition('@')[0] if self.email
return true if !username
- username = username.gsub!(/[-._]/, '') || username
blacklisted_usernames = Rails.configuration.auto_setup_name_blacklist
if blacklisted_usernames.include?(username)
return true;
- elsif !(/^[a-zA-Z][a-zA-Z0-9]{0,31}$/.match(username))
+ elsif !(/^[a-zA-Z][-._a-zA-Z0-9]{0,30}[a-zA-Z0-9]$/.match(username))
return true
else
username = derive_unique_username username
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index aa05031..2d0c76f 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -3,7 +3,6 @@
--
SET statement_timeout = 0;
-SET lock_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SET check_function_bodies = false;
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index 9442e7e..c9be478 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -9,7 +9,6 @@ class UserTest < ActiveSupport::TestCase
system_user
end
-=begin
test "check non-admin active user properties" do
@active_user = users(:active) # get the active user
assert !@active_user.is_admin, 'is_admin should not be set for a non-admin user'
@@ -127,7 +126,7 @@ class UserTest < ActiveSupport::TestCase
create_user_and_verify_setup_and_notifications false, [], 'inactive-notify-address at example.com', nil, false
create_user_and_verify_setup_and_notifications false, [], [], nil, false
end
-=end
+
[
[false, [], [], 'inactive-none at example.com', false, false, true],
[false, [], [], 'inactive-vm at example.com', true, false, true],
@@ -142,11 +141,12 @@ class UserTest < ActiveSupport::TestCase
[false, [], [], nil, true, true, false],
[false, [], [], 'arvados', true, true, false],
- [false, [], [], 'arva_dos', 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 at example.com', false, false, true], # since we are not creating repo and vm login, this blaklisted name is not a problem
- [false, [], [], 'arva_dos at example.com', false, false, true], # since we are not creating repo and vm login, this blaklisted name is not a problem
+ [false, [], [], 'arva.dos at example.com', true, true, true], # not blaklisted name
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'root at example.com', true, false, false], # blacklisted name after removing -._ characters
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'roo_t at example.com', false, true, true], # not blacklisted name
[false, [], [], '@example.com', true, false, false], # incorrect format
[false, [], [], '@example.com', false, true, false],
@@ -155,31 +155,45 @@ class UserTest < ActiveSupport::TestCase
[false, [], [], '^^incorrect_format at example.com', true, true, false],
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'foo at example.com', true, true, true], # existing repository name 'foo'
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'foo at example.com', true, false, true], # existing repository name 'foo'
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'foo at example.com', true, false, true], # existing repository name 'foo'
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'foo at example.com', false, true, true], # existing repository name 'foo'
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'foo at example.com', false, false, true], # existing repository name 'foo', but we are not creating repo or login link
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'xyz_can_login_to_vm at example.com', true, true, true], # existing vm login name
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'xyz_can_login_to_vm at example.com', true, false, true], # existing vm login name
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'xyz_can_login_to_vm at example.com', true, false, true], # existing vm login name
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'xyz_can_login_to_vm at example.com', false, true, true], # existing vm login name
[false, 'active-notify at example.com', 'inactive-notify at example.com', 'xyz_can_login_to_vm at example.com', false, false, true], # existing vm login name, but we are not creating repo or login link
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'r_o_o_t at example.com', true, false, false], # blacklisted name after removing -._ characters
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'r_o.o-t at example.com', false, true, false], # blacklisted name after removing -._ characters
-
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'r_o_o_t at example.com', false, false, true], # blacklisted after removing -._, but ok because no repo and vm login
-
- [false, 'active-notify at example.com', 'inactive-notify at example.com', 'r_o. o-t at example.com', true, true, false], # invalid because of space character
-
- [false, 'active-notify at example.com', 'inactive-notify at example.com', '*!*@example.com', true, false, false], # username is invalid format
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '*!*@example.com', true, false, false], # username is invalid format
[false, 'active-notify at example.com', 'inactive-notify at example.com', '*!*@example.com', false, false, true], # since no repo and vm login, username is ok (not validated)
- [false, 'active-notify at example.com', 'inactive-notify at example.com', '4ad at example.com', true, true, false], # username is invalid format
- [false, 'active-notify at example.com', 'inactive-notify at example.com', '4ad at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '*!*@example.com', false, false, true], # since no repo and vm login, username is ok (not validated)
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '&4ad at example.com', true, true, false], # username is invalid format
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '&4ad at example.com', false, false, true], # no repo or vm login, so format not checked
[false, 'active-notify at example.com', 'inactive-notify at example.com', '&4ad at example.com', true, true, false], # username is invalid format
[false, 'active-notify at example.com', 'inactive-notify at example.com', '&4ad at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '4ad at example.com', true, true, false], # username is invalid format
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '4ad at example.com', false, false, true], # no repo or vm login, so format not checked
+ [false, 'active-notify at example.com', 'inactive-notify at example.com', '4ad at example.com', false, false, true], # no repo or vm login, so format not checked
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '.foo at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', '.foo at example.com', true, false, false], # invalid format
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'bar. at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'bar. at example.com', true, false, false], # valid format
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'ice9 at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'ice9 at example.com', true, false, true], # valid format
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'o_o at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'o_o at example.com', true, false, true], # valid format
+
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'r00t at example.com', false, false, true], # no repo or vm login, so format not checked
+ [true, 'active-notify at example.com', 'inactive-notify at example.com', 'r00t at example.com', true, false, true], # valid format
+
].each do |active, active_recipients, inactive_recipients, email, auto_setup_vm, auto_setup_repo, valid_username|
- test "create new user with auto setup #{email} #{auto_setup_vm} #{auto_setup_repo}" do
+ 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
auto_setup_new_users_with_repository = Rails.configuration.auto_setup_new_users_with_repository
@@ -205,7 +219,7 @@ class UserTest < ActiveSupport::TestCase
end
end
end
-=begin
+
test "update existing user" do
set_user_from_auth :active # set active user as current user
@@ -331,8 +345,6 @@ class UserTest < ActiveSupport::TestCase
verify_link vm_perm, 'permission', 'can_login', resp_user[:uuid], vm.uuid
end
-
-
test "setup new user in multiple steps" do
set_user_from_auth :admin
@@ -385,7 +397,7 @@ class UserTest < ActiveSupport::TestCase
vm_perm = find_obj_in_resp response, 'Link', 'arvados#virtualMachine'
verify_link vm_perm, 'permission', 'can_login', resp_user[:uuid], vm.uuid
end
-=end
+
def find_obj_in_resp (response_items, object_type, head_kind=nil)
return_obj = nil
response_items.each { |x|
@@ -466,7 +478,6 @@ class UserTest < ActiveSupport::TestCase
verify_link_exists true, user.uuid, user.email, 'permission', 'can_login', nil, nil
username = user.email.partition('@')[0] if email
- username = (username.gsub!(/[-._]/, '') || username) if username
# check vm uuid
vm_uuid = Rails.configuration.auto_setup_new_users_with_vm_uuid
@@ -520,7 +531,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? then
+ 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]
commit 1e30d46f1d678ca297ed3d9a1d5833cd59e27c84
Merge: 7153f88 0b10fae
Author: radhika <radhika at curoverse.com>
Date: Thu Aug 21 13:21:16 2014 -0400
Merge branch 'master' into 3153-auto-setup-user
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list