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

perf: ldap 能多组织同步用户 (#10543)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
This commit is contained in:
fit2bot
2023-05-25 17:35:36 +08:00
committed by GitHub
parent fa21c83db3
commit a6366a2dd4
9 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,13 @@
# coding: utf-8
#
import os
import json
from collections import defaultdict
from copy import deepcopy
from django.conf import settings
from django.core.cache import cache
from django.utils.translation import ugettext_lazy as _
from ldap3 import Server, Connection, SIMPLE
from ldap3.core.exceptions import (
LDAPSocketOpenError,
@@ -18,19 +23,14 @@ from ldap3.core.exceptions import (
LDAPConfigurationError,
LDAPAttributeError,
)
from django.conf import settings
from django.core.cache import cache
from django.utils.translation import ugettext_lazy as _
from copy import deepcopy
from collections import defaultdict
from orgs.utils import tmp_to_org
from common.const import LDAP_AD_ACCOUNT_DISABLE
from common.utils import timeit, get_logger
from common.db.utils import close_old_connections
from users.utils import construct_user_email
from users.models import User, UserGroup
from authentication.backends.ldap import LDAPAuthorizationBackend, LDAPUser
from common.const import LDAP_AD_ACCOUNT_DISABLE
from common.db.utils import close_old_connections
from common.utils import timeit, get_logger
from orgs.utils import tmp_to_org
from users.models import User, UserGroup
from users.utils import construct_user_email
logger = get_logger(__file__)
@@ -394,7 +394,7 @@ class LDAPImportUtil(object):
group_names.append(group_name)
return group_names
def perform_import(self, users, org=None):
def perform_import(self, users, orgs):
logger.info('Start perform import ldap users, count: {}'.format(len(users)))
errors = []
objs = []
@@ -416,13 +416,20 @@ class LDAPImportUtil(object):
errors.append({user['username']: str(e)})
logger.error(e)
continue
for org in orgs:
self.bind_org(org, objs, group_users_mapper)
logger.info('End perform import ldap users')
return errors
@staticmethod
def bind_org(org, users, group_users_mapper):
if not org:
return
if org.is_root():
return
# add user to org
for obj in objs:
org.add_member(obj)
for user in users:
org.add_member(user)
# add user to group
with tmp_to_org(org):
for group_name, users in group_users_mapper.items():
@@ -430,8 +437,6 @@ class LDAPImportUtil(object):
name=group_name, defaults={'name': group_name}
)
group.users.add(*users)
logger.info('End perform import ldap users')
return errors
class LDAPTestUtil(object):