浏览代码

HUE-8691 [useradmin] Fix importing users failed silently if objectClass posixGroup exists in group

Ben Gooley 6 年之前
父节点
当前提交
a16e201
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      apps/useradmin/src/useradmin/ldap_access.py

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

@@ -280,14 +280,16 @@ class LdapConnection(object):
             'name': group_name
           }
 
-          if group_member_attr in data and 'posixGroup' not in data['objectClass']:
+          if group_member_attr in data and group_member_attr not in 'memberUid':
             ldap_info['members'] = data[group_member_attr]
           else:
+            LOG.warn('Skipping import of non-posix users since group_member_attr is memberUid or group did not contain any members')
             ldap_info['members'] = []
 
           if 'posixGroup' in data['objectClass'] and 'memberUid' in data:
             ldap_info['posix_members'] = data['memberUid']
           else:
+            LOG.warn('Skipping import of posix users.  posixGroup not an objectClass or  no memberUids found')
             ldap_info['posix_members'] = []
 
           group_info.append(ldap_info)