sycommon-python-lib 0.2.7a46__tar.gz → 0.2.7a47__tar.gz

{sycommon_python_lib-0.2.7a46 → sycommon_python_lib-0.2.7a47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a46
+Version: 0.2.7a47
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.7a46 → sycommon_python_lib-0.2.7a47}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.7a46"
+version = "0.2.7a47"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.7a46 → sycommon_python_lib-0.2.7a47}/src/sycommon/auth/ldap_service.py

@@ -126,7 +126,9 @@ class LDAPAuthService:
         user_dn = self._build_user_dn(username)
 
         # 尝试连接各个 LDAP 服务器
-        last_error = None
+        # 优先返回认证类错误（invalidCredentials 等），而非连接类错误（timeout）。
+        # 避免备用服务器连接超时覆盖了主服务器的真实认证错误（密码错误），误导用户。
+        errors = []
         for url in self.config.urls:
             try:
                 # 创建连接（移除末尾的斜杠，设置连接超时）
@@ -155,15 +157,32 @@ class LDAPAuthService:
                 )
 
             except LDAPException as e:
-                last_error = e
+                errors.append((url, str(e)))
                 SYLogger.warning(f"[LDAP] 连接 {url} 失败: {e}")
                 continue
 
-        SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {last_error}")
-        return LDAPAuthResult(
-            success=False,
-            error=f"认证失败: {last_error}" if last_error else "认证失败",
-        )
+        # 优先返回认证类错误（密码错误等），而不是连接超时
+        # 按优先级排序：invalidCredentials / invalidAttribute / insufficientAccess 优先
+        auth_keywords = ["invalidcredentials", "invalidattribute", "insufficientaccess", "密码", "credential"]
+        for url, err in errors:
+            if any(kw in err.lower() for kw in auth_keywords):
+                SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {err}")
+                return LDAPAuthResult(
+                    success=False,
+                    error=f"认证失败: {err}",
+                )
+
+        # 全是连接类错误，返回第一个（通常是主服务器）
+        if errors:
+            first_err = errors[0][1]
+            SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {first_err}")
+            return LDAPAuthResult(
+                success=False,
+                error=f"认证失败: {first_err}",
+            )
+
+        SYLogger.error(f"[LDAP] 用户 {username} 认证失败: 未知错误")
+        return LDAPAuthResult(success=False, error="认证失败: 未知错误")
 
     def _build_user_dn(self, username: str) -> str:
         """构建用户 DN

{sycommon_python_lib-0.2.7a46 → sycommon_python_lib-0.2.7a47}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a46
+Version: 0.2.7a47
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown