lesscode-flask 0.2.92__tar.gz → 0.2.99__tar.gz

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.92
+Version: 0.2.99
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -24,7 +24,7 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: gevent==25.5.1
 Requires-Dist: openpyxl==3.1.5
-Requires-Dist: iputil==0.3.1
+Requires-Dist: iputil==0.3.2
 Requires-Dist: phone==0.4.5
 Requires-Dist: psutil==7.2.2
 Dynamic: author

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.92"
+__version__ = "0.2.99"
 
 import functools
 import logging

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask/setup/__init__.py

@@ -189,7 +189,7 @@ def _build_download_key(target_url, request_method):
     key_seed = f"{str(request_method).upper()}::{target_url}"
     # 保持原有 AES 风格，同时拼接首尾片段，避免只截前缀导致不同接口冲突。
     encrypted = AES.encrypt(key_seed)
-    return f"{encrypted[:8]}{encrypted[-8:]}"
+    return f"{encrypted[:16]}{encrypted[-16:]}"
 
 
 def _is_auto_export_route(route):

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask/utils/sign/signature.py

@@ -1,6 +1,7 @@
 import hashlib
 import hmac
 import ipaddress
+import logging
 import time
 
 from flask import request
@@ -9,11 +10,38 @@ from lesscode_flask.model.response_result import ResponseResult
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
 
 SIGN_ERROR_MESSAGE = "未知错误"
+SIGN_ERROR_CODE_MAP = {
+    "missing_sign_headers": "01",
+    "missing_sign_secret": "02",
+    "invalid_timestamp": "03",
+    "timestamp_out_of_window": "04",
+    "nonce_replayed": "05",
+    "nonce_check_exception": "06",
+    "signature_mismatch": "07",
+}
+
+
+def _sign_error_message(error_key: str) -> str:
+    error_code = SIGN_ERROR_CODE_MAP.get(error_key)
+    if not error_code:
+        return SIGN_ERROR_MESSAGE
+    return f"{SIGN_ERROR_MESSAGE}{error_code}"
+
+
+def _fail_sign(error_key: str):
+    ResponseResult.fail(
+        message=_sign_error_message(error_key),
+        status_code="401",
+        http_code="401",
+    )
 
 
 def _body_sha256() -> str:
     # 对原始请求体做哈希，保证不同 content-type 下签名输入一致。
     body_bytes = request.get_data(cache=True) or b""
+    logging.info("body_bytes开始")
+    logging.info("body_bytes: %s", body_bytes)
+    logging.info("body_bytes结束")
     return hashlib.sha256(body_bytes).hexdigest()
 
 
@@ -114,25 +142,25 @@ def verify_request_signature(app):
     signature = request.headers.get("Signature", "")
     sign_secret = app.config.get("SIGN_SECRET", "")
 
-    # 任何签名基础参数缺失都统一返回“未知错误”，避免向外暴露细节。
+    # 同类错误固定使用同一个编号，方便客户端和服务端对齐排查。
     if not timestamp or not nonce or not signature:
-        ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+        _fail_sign("missing_sign_headers")
     # 服务端密钥未配置时也拦截，防止“空密钥”误放行。
     if not sign_secret:
-        ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+        _fail_sign("missing_sign_secret")
 
     # 时间戳必须是整数秒。
     try:
         ts = int(timestamp)
     except (TypeError, ValueError):
-        ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+        _fail_sign("invalid_timestamp")
         return
 
     # 时间窗校验，防止旧请求被重放。
     sign_window_sec = int(app.config.get("SIGN_WINDOW_SEC", 300))
     now_ts = int(time.time())
     if abs(now_ts - ts) > sign_window_sec:
-        ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+        _fail_sign("timestamp_out_of_window")
 
     if app.config.get("SIGN_NONCE_ENABLE", True):
         # 防重放：同一个 nonce 在 TTL 窗口内只能使用一次。
@@ -143,13 +171,16 @@ def verify_request_signature(app):
                 nonce_key, "1", ex=nonce_ttl, nx=True
             )
             if not ok:
-                ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+                _fail_sign("nonce_replayed")
         except Exception:
             # Redis 异常按失败处理，避免在防重放失效时放过请求。
-            ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+            _fail_sign("nonce_check_exception")
 
     # 按统一规则组装签名串并计算服务端签名。
     sign_content = _canonical_sign_content(timestamp=timestamp, nonce=nonce)
