diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index ded4f526e..477a62c12 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -300,6 +300,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, @@ -321,6 +322,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, diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py index 8a62d7dd3..1f35c859f 100644 --- a/apps/jumpserver/settings/auth.py +++ b/apps/jumpserver/settings/auth.py @@ -47,7 +47,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 @@ -86,7 +86,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 diff --git a/apps/settings/serializers/auth/ldap.py b/apps/settings/serializers/auth/ldap.py index 407a18fd1..fdad75393 100644 --- a/apps/settings/serializers/auth/ldap.py +++ b/apps/settings/serializers/auth/ldap.py @@ -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') ) diff --git a/apps/settings/serializers/auth/ldap_ha.py b/apps/settings/serializers/auth/ldap_ha.py index c0efaab56..b8960b93a 100644 --- a/apps/settings/serializers/auth/ldap_ha.py +++ b/apps/settings/serializers/auth/ldap_ha.py @@ -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') )