fix: LDAP TLS import errors (#16970)

Co-authored-by: wangruidong <940853815@qq.com>
This commit is contained in:
fit2bot
2026-07-01 18:43:14 +08:00
committed by GitHub
parent 86cd9df449
commit 87f3b2b380

View File

@@ -2,23 +2,13 @@
#
import json
import os
from collections import defaultdict
from copy import deepcopy
from authentication.backends.ldap import (
LDAPAuthorizationBackend,
LDAPHAAuthorizationBackend,
LDAPUser,
)
from common.const import LDAP_AD_ACCOUNT_DISABLE
from common.db.utils import close_old_connections
from common.utils import get_logger, timeit
from common.utils.http import is_true
from django.conf import settings
from django.core.cache import cache
from django.utils.translation import gettext_lazy as _
from ldap3 import SIMPLE, Connection, Server
from ldap3 import SIMPLE, Connection, Server, Tls
from ldap3.core.exceptions import (
LDAPAttributeError,
LDAPBindError,
@@ -34,8 +24,14 @@ from ldap3.core.exceptions import (
LDAPUserNameIsMandatoryError,
)
from ldap3.utils.conv import escape_filter_chars
from common.const import LDAP_AD_ACCOUNT_DISABLE
from common.db.utils import close_old_connections
from common.utils import get_logger, timeit
from common.utils.http import is_true
from orgs.utils import tmp_to_org
from settings.const import ImportStatus
from settings.ldap_tls import LDAPTLSUtil
from users.models import User, UserGroup
from users.utils import construct_user_email
@@ -724,6 +720,7 @@ class LDAPTestUtil(object):
try:
self._test_config()
except LDAPInvalidServerError as e:
raise e
msg = _('Error (Invalid LDAP server): {}').format(e)
except LDAPBindError as e:
msg = _('Error (Invalid Bind DN): {}').format(e)