github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-07-02 07:01:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16882 from jumpserver/pr@dev@feat_ldap_update

Browse Source 
feat(settings): expose LDAP always update user option
This commit is contained in:
Crane.z
2026-06-05 10:49:07 +08:00
committed by GitHub
parent a102054d2b 4b0b348600
commit fb3b383ef3
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jumpserver/conf.py
View File

@@ -310,6 +310,7 @@ class Config(dict):
'AUTH_LDAP_CONNECT_TIMEOUT': 10,
'AUTH_LDAP_STRICT_SYNC': False,
'AUTH_LDAP_CACHE_TIMEOUT': 0,
'AUTH_LDAP_ALWAYS_UPDATE_USER': True,
'AUTH_LDAP_SEARCH_PAGED_SIZE': 1000,
'AUTH_LDAP_SYNC_IS_PERIODIC': False,
'AUTH_LDAP_SYNC_INTERVAL': None,
@@ -331,6 +332,7 @@ class Config(dict):
'AUTH_LDAP_HA_CONNECT_TIMEOUT': 10,
'AUTH_LDAP_HA_STRICT_SYNC': False,
'AUTH_LDAP_HA_CACHE_TIMEOUT': 0,
'AUTH_LDAP_HA_ALWAYS_UPDATE_USER': True,
'AUTH_LDAP_HA_SEARCH_PAGED_SIZE': 1000,
'AUTH_LDAP_HA_SYNC_IS_PERIODIC': False,
'AUTH_LDAP_HA_SYNC_INTERVAL': None,

4
apps/jumpserver/settings/auth.py
View File

@@ -49,7 +49,7 @@ AUTH_LDAP_CONNECTION_OPTIONS = {
}
AUTH_LDAP_STRICT_SYNC = CONFIG.AUTH_LDAP_STRICT_SYNC
AUTH_LDAP_CACHE_TIMEOUT = CONFIG.AUTH_LDAP_CACHE_TIMEOUT
AUTH_LDAP_ALWAYS_UPDATE_USER = True
AUTH_LDAP_ALWAYS_UPDATE_USER = CONFIG.AUTH_LDAP_ALWAYS_UPDATE_USER
AUTH_LDAP_SEARCH_PAGED_SIZE = CONFIG.AUTH_LDAP_SEARCH_PAGED_SIZE
AUTH_LDAP_SYNC_IS_PERIODIC = CONFIG.AUTH_LDAP_SYNC_IS_PERIODIC
@@ -88,7 +88,7 @@ AUTH_LDAP_HA_CONNECTION_OPTIONS = {
}
AUTH_LDAP_HA_STRICT_SYNC = CONFIG.AUTH_LDAP_HA_STRICT_SYNC
AUTH_LDAP_HA_CACHE_TIMEOUT = CONFIG.AUTH_LDAP_HA_CACHE_TIMEOUT
AUTH_LDAP_HA_ALWAYS_UPDATE_USER = True
AUTH_LDAP_HA_ALWAYS_UPDATE_USER = CONFIG.AUTH_LDAP_HA_ALWAYS_UPDATE_USER
AUTH_LDAP_HA_SEARCH_PAGED_SIZE = CONFIG.AUTH_LDAP_HA_SEARCH_PAGED_SIZE
AUTH_LDAP_HA_SYNC_IS_PERIODIC = CONFIG.AUTH_LDAP_HA_SYNC_IS_PERIODIC

3
apps/settings/serializers/auth/ldap.py
View File

@@ -70,6 +70,9 @@ class LDAPSettingSerializer(LDAPSerializerMixin, serializers.Serializer):
'`value` is the LDAP service user attribute name'
)
)
AUTH_LDAP_ALWAYS_UPDATE_USER = serializers.BooleanField(
required=False, label=_('Always update user'),
)
AUTH_LDAP_SYNC_IS_PERIODIC = serializers.BooleanField(
required=False, label=_('Periodic run')
)

3
apps/settings/serializers/auth/ldap_ha.py
View File

@@ -52,6 +52,9 @@ class LDAPHASettingSerializer(LDAPSerializerMixin, serializers.Serializer):
'`value` is the LDAP service user attribute name'
)
)
AUTH_LDAP_HA_ALWAYS_UPDATE_USER = serializers.BooleanField(
required=False, label=_('Always update user'),
)
AUTH_LDAP_HA_SYNC_IS_PERIODIC = serializers.BooleanField(
required=False, label=_('Periodic run')
)