From a0e9c689b4cd7289e92cd639e6fc4a1d803e8b6b Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Tue, 8 Jan 2019 16:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=AF=BC=E5=85=A5LD?= =?UTF-8?q?AP=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=9C=AA=E5=AF=BC=E5=85=A5=E8=BF=87LDAP?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E4=BC=9A=E6=8F=90=E7=A4=BA=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF=E8=80=8C=E6=97=A0=E6=B3=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/www/teleport/webroot/app/controller/system.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/www/teleport/webroot/app/controller/system.py b/server/www/teleport/webroot/app/controller/system.py index 679a2db..9025540 100644 --- a/server/www/teleport/webroot/app/controller/system.py +++ b/server/www/teleport/webroot/app/controller/system.py @@ -555,12 +555,13 @@ class DoLdapGetUsersHandler(TPBaseJsonHandler): if ret != TPE_OK: return self.write_json(ret, message=err_msg) - exits_users = user.get_users_by_type(TP_USER_TYPE_LDAP) + exists_users = user.get_users_by_type(TP_USER_TYPE_LDAP) bound_users = [] - for u in exits_users: - h = hashlib.sha1() - h.update(u['ldap_dn'].encode()) - bound_users.append(h.hexdigest()) + if exists_users is not None: + for u in exists_users: + h = hashlib.sha1() + h.update(u['ldap_dn'].encode()) + bound_users.append(h.hexdigest()) ret_data = [] for u in data: