chore: upgrade python version to 3.12 and refactor password encryption

This commit upgrades the project's Python base version from 3.10 to 3.12, updates all related dependency versions, replaces bcrypt password hashing with pbkdf2-sha256, refactors the UA parsing library, removes unused dependencies, and fixes related exception handling code.
This commit is contained in:
zhangtao
2026-06-21 06:57:44 +08:00
parent 211fddd6e0
commit d6c3104f2d
15 changed files with 500 additions and 548 deletions
+22 -144
View File
@@ -1,66 +1,38 @@
import base64
import hashlib
import os
from typing import Any
from cryptography.hazmat.backends.openssl import backend
from cryptography.hazmat.primitives import padding
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
from itsdangerous import URLSafeSerializer
from passlib.context import CryptContext
from app.core.logger import logger
# 密码加密配置
PwdContext = CryptContext(
schemes=["bcrypt"],
deprecated="auto",
bcrypt__rounds=12, # 设置加密轮数,增加安全性
)
_PBKDF2_ALGO = "sha256"
_PBKDF2_ITERATIONS = 600_000
_PBKDF2_SALT_LEN = 16
_PBKDF2_PREFIX = "$pbkdf2-sha256$"
class PwdUtil:
"""
密码工具类,提供密码加密和验证功能
"""
@classmethod
def verify_password(cls, plain_password: str, password_hash: str) -> bool:
"""
校验密码是否匹配
@staticmethod
def hash_password(password: str) -> str:
salt = os.urandom(_PBKDF2_SALT_LEN)
dk = hashlib.pbkdf2_hmac(_PBKDF2_ALGO, password.encode(), salt, _PBKDF2_ITERATIONS)
return f"{_PBKDF2_PREFIX}{_PBKDF2_ITERATIONS}${base64.b64encode(salt).decode()}${base64.b64encode(dk).decode()}"
参数:
- plain_password (str): 明文密码。
- password_hash (str): 加密后的密码哈希值。
@staticmethod
def verify_password(plain_password: str, password_hash: str) -> bool:
try:
_, _algo, iters_str, salt_b64, hash_b64 = password_hash.split("$")
salt = base64.b64decode(salt_b64)
expected = base64.b64decode(hash_b64)
dk = hashlib.pbkdf2_hmac(_PBKDF2_ALGO, plain_password.encode(), salt, int(iters_str))
return dk == expected
except Exception:
return False
返回:
- bool: 密码是否匹配。
"""
return PwdContext.verify(plain_password, password_hash)
@classmethod
def set_password_hash(cls, password: str) -> str:
"""
对密码进行加密
参数:
- password (str): 明文密码。
返回:
- str: 加密后的密码哈希值。
"""
return PwdContext.hash(password)
@classmethod
def check_password_strength(cls, password: str) -> str | None:
"""
检查密码强度
参数:
- password (str): 明文密码。
返回:
- str | None: 如果密码强度不够返回提示信息,否则返回None。
"""
@staticmethod
def check_password_strength(password: str) -> str | None:
if len(password) < 6:
return "密码长度至少6位"
if not any(c.isupper() for c in password):
@@ -76,27 +48,9 @@ class AESCipher:
"""AES 加密器"""
def __init__(self, key: bytes | str) -> None:
"""
初始化 AES 加密器。
参数:
- key (bytes | str): 密钥,16/24/32 bytes 或 16 进制字符串。
返回:
- None
"""
self.key = key if isinstance(key, bytes) else bytes.fromhex(key)
def encrypt(self, plaintext: bytes | str) -> bytes:
"""
AES 加密。
参数:
- plaintext (bytes | str): 加密前的明文。
返回:
- bytes: 加密后的密文(前16字节为随机IV)。
"""
if not isinstance(plaintext, bytes):
plaintext = str(plaintext).encode("utf-8")
iv = os.urandom(16)
@@ -108,15 +62,6 @@ class AESCipher:
return iv + ciphertext
def decrypt(self, ciphertext: bytes | str) -> str:
"""
AES 解密。
参数:
- ciphertext (bytes | str): 解密前的密文,bytes 或 16 进制字符串。
返回:
- str: 解密后的明文。
"""
ciphertext = ciphertext if isinstance(ciphertext, bytes) else bytes.fromhex(ciphertext)
iv = ciphertext[:16]
ciphertext = ciphertext[16:]
@@ -133,75 +78,8 @@ class Md5Cipher:
@staticmethod
def encrypt(plaintext: bytes | str) -> str:
"""
MD5 加密。
参数:
- plaintext (bytes | str): 加密前的明文。
返回:
- str: MD5 十六进制摘要。
"""
md5 = hashlib.md5()
if not isinstance(plaintext, bytes):
plaintext = str(plaintext).encode("utf-8")
md5.update(plaintext)
return md5.hexdigest()
class ItsDCipher:
"""ItsDangerous 加密器"""
def __init__(self, key: bytes | str) -> None:
"""
初始化 ItsDangerous 加密器。
参数:
- key (bytes | str): 密钥,16/24/32 bytes 或 16 进制字符串。
返回:
- None
"""
self.key = key if isinstance(key, bytes) else bytes.fromhex(key)
def encrypt(self, plaintext: Any) -> str:
"""
ItsDangerous 加密。
参数:
- plaintext (Any): 加密前的明文。
返回:
- str: 加密后的密文(URL安全)。
异常:
- Exception: 加密失败时使用 MD5 作为降级,错误已记录。
"""
serializer = URLSafeSerializer(self.key)
try:
ciphertext = serializer.dumps(plaintext)
except Exception as e:
logger.error(f"ItsDangerous encrypt failed: {e}")
ciphertext = Md5Cipher.encrypt(plaintext)
return ciphertext
def decrypt(self, ciphertext: str) -> Any:
"""
ItsDangerous 解密。
参数:
- ciphertext (str): 解密前的密文。
返回:
- Any: 解密后的明文;失败时返回原密文。
异常:
- Exception: 解密失败时记录错误并返回原密文。
"""
serializer = URLSafeSerializer(self.key)
try:
plaintext = serializer.loads(ciphertext)
except Exception as e:
logger.error(f"ItsDangerous decrypt failed: {e}")
plaintext = ciphertext
return plaintext