codosdk 1.0.28__tar.gz → 1.0.30__tar.gz

{codosdk-1.0.28 → codosdk-1.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.28
+Version: 1.0.30
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.28 → codosdk-1.0.30}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.28
+Version: 1.0.30
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.28 → codosdk-1.0.30}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.28'
+VERSION = '1.0.30'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')

{codosdk-1.0.28 → codosdk-1.0.30}/websdk2/apis/cmdb_apis.py

@@ -45,3 +45,9 @@ class CMDBAPIS:
                                  params={
                                  },
                                  description='根据业务获取资源信息')
+
+    get_tree_asset_server_old = dict(method='GET',
+                                     url=f'{cmdb_prefix}/api/v2/cmdb/tree/asset/',
+                                     params={
+                                     },
+                                     description='根据业务获取资源信息，待废弃')

{codosdk-1.0.28 → codosdk-1.0.30}/websdk2/ldap.py

@@ -6,8 +6,11 @@ Author  : shenshuo
 Date    : 2023/3/17
 Desc    : 对接LDAP登录认证
 """
+
+import logging
 import json
-from ldap3 import Server, Connection, ALL, SUBTREE, ServerPool
+from typing import Dict, Optional, Tuple, Union
+from ldap3 import Server, Connection, SUBTREE, ALL_ATTRIBUTES
 
 
 class LdapApi:
@@ -110,8 +113,59 @@ class LdapApi:
             return False, None
 
 
+class LdapApiV4:
+    def __init__(self, ldap_server_host: str, ldap_admin_dn: str, ldap_admin_password: str,
+                 ldap_server_port: int = 389, ldap_use_ssl: Union[bool, str] = False):
+        self._ldap_admin_dn = ldap_admin_dn
+        self._ldap_admin_password = ldap_admin_password
+        self.ldap_server = Server(ldap_server_host, port=ldap_server_port,
+                                  use_ssl=str(ldap_use_ssl).lower() in {'y', 'yes', 'true'})
+
+    def test_server_connection(self) -> bool:
+        try:
+            with Connection(self.ldap_server, self._ldap_admin_dn, self._ldap_admin_password, auto_bind=True) as conn:
+                return conn.bound
+        except Exception as e:
+            logging.error(f"Server connection failed: {e}")
+            return False
+
+    def ldap_auth(self, username: str, password: str, search_base: str,
+                  attribute_map: Union[Dict[str, str], str, None] = None,
+                  search_filter: str = 'cn') -> Tuple[bool, Optional[Dict]]:
+        if not self.test_server_connection():
+            return False, None
+        try:
+            with Connection(self.ldap_server, self._ldap_admin_dn, self._ldap_admin_password) as conn:
+                if not conn.search(search_base, f'({search_filter}={username})', SUBTREE, attributes=ALL_ATTRIBUTES):
+                    return False, None
+                user_attrs, user_dn = conn.entries[0].entry_attributes_as_dict, conn.entries[0].entry_dn
+
+                try:
+                    with Connection(self.ldap_server, user=user_dn, password=password, auto_bind=True) as uc:
+                        if not uc.bound:
+                            return False, None
+                except Exception as e:
+                    logging.error(f"User auth failed: {e}")
+                    return False, None
+
+                final_attrs = user_attrs
+                if attribute_map:
+                    if isinstance(attribute_map, str):
+                        try:
+                            attribute_map = json.loads(attribute_map)
+                        except json.JSONDecodeError:
+                            attribute_map = None
+                    if isinstance(attribute_map, dict):
+                        final_attrs = {k: (v[0] if isinstance(v := user_attrs.get(mv), list) else v)
+                                       for k, mv in attribute_map.items()}
+                return True, final_attrs
+        except Exception as e:
+            logging.error(f"Auth error: {e}")
+            return False, None
+
+
 if __name__ == "__main__":
-    obj = LdapApi('172.16.0.102', 'cn=Manager,DC=sz,DC=com', '070068')
-    print(obj.ldap_server_test())
+    obj = LdapApiV4('172.16.0.102', 'cn=Manager,DC=sz,DC=com', '070068')
+    print(obj.test_server_connection())
     print('____________')
-    print(obj.ldap_auth_v2("yanghongfei", "123456", 'ou=opendevops,dc=sz,dc=com', 'cn'))
+    print(obj.ldap_auth("yanghongfei", "123456", 'ou=opendevops,dc=sz,dc=com', 'cn'))