github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复settings中搜索LDAP用户重复问题

pull/5230/head
Bai 2020-12-11 18:23:12 +08:00 committed by Jiangjie.Bai
parent e056430fce
commit f9cf2a243b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/settings/utils/ldap.py
View File

@ -145,6 +145,17 @@ class LDAPServerUtil(object):
paged_cookie=paged_cookie paged_cookie=paged_cookie
) )
@staticmethod
def distinct_user_entries(user_entries):
distinct_user_entries = list()
distinct_user_entries_dn = set()
for user_entry in user_entries:
if user_entry.entry_dn in distinct_user_entries_dn:
continue
distinct_user_entries_dn.add(user_entry.entry_dn)
distinct_user_entries.append(user_entry)
return distinct_user_entries
@timeit @timeit
def search_user_entries(self, search_users=None, search_value=None): def search_user_entries(self, search_users=None, search_value=None):
logger.info("Search user entries") logger.info("Search user entries")
@ -159,6 +170,7 @@ class LDAPServerUtil(object):
while self.paged_cookie(): while self.paged_cookie():
self.search_user_entries_ou(search_ou, self.paged_cookie()) self.search_user_entries_ou(search_ou, self.paged_cookie())
user_entries.extend(self.connection.entries) user_entries.extend(self.connection.entries)
user_entries = self.distinct_user_entries(user_entries)
return user_entries return user_entries
def user_entry_to_dict(self, entry): def user_entry_to_dict(self, entry):