mdbq 4.2.10__tar.gz → 4.2.11__tar.gz

{mdbq-4.2.10 → mdbq-4.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.2.10
+Version: 4.2.11
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.2.11/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.2.11'

{mdbq-4.2.10 → mdbq-4.2.11}/mdbq/auth/crypto.py

@@ -175,8 +175,29 @@ class CryptoService:
     def decrypt_token(self, encrypted_token: str) -> Optional[Dict[str, Any]]:
         """解密令牌"""
         try:
+            # 验证输入参数
+            if not encrypted_token or not isinstance(encrypted_token, str):
+                self.logger.error("无效的加密令牌")
+                return None
+            
             # 解析加密数据
-            encrypted_data = json.loads(base64.b64decode(encrypted_token))
+            try:
+                encrypted_data = json.loads(base64.b64decode(encrypted_token))
+            except (json.JSONDecodeError, ValueError, TypeError) as e:
+                self.logger.error(f"解析加密数据失败: {str(e)}")
+                return None
+            
+            # 验证数据类型
+            if not isinstance(encrypted_data, dict):
+                self.logger.error("加密数据格式错误，应为字典类型")
+                return None
+            
+            # 验证必要的字段是否存在
+            required_fields = ['key', 'iv', 'ciphertext']
+            for field in required_fields:
+                if field not in encrypted_data:
+                    self.logger.error(f"加密数据缺少必要字段: {field}")
+                    return None
 
             # 获取私钥
             private_key = self.key_manager.get_private_key()
@@ -185,7 +206,11 @@ class CryptoService:
                 return None
             
             # 解密AES密钥
-            encrypted_aes_key = base64.b64decode(encrypted_data['key'])
+            try:
+                encrypted_aes_key = base64.b64decode(encrypted_data['key'])
+            except (ValueError, TypeError) as e:
+                self.logger.error(f"解码AES密钥失败: {str(e)}")
+                return None
             
             # 使用SHA-512加密算法
             try:
@@ -199,16 +224,25 @@ class CryptoService:
                 )
             except Exception as decrypt_error:
                 self.logger.error("RSA解密失败", {'error': str(decrypt_error)})
+                return None
             
             # 解密数据
-            iv = base64.b64decode(encrypted_data['iv'])
-            ciphertext = base64.b64decode(encrypted_data['ciphertext'])
+            try:
+                iv = base64.b64decode(encrypted_data['iv'])
+                ciphertext = base64.b64decode(encrypted_data['ciphertext'])
+            except (ValueError, TypeError) as e:
+                self.logger.error(f"解码IV或密文失败: {str(e)}")
+                return None
             
             # 检查是否有认证标签（AES-GCM需要）
             if 'tag' in encrypted_data:
-                tag = base64.b64decode(encrypted_data['tag'])
-                # 将tag附加到密文末尾（AES-GCM标准做法）
-                ciphertext_with_tag = ciphertext + tag
+                try:
+                    tag = base64.b64decode(encrypted_data['tag'])
+                    # 将tag附加到密文末尾（AES-GCM标准做法）
+                    ciphertext_with_tag = ciphertext + tag
+                except (ValueError, TypeError) as e:
+                    self.logger.error(f"解码认证标签失败: {str(e)}")
+                    return None
             else:
                 # 如果没有tag，假设密文已经包含tag
                 ciphertext_with_tag = ciphertext

{mdbq-4.2.10 → mdbq-4.2.11}/mdbq/redis/redis_cache.py

@@ -1131,6 +1131,11 @@ def _safe_cache_set(cache_system, cache_key, response_data, ttl, namespace,
             if not status_ok:
                 return False
             
+            # 检查 message 字段是否包含"失败"字样，如果包含则跳过缓存
+            message = data.get('message', '')
+            if isinstance(message, str) and ('失败' in message or 'error' in message or 'fail' in message):
+                return False
+            
             # 检查数据部分（支持多种数据字段名）
             has_data_fields = (
                 'data' in data or           # 标准data字段

{mdbq-4.2.10 → mdbq-4.2.11}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.2.10
+Version: 4.2.11
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.2.10/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.2.10'