github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 11:19:08 +00:00
Code Issues Projects Releases Wiki Activity

perf: ldap import user error msg

Browse Source
This commit is contained in:
wangruidong
2024-08-26 15:28:17 +08:00
committed by Bryan
parent f866b93f96
commit 7a19007aba
5 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/settings/ws.py
View File

@@ -23,6 +23,7 @@ from settings.utils import (
LDAPServerUtil, LDAPCacheUtil, LDAPImportUtil, LDAPSyncUtil,
LDAP_USE_CACHE_FLAGS, LDAPTestUtil
)
from .const import ImportStatus
from .tools import (
verbose_ping, verbose_telnet, verbose_nmap,
verbose_tcpdump, verbose_traceroute
@@ -208,10 +209,24 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer):
msg = _('Total {}, success {}, failure {}').format(
len(users), success_count, len(error_msg)
)
self.set_users_status(users, error_msg)
except Exception as e:
msg = str(e)
return ok, msg
def set_users_status(self, import_users, errors):
util = LDAPCacheUtil()
all_users = util.get_users()
import_usernames = [u['username'] for u in import_users]
errors_mapper = {k: v for err in errors for k, v in err.items()}
for user in all_users:
username = user['username']
if username in errors_mapper:
user['status'] = {'error': errors_mapper[username]}
elif username in import_usernames:
user['status'] = ImportStatus.ok
LDAPCacheUtil().set_users(all_users)
@staticmethod
def get_orgs(org_ids):
if org_ids: