From b3642f3ff41e2d79ceccd20fe86ede67e0fbc48c Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 16 Dec 2020 11:59:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DLDAP=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95(=E6=9C=AA=E6=89=BE=E5=88=B0)=E6=97=B6?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/backends/ldap.py | 8 ++++++-- apps/settings/utils/ldap.py | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/authentication/backends/ldap.py b/apps/authentication/backends/ldap.py index 5a5e16081..5551c83d4 100644 --- a/apps/authentication/backends/ldap.py +++ b/apps/authentication/backends/ldap.py @@ -115,8 +115,12 @@ class LDAPUser(_LDAPUser): else: # 解决直接配置DC域，用户认证失败的问题(库不能从整棵树中搜索) user_dn = self._search_for_user_dn_from_ldap_util() - self._user_dn = user_dn - self._user_attrs = self._load_user_attrs() + if user_dn is None: + self._user_dn = None + self._user_attrs = None + else: + self._user_dn = user_dn + self._user_attrs = self._load_user_attrs() return user_dn diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index 9b7cd34a2..e4264f0e6 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -186,7 +186,6 @@ class LDAPServerUtil(object): user[attr] = value return user - @timeit def user_entries_to_dict(self, user_entries): users = [] for user_entry in user_entries: @@ -194,7 +193,6 @@ class LDAPServerUtil(object): users.append(user) return users - @timeit def search_for_user_dn(self, username): user_entries = self.search_user_entries(search_users=[username]) if len(user_entries) == 1: