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

fix: 同步LDAP用户时，用户组只移除LDAP同步过来的

pull/12473/head
wangruidong 2024-01-02 14:42:51 +08:00 committed by Bryan
parent 7cdba3ef38
commit e80a0e41ba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,12 +423,11 @@ class LDAPImportUtil(object):
logger.info('End perform import ldap users') logger.info('End perform import ldap users')
return errors return errors
@staticmethod def exit_user_group(self, user_groups_mapper):
def exit_user_group(user_groups_mapper):
# 通过对比查询本次导入用户需要移除的用户组 # 通过对比查询本次导入用户需要移除的用户组
group_remove_users_mapper = defaultdict(set) group_remove_users_mapper = defaultdict(set)
for user, current_groups in user_groups_mapper.items(): for user, current_groups in user_groups_mapper.items():
old_groups = set(user.groups.all()) old_groups = set(user.groups.filter(name__startswith=self.user_group_name_prefix))
exit_groups = old_groups - current_groups exit_groups = old_groups - current_groups
logger.debug(f'Ldap user {user} exits user groups {exit_groups}') logger.debug(f'Ldap user {user} exits user groups {exit_groups}')
for g in exit_groups: for g in exit_groups: