codosdk 1.0.29__tar.gz → 1.0.31__tar.gz

{codosdk-1.0.29 → codosdk-1.0.31}/PKG-INFO

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

{codosdk-1.0.29 → codosdk-1.0.31}/codosdk.egg-info/PKG-INFO

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

{codosdk-1.0.29 → codosdk-1.0.31}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.29'
+VERSION = '1.0.31'
 
 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.29 → codosdk-1.0.31}/websdk2/application.py

@@ -15,6 +15,7 @@ from tornado.options import options, define
 from tornado.web import Application as tornadoApp
 from tornado.web import RequestHandler
 from .configs import configs
+from .consts import const
 from .logger import init_logging
 
 # options.log_file_prefix = "/tmp/codo.log"
@@ -41,6 +42,9 @@ class Application(tornadoApp):
         max_buffer_size = configs.get('max_buffer_size')
         max_body_size = configs.get('max_body_size')
         super(Application, self).__init__(handlers, default_host, transforms, **configs)
+        if configs.get(const.LOG_LEVEL) in [10, 20, 30, 40]:
+            logging.getLogger().setLevel(configs.get(const.LOG_LEVEL))
+
         http_server = httpserver.HTTPServer(self, max_buffer_size=max_buffer_size, max_body_size=max_body_size)
         http_server.listen(options.port, address=options.addr)
         self.io_loop = ioloop.IOLoop.instance()

{codosdk-1.0.29 → codosdk-1.0.31}/websdk2/consts.py

@@ -94,6 +94,15 @@ const.MQ_PWD = 'MQ_PWD'
 const.DEFAULT_MQ_KEY = 'default'
 const.AGENT_MQ_KEY = 'agent'
 
+# CRITICAL = 50
+# FATAL = CRITICAL
+# ERROR = 40
+# WARNING = 30
+# WARN = WARNING
+# INFO = 20
+# DEBUG = 10
+# NOTSET = 0
+const.LOG_LEVEL = "log_level"
 # JMS
 const.JMS_CONFIG_ITEM = 'jmss'
 const.DEFAULT_JMS_KEY = 'default'

{codosdk-1.0.29 → codosdk-1.0.31}/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'))

codosdk-1.0.31/websdk2/logger.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+# -*-coding:utf-8-*-
+
+import logging
+import sys
+import datetime
+import tornado.log
+
+#
+# options.log_file_prefix = os.path.join(os.path.dirname(os.path.dirname(__file__)), f'/tmp/codo.log')
+
+
+# class LogFormatter(tornado.log.LogFormatter):
+#     default_msec_format = '%s.%03d'
+#
+#     def __init__(self):
+#         super(LogFormatter, self).__init__(
+#             fmt='%(color)s%(asctime)s | %(levelname)s%(end_color)s     | %(filename)s:%(funcName)s:%(lineno)s - %(message)s',
+#             datefmt='%Y-%m-%d %H:%M:%S.%f'
+#         )
+#
+#     def formatTime(self, record, datefmt=None):
+#         ct = datetime.datetime.now()
+#         t = ct.strftime(self.default_time_format)
+#         s = self.default_msec_format % (t, record.msecs)
+#         return s
+#
+#
+# def init_logging():
+#     # write file
+#     [
+#         i.setFormatter(LogFormatter())
+#         for i in logging.getLogger().handlers
+#     ]
+#     logging.getLogger().setLevel(logging.INFO)
+#     # write stdout
+#     stdout_handler = logging.StreamHandler(sys.stdout)
+#     stdout_handler.setFormatter(LogFormatter())
+#     logging.getLogger().addHandler(stdout_handler)
+#     logging.info('[APP Logging Init] logging has been started')
+
+
+class LogFormatter(tornado.log.LogFormatter):
+    """
+    Custom log formatter to add color and detailed information to logs.
+    """
+    default_msec_format = '%s.%03d'
+
+    def __init__(self):
+        super(LogFormatter, self).__init__(
+            fmt='%(color)s%(asctime)s | %(levelname)s%(end_color)s | '
+                '%(filename)s:%(funcName)s:%(lineno)d - %(message)s',
+            datefmt='%Y-%m-%d %H:%M:%S.%f'
+        )
+
+    def formatTime(self, record, datefmt=None):
+        """
+        Customize the timestamp format to include milliseconds.
+        """
+        ct = datetime.datetime.fromtimestamp(record.created)
+        t = ct.strftime(self.default_time_format)
+        s = self.default_msec_format % (t, record.msecs)
+        return s
+
+
+def init_logging(log_level=logging.INFO):
+    """
+    Initialize the logging system with custom formatter and handlers.
+
+    :param log_level: Logging level, e.g., logging.DEBUG, logging.INFO, etc.
+    """
+    # Apply the custom formatter to existing handlers
+    for handler in logging.getLogger().handlers:
+        handler.setFormatter(LogFormatter())
+
+    # Set the log level
+    logging.getLogger().setLevel(log_level)
+
+    # Add a handler for stdout logging
+    stdout_handler = logging.StreamHandler(sys.stdout)
+    stdout_handler.setFormatter(LogFormatter())
+    logging.getLogger().addHandler(stdout_handler)
+
+    logging.info(f'[APP Logging Init] Logging initialized with level: {logging.getLevelName(log_level)}')
+
+
+# Example usage
+if __name__ == "__main__":
+    # Pass the desired log level as a parameter
+    # log_level = logging.DEBUG  # You can adjust this to logging.INFO, logging.WARNING, etc.
+    # init_logging(log_level)
+    #
+    # # Test logging at different levels
+    # logging.debug("This is a debug message")
+    # logging.info("This is an info message")
+    # logging.warning("This is a warning message")
+    # logging.error("This is an error message")
+    # logging.critical("This is a critical message")
+    pass

codosdk-1.0.29/websdk2/logger.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*-coding:utf-8-*-
-
-import os
-import logging
-import sys
-import datetime
-import tornado.log
-
-# from tornado.options import options
-#
-# options.log_file_prefix = os.path.join(os.path.dirname(os.path.dirname(__file__)), f'/tmp/codo.log')
-
-
-class LogFormatter(tornado.log.LogFormatter):
-    default_msec_format = '%s.%03d'
-
-    def __init__(self):
-        super(LogFormatter, self).__init__(
-            fmt='%(color)s%(asctime)s | %(levelname)s%(end_color)s     | %(filename)s:%(funcName)s:%(lineno)s - %(message)s',
-            datefmt='%Y-%m-%d %H:%M:%S.%f'
-        )
-
-    def formatTime(self, record, datefmt=None):
-        ct = datetime.datetime.now()
-        t = ct.strftime(self.default_time_format)
-        s = self.default_msec_format % (t, record.msecs)
-        return s
-
-
-def init_logging():
-    # write file
-    [
-        i.setFormatter(LogFormatter())
-        for i in logging.getLogger().handlers
-    ]
-    logging.getLogger().setLevel(logging.INFO)
-    # write stdout
-    stdout_handler = logging.StreamHandler(sys.stdout)
-    stdout_handler.setFormatter(LogFormatter())
-    logging.getLogger().addHandler(stdout_handler)
-    logging.info('[APP Logging Init] logging has been started')