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

perf: rename ad to ds

Browse Source
This commit is contained in:
ibuler
2025-04-07 19:10:12 +08:00
committed by 老广
parent 3f452daee8
commit acaa4cf2d5
35 changed files with 391 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,7 @@ class LDAPServerUtil(object):
value = is_true(value)
if attr == 'groups' and mapping.lower() == 'memberof':
# AD: {'groups': 'memberOf'}
# DS: {'groups': 'memberOf'}
if isinstance(value, str) and value:
value = [value]
if not isinstance(value, list):
@@ -366,7 +366,7 @@ class LDAPSyncUtil(object):
class LDAPImportUtil(object):
user_group_name_prefix = 'AD '
user_group_name_prefix = 'DS '
def __init__(self, category=User.Source.ldap.value, is_sync_all=True):
self.category = category
@@ -399,7 +399,7 @@ class LDAPImportUtil(object):
continue
if not isinstance(group, str):
continue
# get group name for AD, Such as: CN=Users,CN=Builtin,DC=jms,DC=com
# get group name for DS, Such as: CN=Users,CN=Builtin,DC=jms,DC=com
group_name = group.split(',')[0].split('=')[-1]
group_name = f'{self.user_group_name_prefix}{group_name}'.strip()
group_names.append(group_name)