lesscode-flask 0.2.104__tar.gz → 0.2.106__tar.gz

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.104
+Version: 0.2.106
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.104"
+__version__ = "0.2.106"
 
 import functools
 import logging

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/lesscode_flask/setup/__init__.py

@@ -296,6 +296,7 @@ def _build_proxy_view(app, target_url, title, description=None, dynamic_params=N
             url = url.replace(f"<{key}>", value).replace(f"{{{key}}}", value)
 
         headers = _build_forward_headers(app)
+        capability_platform_proxy_timeout = app.config.get("CAPABILITY_PLATFORM_PROXY_TIMEOUT", 30) or 30
 
         resp = requests.request(
             method=request.method,
@@ -303,7 +304,7 @@ def _build_proxy_view(app, target_url, title, description=None, dynamic_params=N
             params=request.args.to_dict(flat=False),
             data=request.get_data(),
             headers=headers,
-            timeout=30,
+            timeout=capability_platform_proxy_timeout,
         )
 
         excluded_headers = {"content-encoding", "content-length", "transfer-encoding", "connection"}

lesscode_flask-0.2.106/lesscode_flask/utils/sign/body_canonical.py

@@ -0,0 +1,25 @@
+import json
+
+
+def _is_json_content_type(content_type: str) -> bool:
+    normalized = (content_type or "").split(";", 1)[0].strip().lower()
+    return normalized == "application/json" or normalized.endswith("+json")
+
+
+def canonicalize_body_bytes(body_bytes: bytes, content_type: str = "") -> bytes:
+    """
+    JSON 请求体统一规范化后再参与签名，避免不同链路重排字段顺序导致 hash 不一致。
+    非 JSON 请求体保持原始 bytes，不影响文件上传、表单和纯文本请求。
+    """
+    if not body_bytes or not _is_json_content_type(content_type):
+        return body_bytes or b""
+    try:
+        payload = json.loads(body_bytes)
+    except (TypeError, ValueError):
+        return body_bytes
+    return json.dumps(
+        payload,
+        ensure_ascii=False,
+        separators=(",", ":"),
+        sort_keys=True,
+    ).encode("utf-8")

lesscode_flask-0.2.106/lesscode_flask/utils/sign/sign_main.py

@@ -0,0 +1,95 @@
+import hashlib
+import hmac
+import time
+import uuid
+from urllib.parse import urlparse
+
+
+def body_sha256(body_bytes: bytes) -> str:
+    """对请求体原始 bytes 做 SHA256，保持与服务端 request.get_data() 一致。"""
+    return hashlib.sha256(body_bytes).hexdigest()
+
+
+def build_sign_content(method: str, path: str, query_string: str, body_bytes: bytes, timestamp: str, nonce: str) -> str:
+    """
+    生成规范签名串：
+    METHOD \n PATH \n QUERY_STRING \n BODY_SHA256 \n TIMESTAMP \n NONCE
+    """
+    return (
+        f"{method.upper()}\n"
+        f"{path}\n"
+        f"{query_string}\n"
+        f"{body_sha256(body_bytes)}\n"
+        f"{timestamp}\n"
+        f"{nonce}"
+    )
+
+
+def generate_signature(secret: str, sign_content: str) -> str:
+    """用 HMAC-SHA256 生成十六进制签名。"""
+    return hmac.new(secret.encode("utf-8"), sign_content.encode("utf-8"), hashlib.sha256).hexdigest()
+
+
+def parse_path_and_query(url: str) -> tuple[str, str]:
+    """从完整 URL 提取 path 和 query_string。"""
+    parsed = urlparse(url)
+    path = parsed.path or "/"
+    query_string = parsed.query or ""
+    return path, query_string
+
+
+def main():
+    # ===== 在这里粘贴你的请求信息（开始）=====
+    request_url = "http://localhost:8968/ike2b/navigation/cluster/test_sign"
+    request_method = "POST"
+    request_body = '{"type":1}'
+    sign_secret = "test_sign_secret"
+    # 可选：不填则自动生成
+    request_timestamp = ""
+    request_nonce = ""
+    # 可选：你的发送工具若会在 body 末尾补换行，改成 True
+    append_newline_to_body = False
+    # ===== 在这里粘贴你的请求信息（结束）=====
+
+    method = request_method.upper()
+    path, query_string = parse_path_and_query(request_url)
+    timestamp = request_timestamp or str(int(time.time()))
+    nonce = request_nonce or uuid.uuid4().hex
+
+    body = request_body or ""
+    body_bytes = body.encode("utf-8")
+    if append_newline_to_body:
+        body_bytes += b"\n"
+
+    sign_content = build_sign_content(
+        method=method,
+        path=path,
+        query_string=query_string,
+        body_bytes=body_bytes,
+        timestamp=timestamp,
+        nonce=nonce,
+    )
+    signature = generate_signature(sign_secret, sign_content)
+    body_hash = body_sha256(body_bytes)
+
+    print("=== 签名结果 ===")
+    print(f"Timestamp: {timestamp}")
+    print(f"Nonce: {nonce}")
+    print(f"Signature: {signature}")
+    print(f"Body-SHA256: {body_hash}")
+    print(f"Body-Bytes-Len: {len(body_bytes)}")
+    print()
+    print("=== 可直接追加到 curl 的请求头 ===")
+    print(f"--header 'Timestamp: {timestamp}' \\")
+    print(f"--header 'Nonce: {nonce}' \\")
+    print(f"--header 'Signature: {signature}'")
+    print()
+    print("=== 调试信息（参与签名的 body bytes）===")
+    print(repr(body_bytes))
+    print()
+    print("=== 调试信息（服务端签名原文）===")
+    print(sign_content)
+
+
+if __name__ == "__main__":
+    main()

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/lesscode_flask/utils/sign/signature.py

@@ -41,6 +41,12 @@ def _body_sha256() -> str:
     # JSON 请求先做规范化再哈希，避免中间链路重排字段顺序后签名失配。
     body_bytes = request.get_data(cache=True) or b""
     canonical_body_bytes = canonicalize_body_bytes(body_bytes, request.content_type or "")
+    logging.info("body_bytes开始")
+    logging.info("body_bytes: %s", body_bytes)
+    logging.info("body_bytes结束")
+    logging.info("canonical_body_bytes开始")
+    logging.info("canonical_body_bytes: %s", canonical_body_bytes)
+    logging.info("canonical_body_bytes结束")
     return hashlib.sha256(canonical_body_bytes).hexdigest()
 
 

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.104
+Version: 0.2.106
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.104 → lesscode_flask-0.2.106}/lesscode_flask.egg-info/SOURCES.txt

@@ -54,6 +54,8 @@ lesscode_flask/utils/oss/minio_oss.py
 lesscode_flask/utils/redis/redis_helper.py
 lesscode_flask/utils/request/request.py
 lesscode_flask/utils/sign/__init__.py
+lesscode_flask/utils/sign/body_canonical.py
+lesscode_flask/utils/sign/sign_main.py
 lesscode_flask/utils/sign/signature.py
 lesscode_flask/utils/swagger/swagger_template.py
 lesscode_flask/utils/swagger/swagger_util.py