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

fix: 修复LDAP用户登录(未找到)时循环调用问题

pull/5280/head
Bai 2020-12-16 11:59:46 +08:00 committed by Jiangjie.Bai
parent 3aed4955c8
commit b3642f3ff4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/authentication/backends/ldap.py
View File

@ -115,8 +115,12 @@ class LDAPUser(_LDAPUser):
else: else:
# 解决直接配置DC域，用户认证失败的问题(库不能从整棵树中搜索) # 解决直接配置DC域，用户认证失败的问题(库不能从整棵树中搜索)
user_dn = self._search_for_user_dn_from_ldap_util() user_dn = self._search_for_user_dn_from_ldap_util()
self._user_dn = user_dn if user_dn is None:
self._user_attrs = self._load_user_attrs() self._user_dn = None
self._user_attrs = None
else:
self._user_dn = user_dn
self._user_attrs = self._load_user_attrs()
return user_dn return user_dn

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

@ -186,7 +186,6 @@ class LDAPServerUtil(object):
user[attr] = value user[attr] = value
return user return user
@timeit
def user_entries_to_dict(self, user_entries): def user_entries_to_dict(self, user_entries):
users = [] users = []
for user_entry in user_entries: for user_entry in user_entries:
@ -194,7 +193,6 @@ class LDAPServerUtil(object):
users.append(user) users.append(user)
return users return users
@timeit
def search_for_user_dn(self, username): def search_for_user_dn(self, username):
user_entries = self.search_user_entries(search_users=[username]) user_entries = self.search_user_entries(search_users=[username])
if len(user_entries) == 1: if len(user_entries) == 1: