mdbq 4.2.10__py3-none-any.whl → 4.2.11__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.2.10'
+VERSION = '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/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.dist-info → mdbq-4.2.11.dist-info}/METADATA

@@ -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.dist-info → mdbq-4.2.11.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=MrwjVWD5rtRL9-vXKFMy6HJ06DkpWqj_fUcianwbRG8,18
+mdbq/__version__.py,sha256=MqhMtZv7l-q_wRQzpu6U2VaOi2Ddz7_1SDL7MMVF9vs,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=iLN7AqiSq7fQgFtNtge_TIlVOR1hrCSZXH6oId6uGX4,116924
-mdbq/auth/crypto.py,sha256=fcZRFCnrKVVdWDUx_zds51ynFYwS9DBvJOrRQVldrfM,15931
+mdbq/auth/crypto.py,sha256=M0i4dRljJuE30WH_13ythA2QGKPXZm6TgpnYp6aHOzw,17431
 mdbq/auth/rate_limiter.py,sha256=1m_Paxp8pDNpmyoFGRpFMVOJpbmeIvfVcfiQ2oH72qM,32850
 mdbq/js/__init__.py,sha256=hpMi3_ZKwIWkzc0LnKL-SY9AS-7PYFHq0izYTgEvxjc,30
 mdbq/js/jc.py,sha256=6Rgf1WqaJJ1oevpn-pt08gXKbX5hjoQaV6uZGCAGbYw,13177
@@ -27,7 +27,7 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vdg7YQEjhoMp5QzxygNGx5DQKRnePrcwPYgUrDypA6g,23672
-mdbq/redis/redis_cache.py,sha256=D8VlzzbLVE_U9jgbkCjKtg8ak2UvryT8Ysi8C_DL0jM,45462
+mdbq/redis/redis_cache.py,sha256=JWarX_l7LvdKyxtUNPANAqd-y20Jg5uqmllCbT-fyv8,45752
 mdbq/route/__init__.py,sha256=BT_dAY7V-U2o72bevq1B9Mq9QA7GodwtkxyLNdGaoE8,22
 mdbq/route/analytics.py,sha256=dngj5hVwKddEUy59nSYbOoJ9C7OVrtCmCkvW6Uj9RYM,28097
 mdbq/route/monitor.py,sha256=lyowGUU8c2GykeZLrdxd7nXpNMqXWcOsuQsbS8l0pwU,36595
@@ -35,7 +35,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.2.10.dist-info/METADATA,sha256=zwELJYHcPLZqzOYxMznf_iGEG4SKk8TjriZfcA3xvHo,364
-mdbq-4.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.2.10.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.2.10.dist-info/RECORD,,
+mdbq-4.2.11.dist-info/METADATA,sha256=HjK2Bl76B_V2Xpxh0lUkdAfk3thD2VXAmCAgkh23pWk,364
+mdbq-4.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.2.11.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.2.11.dist-info/RECORD,,