+    logging.info("sign_content开始")
+    logging.info("sign_content: %s", sign_content)
+    logging.info("sign_content结束")
     expected = hmac.new(
         sign_secret.encode("utf-8"),
         sign_content.encode("utf-8"),
@@ -157,4 +188,4 @@ def verify_request_signature(app):
     ).hexdigest()
     # 常量时间比较，降低时序侧信道风险。
     if not hmac.compare_digest(expected, signature):
-        ResponseResult.fail(message=SIGN_ERROR_MESSAGE, status_code="401", http_code="401")
+        _fail_sign("signature_mismatch")

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.92
+Version: 0.2.99
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -24,7 +24,7 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: gevent==25.5.1
 Requires-Dist: openpyxl==3.1.5
-Requires-Dist: iputil==0.3.1
+Requires-Dist: iputil==0.3.2
 Requires-Dist: phone==0.4.5
 Requires-Dist: psutil==7.2.2
 Dynamic: author

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask.egg-info/SOURCES.txt

@@ -62,6 +62,7 @@ lesscode_flask/utils/task/task_helper.py
 lesscode_flask/utils/thread/thread_utils.py
 redash/query_runner/__init__.py
 redash/query_runner/clickhouse.py
+redash/query_runner/dameng.py
 redash/query_runner/elasticsearch.py
 redash/query_runner/kingbase.py
 redash/query_runner/mysql.py

{lesscode_flask-0.2.92 → lesscode_flask-0.2.99}/lesscode_flask.egg-info/requires.txt

@@ -12,6 +12,6 @@ requests==2.32.3
 gunicorn==23.0.0
 gevent==25.5.1
 openpyxl==3.1.5
-iputil==0.3.1
+iputil==0.3.2
 phone==0.4.5
 psutil==7.2.2

lesscode_flask-0.2.99/redash/query_runner/dameng.py

