Archived
refactor: auth_system 全面异步化(aiosqlite),拆掉 web/services 层的 to_thread 桥接
拆掉两类垫片的最后一处:auth_system 原为同步 sqlite3 栈,web 层与 services 的
worker 只能靠 asyncio.to_thread 逐个桥接才不阻塞事件循环——每次 DB 访问都白付一次
线程池调度,且「同步调异步」的边界散落在 100+ 个调用点。B1 已把 worker 变成协程,
本批把访问层本身也迁到原生异步,两条线在此合拢。
改动(按子系统):
- auth_system:db.py 照 core/db.py 现有范式重建为原生异步访问层(aiosqlite + WAL)
——读路径 _q 每次独立连接、无锁、可并发;写路径 _x / write_transaction 用
asyncio.Lock 串行化,写者不阻塞读者。users / cards / credits / ledger / logs /
settings / mail / geo / backup 九模块随之全部 async/await;security.py 是纯计算
(pbkdf2/normalize)不动。__init__ 去掉 _DB_LOCK 与 get_conn 导出。
- web:app / deps / billing / tasks_registry 与 routers/{admin_site,auth,music,
register,user} 直接 await,拆掉包裹的 to_thread。deps.secret_key 改 async,
连带 _parse_cookie 也 async(会话解析要读密钥)。
- services:_taskcore / tasks / downloads / podcast 的账本调用与查询直接 await。
4 处 start_task 调用点(download.py)确认已 await。
设计取舍(为什么这么做,而不是直接包一层):
- 锁按**事件循环**隔离(_LOOP_LOCKS 以 id(loop) 为键):asyncio.Lock 绑定创建它的
loop,应用主 loop 与测试各自的 loop 并存,跨 loop 复用会抛 "bound to a different
event loop"。
- WAL 切换用**独立锁** _wal_lock 而非 _write_lock:execute() 已持写锁,再在锁内
connect→_configure 会自锁死(asyncio.Lock 非重入)。切换 + 标记在专用锁内串行并
二次复查,否则并发首连会同时执行 PRAGMA journal_mode=WAL 争排他锁报
database is locked(core/db.py 同款教训,实测复现)。
- force_wal 保留:journal_mode 持久化在库文件头,库文件被删重建时新文件不继承,
必须重设。exists() 判定须在 aiosqlite.connect **之前**(connect 会创建空文件)。
- connect() 用 DB_PATH.parent 兜底建目录,优于 DATA_DIR:生产两者相同,但测试
monkeypatch 只换 DB_PATH 时兜底仍能命中正确目录。
留在 to_thread 上的仅剩**正当的阻塞卸载**,不是同步门面:PBKDF2 的 10 万次迭代
(登录链路每次都要跑)、smtplib 发信、备份文件的 copy2 / os.replace、secret.key
的文件 IO。原有 aria2 / downloader / zip 侧的 to_thread 未动。
不变量逐条保持(迁移只改执行模型,不改语义):
- ledger_settle 幂等:账本非 open 直接 return 0,重启后重放不重复退款;
- 终态先到先得:_mark_task_terminal 对已 done/error/canceled 的任务直接 return,
堵住 canceled→error 的非法迁移边;
- settle 必须在任务锁**外**调用(ledger_settle 要抢 SQLite 写锁,busy 最长 15s,
持任务锁会让全站进度/提交/取消随库停摆);
- reserve_and_open 的预扣与开账同事务,消除原两步之间的崩溃丢账窗口。
路径真源红线:DATA_DIR / DB_PATH / BACKUP_DIR / SECRET_KEY_PATH 仍是 auth_system.db
的**模块全局**(用与 core.db 相同的表达式,但**不是**它的别名)。测试只 patch
auth_system.db.*,若改成 core.db 的别名会静默把测试写到生产库。已核 data/site.db
读写前后 sha256 完全一致。
顺带清掉 get_conn:迁移后它只剩「转调 connect()」一层空壳、全仓零消费者(测试
直接开裸连接、备份用 db.connect()),保留等于留一条「拿裸连接自己写」的口子。
测试:19 个文件同步迁移——10 个文件的 web.deps.secret_key 替身改 async;
test_db_conn.py 的多线程首连用例按异步语义拆成 2 条(单 loop gather(16) 覆盖批量
并发首连、WAL 就绪后 8 线程各自 loop 建连覆盖跨 loop);test_billing_scope.py 去掉
多余的 @pytest.mark.anyio;被 await 且**正常返回**的 monkeypatch 替身一律改 async
(仅 raise 的同步替身仍可用)。
门禁:ruff 全过 / pyright 0-0-0(standard 模式含 tests 与顶层模块)/ pytest
384 项全绿(0 失败 0 error 0 skipped;383→384 因 test_db_conn 拆用例)。
data/site.db 读写前后 sha256 一致(a19f5db…6487),无 -wal/-shm 边车残留。
下一步 B3:删 core/sync_http.py、core/async_bridge.py、core/http_errors.py 及
tests/test_async_bridge.py——三者在生产侧已零消费者(http_errors 仅 sync_http
自用,requests 已非声明依赖)。
This commit is contained in:
1 parent
69a50c2c31
commit
96af56cc27
43 files changed
+1171
-1009
No files matched your search
+24
-26
@@ -9,12 +9,11 @@
|
||||
- POST /api/v1/auth/forgot_password ↔ Flask /auth/forgot_password
|
||||
|
||||
说明:
|
||||
- 同步的 auth_system 调用(SQLite 事务、邮件 SMTP、PBKDF2)经 asyncio.to_thread 执行,
|
||||
不阻塞事件循环;行为与历史实现完全一致。
|
||||
- auth_system 已迁移为**原生异步**(aiosqlite),此处直接 await,不再经 asyncio.to_thread
|
||||
桥接;PBKDF2 等 CPU 密集与 smtplib 阻塞发送已在 auth_system 内部就卸载。
|
||||
- 发码 IP 限流复用 web.auth_state 的模块级状态 `_SEND_CODE_IP`。
|
||||
- 失败锁定/验证码消费等安全口径逐字保留。
|
||||
"""
|
||||
import asyncio
|
||||
import os
|
||||
import sqlite3
|
||||
import time
|
||||
@@ -43,11 +42,11 @@ _SESSION_MAX_AGE = cs.SESSION_MAX_AGE
|
||||
|
||||
|
||||
|
||||
def _login_cookie_response(payload: dict, message: str, uid: int, seq: int,
|
||||
secure: bool) -> JSONResponse:
|
||||
async def _login_cookie_response(payload: dict, message: str, uid: int, seq: int,
|
||||
secure: bool) -> JSONResponse:
|
||||
resp = JSONResponse(content={'status': 200, 'success': True, 'message': message, 'data': payload})
|
||||
cookie = cs.dumps(deps.secret_key(), {'site_uid': uid, 'site_uid_seq': seq,
|
||||
'site_uid_ts': int(time.time())})
|
||||
cookie = cs.dumps(await deps.secret_key(), {'site_uid': uid, 'site_uid_seq': seq,
|
||||
'site_uid_ts': int(time.time())})
|
||||
resp.set_cookie(SESSION_COOKIE, cookie, max_age=_SESSION_MAX_AGE, httponly=True,
|
||||
samesite='lax', path='/', secure=secure)
|
||||
return resp
|
||||
@@ -74,7 +73,7 @@ async def send_code(request: Request):
|
||||
if purpose not in ('register', 'reset'):
|
||||
return error('验证码用途不正确')
|
||||
try:
|
||||
await asyncio.to_thread(auth.send_verify_code, email, purpose)
|
||||
await auth.send_verify_code(email, purpose)
|
||||
return success(message='验证码已发送,请查收邮箱')
|
||||
except (ValueError, RuntimeError) as e:
|
||||
return error(str(e))
|
||||
@@ -97,14 +96,14 @@ async def redeem(user: Annotated[SiteUser | None, Depends(current_user)], reques
|
||||
data = await _request_data(request)
|
||||
code = str(data.get('code') or '')
|
||||
try:
|
||||
credits, remaining = await asyncio.to_thread(auth.redeem_card, code, user.username)
|
||||
await asyncio.to_thread(auth.add_log, 'success', user.username, ip, '卡密充值',
|
||||
credits, remaining = await auth.redeem_card(code, user.username)
|
||||
await auth.add_log('success', user.username, ip, '卡密充值',
|
||||
f'{code[:4]}**** · +{credits} 次')
|
||||
return success({'credits': credits, 'duration_seconds': remaining,
|
||||
'duration_text': auth.format_credits(remaining)},
|
||||
f'充值成功,+{credits} 次')
|
||||
except ValueError as e:
|
||||
await asyncio.to_thread(auth.add_log, 'fail', user.username, ip, '卡密充值', str(e))
|
||||
await auth.add_log('fail', user.username, ip, '卡密充值', str(e))
|
||||
return error(str(e))
|
||||
except Exception:
|
||||
return error('充值失败,请稍后重试', 500)
|
||||
@@ -122,16 +121,16 @@ async def forgot_password(request: Request):
|
||||
if not email:
|
||||
return error('缺少邮箱')
|
||||
try:
|
||||
if not await asyncio.to_thread(auth.check_verify_code, email, code, 'reset'):
|
||||
if not await auth.check_verify_code(email, code, 'reset'):
|
||||
return error('邮箱验证码错误或已过期')
|
||||
user = await asyncio.to_thread(auth.get_user_by_email, email)
|
||||
user = await auth.get_user_by_email(email)
|
||||
if not user:
|
||||
return error('邮箱验证码错误或已过期')
|
||||
if user['role'] == 'admin':
|
||||
# 管理员不走自助找回(2FA 保护,统一防枚举文案)
|
||||
return error('邮箱验证码错误或已过期')
|
||||
await asyncio.to_thread(auth.reset_password, user['id'], newpwd)
|
||||
await asyncio.to_thread(auth.add_log, 'success', user['username'],
|
||||
await auth.reset_password(user['id'], newpwd)
|
||||
await auth.add_log('success', user['username'],
|
||||
ratelimit.client_ip(request), '自助找回密码', '邮箱验证码重置')
|
||||
return success(message='密码已重置,请使用新密码登录(所有设备已下线)')
|
||||
except Exception:
|
||||
@@ -162,9 +161,9 @@ async def _reject_registration(message: str, *, email: str, code: str, ttl: int,
|
||||
验证码在 check_verify_code 里已被 DELETE 原子消费,凡走到建号/查重/防刷
|
||||
之后才失败的路径都必须还原,否则用户被迫重新收码。
|
||||
"""
|
||||
await asyncio.to_thread(auth.restore_verify_code, email, code, ttl, 'register')
|
||||
await auth.restore_verify_code(email, code, ttl, 'register')
|
||||
if log_detail:
|
||||
await asyncio.to_thread(auth.add_log, 'fail', username, ip, '注册', log_detail)
|
||||
await auth.add_log('fail', username, ip, '注册', log_detail)
|
||||
return error(message)
|
||||
|
||||
|
||||
@@ -185,10 +184,10 @@ async def _issue_registration_session(user, credits: int, username: str,
|
||||
fresh = await repo.get_user_by_id(uid) or {}
|
||||
seq = int(fresh.get('login_seq') or 1)
|
||||
credits = min(credits, max(0, int(fresh.get('duration_seconds') or 0)))
|
||||
await asyncio.to_thread(auth.add_log, 'success', username, ip, '注册账号',
|
||||
await auth.add_log('success', username, ip, '注册账号',
|
||||
f'赠送 {credits} 次' if credits else '未赠送次数')
|
||||
secure = os.environ.get('ENABLE_SECURE_COOKIE', '').strip().lower() in ('1', 'true', 'yes')
|
||||
return _login_cookie_response({
|
||||
return await _login_cookie_response({
|
||||
'user': _user_public(fresh),
|
||||
'duration_text': auth.format_credits(int(fresh.get('duration_seconds') or 0)),
|
||||
'redirect': 'admin' if fresh.get('role') == 'admin' else 'user',
|
||||
@@ -217,25 +216,24 @@ async def register(request: Request):
|
||||
return error(bad_input)
|
||||
|
||||
try:
|
||||
code_ttl = await asyncio.to_thread(auth.check_verify_code, email, code, 'register')
|
||||
code_ttl = await auth.check_verify_code(email, code, 'register')
|
||||
if not code_ttl:
|
||||
return error('邮箱验证码错误或已过期')
|
||||
rej = {'email': email, 'code': code, 'ttl': code_ttl}
|
||||
if await asyncio.to_thread(auth.get_user_by_name, username):
|
||||
if await auth.get_user_by_name(username):
|
||||
return await _reject_registration('用户名已被注册', **rej)
|
||||
if email and await asyncio.to_thread(auth.get_user_by_email, email):
|
||||
if email and await auth.get_user_by_email(email):
|
||||
return await _reject_registration('该邮箱已被注册,请更换邮箱或联系管理员', **rej)
|
||||
|
||||
device_used_flag = bool(device_id) and await asyncio.to_thread(auth.device_used, device_id)
|
||||
if ip and await asyncio.to_thread(auth.register_ip_exceeded, ip):
|
||||
device_used_flag = bool(device_id) and await auth.device_used(device_id)
|
||||
if ip and await auth.register_ip_exceeded(ip):
|
||||
return await _reject_registration(
|
||||
'当前网络注册过于频繁,请 24 小时后再试或联系管理员',
|
||||
username=username, ip=ip, log_detail='同 IP 24h 注册次数超限', **rej)
|
||||
|
||||
credits = await _register_credits(device_used_flag)
|
||||
try:
|
||||
user = await asyncio.to_thread(
|
||||
auth.create_user, username, password, email=email, credits=credits,
|
||||
user = await auth.create_user(username, password, email=email, credits=credits,
|
||||
guard=auth.RegistrationGuard(
|
||||
device_id=device_id, ip=ip,
|
||||
ua=str(request.headers.get('user-agent') or ''),
|
||||
|
||||
Reference in new issue
Block a user