sycommon-python-lib 0.2.1a32__tar.gz → 0.2.1a34__tar.gz

{sycommon_python_lib-0.2.1a32 → sycommon_python_lib-0.2.1a34}/PKG-INFO

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

{sycommon_python_lib-0.2.1a32 → sycommon_python_lib-0.2.1a34}/pyproject.toml

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

{sycommon_python_lib-0.2.1a32 → sycommon_python_lib-0.2.1a34}/src/sycommon/auth/ldap_service.py

@@ -129,13 +129,19 @@ class LDAPAuthService:
         last_error = None
         for url in self.config.urls:
             try:
-                # 创建连接
-                server = ldap3.Server(url, get_info=ldap3.ALL)
+                # 创建连接（移除末尾的斜杠，设置连接超时）
+                clean_url = url.rstrip("/")
+                server = ldap3.Server(
+                    clean_url,
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,  # 连接超时 5 秒
+                )
                 conn = ldap3.Connection(
                     server,
                     user=user_dn,
                     password=password,
                     auto_bind=True,
+                    receive_timeout=10,  # 接收超时 10 秒
                 )
 
                 # 认证成功，获取用户信息
@@ -168,9 +174,26 @@ class LDAPAuthService:
         Returns:
             str: 用户 DN
         """
-        # 根据域构建用户 DN
-        # 格式: cn=username,ou=Users,dc=syf,dc=com
-        base_parts = self.config.base.split(",")
+        # 对于 Active Directory，使用 UPN 格式更可靠
+        # 格式: username@domain
+        if self.config.default_dc:
+            domain = self.config.default_dc
+            return f"{username}@{domain}"
+        # 回退到 DN 格式
+        return f"cn={username},{self.config.base}"
+
+    def _build_bind_dn(self, username: str) -> str:
+        """构建绑定用户 DN（用于管理员绑定）
+
+        Args:
+            username: 绑定用户名
+
+        Returns:
+            str: 绑定用户 DN
+        """
+        # 对于 Active Directory，使用 UPN 格式
+        if self.config.default_dc:
+            return f"{username}@{self.config.default_dc}"
         return f"cn={username},{self.config.base}"
 
     def _get_user_info(self, conn, username: str) -> LDAPUser:
@@ -185,12 +208,10 @@ class LDAPAuthService:
         """
         import ldap3
 
-        user_dn = self._build_user_dn(username)
-
-        # 搜索用户属性
+        # 在 base DN 中搜索用户
         conn.search(
-            search_base=user_dn,
-            search_filter="(objectClass=*)",
+            search_base=self.config.base,
+            search_filter=f"(sAMAccountName={username})",
             attributes=[
                 "cn",
                 "mail",
@@ -199,6 +220,7 @@ class LDAPAuthService:
                 "telephoneNumber",
                 "title",
                 "distinguishedName",
+                "sAMAccountName",
             ],
         )
 
@@ -242,14 +264,21 @@ class LDAPAuthService:
         import ldap3
         from ldap3.core.exceptions import LDAPException
 
+        bind_user = self._build_bind_dn(self.config.username)
+
         for url in self.config.urls:
             try:
-                server = ldap3.Server(url, get_info=ldap3.ALL)
+                server = ldap3.Server(
+                    url.rstrip("/"),
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,
+                )
                 conn = ldap3.Connection(
                     server,
-                    user=self.config.username,
+                    user=bind_user,
                     password=self.config.password,
                     auto_bind=True,
+                    receive_timeout=10,
                 )
 
                 # 搜索用户
@@ -285,14 +314,21 @@ class LDAPAuthService:
         """同步验证连接"""
         import ldap3
 
+        bind_user = self._build_bind_dn(self.config.username)
+
         for url in self.config.urls:
             try:
-                server = ldap3.Server(url, get_info=ldap3.ALL)
+                server = ldap3.Server(
+                    url.rstrip("/"),
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,
+                )
                 conn = ldap3.Connection(
                     server,
-                    user=self.config.username,
+                    user=bind_user,
                     password=self.config.password,
                     auto_bind=True,
+                    receive_timeout=10,
                 )
                 conn.unbind()
                 SYLogger.info(f"[LDAP] 连接 {url} 验证成功")

{sycommon_python_lib-0.2.1a32 → sycommon_python_lib-0.2.1a34}/src/sycommon_python_lib.egg-info/PKG-INFO

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