瀏覽代碼

Fix exception when importing a user that has a naming collision in Hue

Jon Natkins 13 年之前
父節點
當前提交
40a92c8893
共有 2 個文件被更改,包括 35 次插入15 次删除
  1. 32 14
      apps/useradmin/src/useradmin/tests.py
  2. 3 1
      apps/useradmin/src/useradmin/views.py

+ 32 - 14
apps/useradmin/src/useradmin/tests.py

@@ -75,10 +75,12 @@ class LdapTestConnection(object):
     def __init__(self):
       self.users = {'moe': {'username':'moe', 'first':'Moe', 'email':'moe@stooges.com'},
                     'larry': {'username':'larry', 'first':'Larry', 'last':'Stooge', 'email':'larry@stooges.com'},
-                    'curly': {'username':'curly', 'first':'Curly', 'last':'Stooge', 'email':'curly@stooges.com'}}
+                    'curly': {'username':'curly', 'first':'Curly', 'last':'Stooge', 'email':'curly@stooges.com'},
+                    'otherguy': {'username':'otherguy', 'first':'Other', 'last':'Guy', 'email':'other@guy.com'}}
 
       self.groups = {'TestUsers': {'name':'TestUsers', 'members':['moe','larry','curly']},
-                     'Test Administrators': {'name':'Test Administrators', 'members':['curly','larry']}}
+                     'Test Administrators': {'name':'Test Administrators', 'members':['curly','larry']},
+                     'OtherGroup': {'name':'OtherGroup', 'members':[]}}
 
 
 
@@ -308,7 +310,7 @@ def test_user_admin():
   response = c_su.post('/useradmin/users/new', dict(username="test"))
   assert_true("You must specify a password when creating a new user." in response.content)
 
-def test_userman_ldap_integration():
+def test_useradmin_ldap_integration():
   reset_all_users()
   reset_all_groups()
 
@@ -325,29 +327,45 @@ def test_userman_ldap_integration():
 
   # Should be a noop
   sync_ldap_users_and_groups()
-  assert_true(len(User.objects.all()) == 1)
-  assert_true(len(Group.objects.all()) == 0)
+  assert_equal(len(User.objects.all()), 1)
+  assert_equal(len(Group.objects.all()), 0)
 
   # Should import a group, but will only sync already-imported members
   import_ldap_group('Test Administrators', import_members=False, import_by_dn=False)
-  assert_true(len(User.objects.all()) == 1)
-  assert_true(len(Group.objects.all()) == 1)
+  assert_equal(len(User.objects.all()), 1)
+  assert_equal(len(Group.objects.all()), 1)
   test_admins = Group.objects.get(name='Test Administrators')
-  assert_true(len(test_admins.user_set.all()) == 1)
-  assert_true(test_admins.user_set.all()[0].username == larry.username)
+  assert_equal(len(test_admins.user_set.all()), 1)
+  assert_equal(test_admins.user_set.all()[0].username, larry.username)
 
   # Import all members of TestUsers
   import_ldap_group('TestUsers', import_members=True, import_by_dn=False)
   test_users = Group.objects.get(name='TestUsers')
   assert_true(LdapGroup.objects.filter(group=test_users).exists())
-  assert_true(len(test_users.user_set.all()) == 3)
+  assert_equal(len(test_users.user_set.all()), 3)
 
   ldap_access.CACHED_LDAP_CONN.remove_user_group_for_test('moe', 'TestUsers')
   import_ldap_group('TestUsers', import_members=False, import_by_dn=False)
-  assert_true(len(test_users.user_set.all()) == 2)
-  assert_true(len(User.objects.get(username='moe').groups.all()) == 0)
+  assert_equal(len(test_users.user_set.all()), 2)
+  assert_equal(len(User.objects.get(username='moe').groups.all()), 0)
 
   ldap_access.CACHED_LDAP_CONN.add_user_group_for_test('moe', 'TestUsers')
   import_ldap_group('TestUsers', import_members=False, import_by_dn=False)
-  assert_true(len(test_users.user_set.all()) == 3)
-  assert_true(len(User.objects.get(username='moe').groups.all()) == 1)
+  assert_equal(len(test_users.user_set.all()), 3)
+  assert_equal(len(User.objects.get(username='moe').groups.all()), 1)
+
+  # Make sure that if a Hue user already exists with a naming collision, we
+  # won't overwrite any of that user's information.
+  hue_user = User.objects.create(username='otherguy', first_name='Different', last_name='Guy')
+  import_ldap_user('otherguy', import_by_dn=False)
+  hue_user = User.objects.get(username='otherguy')
+  assert_equal(get_profile(hue_user).creation_method, str(UserProfile.CreationMethod.HUE))
+  assert_equal(hue_user.first_name, 'Different')
+
+  # Make sure Hue groups with naming collisions don't get marked as LDAP groups
+  hue_group = Group.objects.create(name='OtherGroup')
+  hue_group.user_set.add(hue_user)
+  hue_group.save()
+  import_ldap_group('OtherGroup', import_members=False, import_by_dn=False)
+  assert_false(LdapGroup.objects.filter(group=hue_group).exists())
+  assert_true(hue_group.user_set.filter(username=hue_user.username).exists())

+ 3 - 1
apps/useradmin/src/useradmin/views.py

@@ -413,7 +413,9 @@ def _import_ldap_group(groupname, import_members=False, import_by_dn=False):
       except User.DoesNotExist:
         continue
 
-    if get_profile(user).creation_method == str(UserProfile.CreationMethod.HUE):
+    if user is None:
+      # There was a naming comflict, or for some other reason, we couldn't get
+      # at the user
       continue
     LOG.debug("Adding user %s to group %s" % (member, group.name))
     group.user_set.add(user)