@@ -0,0 +1,230 @@
+import logging
+import threading
+
+from redash.query_runner import (BaseSQLQueryRunner, InterruptException, TYPE_DATE, TYPE_DATETIME, TYPE_FLOAT,
+                                 TYPE_INTEGER, TYPE_STRING, register)
+
+try:
+    import dmPython
+
+    enabled = True
+except ImportError:
+    logging.error("dmPython is not installed, run: pip install dmPython")
+    dmPython = None
+    enabled = False
+
+logger = logging.getLogger(__name__)
+
+# dmPython type codes mapping to Redash types
+# Reference: dmPython exposes type objects; cursor.description[i][1] returns type code (int)
+# DM8 SQL types: NUMBER(int/float), CHAR/VARCHAR/TEXT(str), DATE, TIMESTAMP, etc.
+types_map = {
+    # Numeric
+    -7: TYPE_INTEGER,  # BIT
+    -6: TYPE_INTEGER,  # TINYINT
+    5: TYPE_INTEGER,  # SMALLINT
+    4: TYPE_INTEGER,  # INTEGER / INT
+    -5: TYPE_INTEGER,  # BIGINT
+    2: TYPE_FLOAT,  # NUMERIC
+    3: TYPE_FLOAT,  # DECIMAL
+    6: TYPE_FLOAT,  # FLOAT
+    7: TYPE_FLOAT,  # REAL
+    8: TYPE_FLOAT,  # DOUBLE
+    # String
+    1: TYPE_STRING,  # CHAR
+    12: TYPE_STRING,  # VARCHAR
+    -1: TYPE_STRING,  # LONGVARCHAR / TEXT
+    -9: TYPE_STRING,  # NVARCHAR
+    -10: TYPE_STRING,  # LONGNVARCHAR
+    # Date/Time
+    91: TYPE_DATE,  # DATE
+    92: TYPE_DATETIME,  # TIME
+    93: TYPE_DATETIME,  # TIMESTAMP / DATETIME
+    # Binary / others fall back to string
+    -2: TYPE_STRING,
+    -3: TYPE_STRING,
+    -4: TYPE_STRING,
+}
+
+
+class Result:
+    def __init__(self):
+        self.data = None
+        self.error = None
+
+
+class DaMeng(BaseSQLQueryRunner):
+    noop_query = "SELECT 1"
+
+    @classmethod
+    def configuration_schema(cls):
+        return {
+            "type": "object",
+            "properties": {
+                "host": {"type": "string", "default": "127.0.0.1"},
+                "port": {"type": "number", "default": 5236},
+                "user": {"type": "string"},
+                "password": {"type": "string", "title": "Password"},
+                "connect_timeout": {"type": "number", "default": 60, "title": "Connection Timeout"},
+            },
+            "order": ["host", "port", "user", "password", "connect_timeout"],
+            "required": ["host", "user", "password"],
+            "secret": ["password"],
+        }
+
+    @classmethod
+    def name(cls):
+        return "DaMeng"
+
+    @classmethod
+    def type(cls):
+        return "dameng"
+
+    @classmethod
+    def enabled(cls):
+        return enabled
+
+    def _connection(self):
+        if dmPython is None:
+            raise Exception("dmPython is not installed")
+        # dmPython.connect accepts: user, password, server (host:port) or host/port separately
+        host = self.configuration.get("host", "127.0.0.1")
+        port = self.configuration.get("port", 5236)
+        user = self.configuration.get("user", "")
+        password = self.configuration.get("password", "")
+
+        connection = dmPython.connect(
+            user=user,
+            password=password,
+            server=host,
+            port=int(port)
+        )
+
+        return connection
+
+    def _get_tables(self, schema):
+        database = self.configuration.get("database", "")
+
+        if database:
+            query = """
+                SELECT c.OWNER       AS table_schema,
+                       c.TABLE_NAME  AS table_name,
+                       c.COLUMN_NAME AS column_name
+                FROM   ALL_TAB_COLUMNS c
+                WHERE  c.OWNER = '{schema}'
+                ORDER  BY c.OWNER, c.TABLE_NAME, c.COLUMN_ID
+            """.format(schema=database.upper())
+        else:
+            query = """
+                    SELECT c.OWNER       AS table_schema,
+                           c.TABLE_NAME  AS table_name,
+                           c.COLUMN_NAME AS column_name
+                    FROM ALL_TAB_COLUMNS c
+                    ORDER BY c.OWNER, c.TABLE_NAME, c.COLUMN_ID \
+                    """
+
+        results, error = self.run_query(query, None)
+
+        if error is not None:
+            self._handle_run_query_error(error)
+
+        for row in results["rows"]:
+            table_schema = row["table_schema"]
+            table_name = row["table_name"]
+
+            if table_schema.upper() != (database or "").upper():
+                full_name = "{}.{}".format(table_schema, table_name)
+            else:
+                full_name = table_name
+
+            if full_name not in schema:
+                schema[full_name] = {"name": full_name, "columns": []}
+
+            schema[full_name]["columns"].append(row["column_name"])
+
+        return list(schema.values())
+
+    def run_query(self, query, user):
+        ev = threading.Event()
+        r = Result()
+
+        try:
+            connection = self._connection()
+            self._run_query(query, user, connection, r, ev)
+        except (KeyboardInterrupt, InterruptException):
+            raise
+
+        return r.data, r.error
+
+    def _convert_column_name(self, column_name, convert_type):
+        if convert_type:
+            if convert_type == "lower":
+                column_name = column_name.lower()
+            elif convert_type == "upper":
+                column_name = column_name.upper()
+        return column_name
+
+    def _run_query(self, query, user, connection, r, ev):
+        cursor = None
+        column_name_convert = self.configuration.get("column_name_convert", "lower")
+        try:
+            cursor = connection.cursor()
+            logger.debug("DaMeng running query: %s", query)
+            cursor.execute(query)
+
+            data = cursor.fetchall()
+            desc = cursor.description
+
+            if desc is not None:
+                columns = self.fetch_columns(
+                    [(self._convert_column_name(i[0], column_name_convert), types_map.get(i[1], TYPE_STRING)) for i in
+                     desc]
+                )
+                rows = [
+                    dict(zip((col["name"] for col in columns), row))
+                    for row in data
+                ]
+                r.data = {"columns": columns, "rows": rows}
+                r.error = None
+            else:
+                r.data = None
+                r.error = "No data was returned."
+
+        except Exception as e:
+            r.data = None
+            r.error = str(e)
+        finally:
+            if cursor:
+                cursor.close()
+            if connection:
+                connection.close()
+            ev.set()
+
+    def exec(self, query, user):
+        try:
+            connection = self._connection()
+            cursor = connection.cursor()
+            logger.debug("DaMeng exec query: %s", query)
+            cursor.execute(query)
+            connection.commit()
+            cursor.close()
+            connection.close()
+        except Exception as e:
+            return False, str(e)
+
+        return True, None
+
+    def create_options(self, configuration):
+        options = {
+            "host": configuration.get("host"),
+            "port": configuration.get("port"),
+            "user": configuration.get("username"),
+            "passwd": configuration.get("password"),
+            "db": configuration.get("dbname")
+        }
+        if configuration.get("options"):
+            options.update(configuration.get("options"))
+        return options
+
+
+register(DaMeng)