Archived
为什么:smtplib 是同步栈,原先靠 asyncio.to_thread 卸载——线程池里躺着的仍是一次 完整的 TCP + TLS 握手加多轮 SMTP 交互,属于「同步网络 IO 藏在 to_thread 里」:既 占着线程,也不产生并发收益。这是本系列最后一条此类遗留(aria2p 那条已在 C2 清零)。 改动: - auth_system/mail.py:_smtp_connect / _smtp_send 两个同步函数合成一个原生异步 _smtp_send,底层换 aiosmtplib.SMTP。TLS 口径与原实现一一对应:465 用 use_tls (隐式 TLS),其余端口用 start_tls(显式 STARTTLS,先握手再 LOGIN);两条路都传 显式构造的 ssl.create_default_context(),不依赖运行时默认校验口径。finally 里 quit 失败只吞连接关闭错误,sendmail 的真实异常原样上抛——send_verify_code 依赖 它决定「不写库、不烧 24h 额度」。 - auth_system/mail.py:send_email 改直接 await;移除 import asyncio / import smtplib。 - auth_system/__init__.py:撤掉 _smtp_connect 的再导出——它是同步时代的辅助函数, 全仓无消费方,新实现里也不存在对应物。 - web/routers/register.py:更新过时的模块说明(原文仍写「smtplib 阻塞发送已卸载」)。 - pyproject.toml / uv.lock:新增 aiosmtplib>=5.1.3,<6.0。 - tests/test_mail_smtp.py(新增 5 条):SMTP 路径此前零覆盖,而「端口 → TLS 方式」 的映射属「授权码会不会明文过网」级别的差异,一旦被改反不会有任何地方报警。用假 SMTP 替身记录构造参数与调用序、全程不触网:587 必须 start_tls 且 LOGIN 在 connect 之后、465 必须 use_tls 且不得再叠 STARTTLS、端口缺省回落 587、quit 失败不掩盖结果、 sendmail 失败原样上抛且仍关连接。 验证: - uv run ruff check . → All checks passed! - uv run pyright → 0 errors, 0 warnings, 0 informations (aiosmtplib 自带 py.typed,故对它的调用是有效类型校验;另用 inspect 逐一核对了 5.1.3 的 SMTP / connect / login / sendmail / quit 参数名) - uv run pytest → 397 项,0 失败 / 0 error / 0 skipped(C3 后 392,新增 5) - data/site.db sha256 前后一致(a19f5dbf…6487),无 -wal/-shm 残留
244 lines
5.7 KiB
Python
244 lines
5.7 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""站点认证与管理系统
|
||
|
||
提供网站级用户体系:
|
||
- 用户注册(邮箱验证码)/ 登录 / 登出 / 注册即赠下载次数(试用领取已并入注册)
|
||
- 按次计费(一首歌 = 1 次)、卡密(次数卡)充值
|
||
- 管理员后台:用户管理 / SMTP 配置 / 卡密生成 / 公告 / 日志 / 数据库备份
|
||
- 接口装饰器:login_required(强制登录 + 按次扣费)/ admin_required(仅管理员)
|
||
|
||
数据存储:SQLite(data/site.db),会话:Flask 签名 Cookie(secret_key 持久化)
|
||
"""
|
||
|
||
# 兼容门面:实现已按职责拆分到同包各子模块,此处原样再导出。
|
||
# 用 `__all__` 声明再导出(ruff F401 与 pyright 均据此认定「有意再导出」),
|
||
# 使既有调用点(auth_system.xxx / from auth_system import Y)零改动。
|
||
#
|
||
# ⚠️ 路径常量(DATA_DIR / DB_PATH / BACKUP_DIR / SECRET_KEY_PATH)在此只是
|
||
# **import 时的值快照**:它们是再导出的绑定,运行时改 auth_system.DB_PATH
|
||
# 不会影响 db / backup 的实际读写路径(那只会静默失效,且看起来"改成功了")。
|
||
# 一律不要经由包属性做重定向:
|
||
# - 测试:patch `auth_system.db.<NAME>`(唯一来源,db 与 backup 都随动)
|
||
# - 部署:设置环境变量 SITE_DATA_DIR(须在进程启动前)
|
||
# 此处保留再导出仅为不破坏既有 `auth_system.DB_PATH` 读取方(如黄金测试)。
|
||
|
||
from .backup import (
|
||
_BACKUP_ERR_TS,
|
||
_BACKUP_NAME_LOCK,
|
||
_auto_backup_loop,
|
||
_backup_is_valid_db,
|
||
_backup_thread_started,
|
||
_before_restore_hook,
|
||
backup_path,
|
||
create_backup,
|
||
delete_backup,
|
||
list_backups,
|
||
prune_backups,
|
||
register_before_restore_hook,
|
||
restore_backup,
|
||
start_auto_backup,
|
||
)
|
||
from .cards import (
|
||
delete_card,
|
||
generate_cards,
|
||
list_cards,
|
||
redeem_card,
|
||
set_card_disabled,
|
||
)
|
||
from .credits import (
|
||
add_credits,
|
||
charge_credits,
|
||
format_credits,
|
||
refund_credits,
|
||
reserve_credits,
|
||
)
|
||
from .db import (
|
||
BACKUP_DIR,
|
||
DATA_DIR,
|
||
DB_PATH,
|
||
DEFAULT_ADMIN_USER,
|
||
DEFAULT_REGISTER_CREDITS,
|
||
SECRET_KEY_PATH,
|
||
SESSION_KEY,
|
||
_q,
|
||
_x,
|
||
get_secret_key,
|
||
init_db,
|
||
)
|
||
from .geo import (
|
||
_PROVINCE_CACHE,
|
||
PROVINCE_BAN_LIMIT,
|
||
PROVINCE_WINDOW,
|
||
_is_private_ip,
|
||
query_ip_province,
|
||
record_login_location,
|
||
)
|
||
from .ledger import (
|
||
ledger_cleanup_settled,
|
||
ledger_get,
|
||
ledger_open,
|
||
ledger_recover_orphans,
|
||
ledger_rename,
|
||
ledger_settle,
|
||
ledger_supplement,
|
||
reserve_and_open,
|
||
)
|
||
from .logs import (
|
||
_LOG_WRITE_COUNTER,
|
||
add_log,
|
||
clear_logs,
|
||
query_logs,
|
||
)
|
||
from .mail import (
|
||
_CODE_EMAIL_TEMPLATES,
|
||
_CODE_FAILS,
|
||
_CODE_FAILS_MAX,
|
||
_CODE_PURPOSES,
|
||
_EMAIL_SENT_24H,
|
||
_SMTP_ENC_PREFIX,
|
||
_code_fails_trim,
|
||
_smtp_password_decrypt,
|
||
_smtp_password_encrypt,
|
||
check_verify_code,
|
||
get_smtp_config,
|
||
restore_verify_code,
|
||
save_smtp_config,
|
||
send_email,
|
||
send_verify_code,
|
||
smtp_configured,
|
||
)
|
||
from .security import (
|
||
_PBKDF2_ITERS,
|
||
_hash,
|
||
_hash_new,
|
||
_normalize_email,
|
||
_verify_password,
|
||
)
|
||
from .settings import (
|
||
get_announcement,
|
||
get_setting,
|
||
save_announcement,
|
||
set_setting,
|
||
)
|
||
from .users import (
|
||
RegistrationGuard,
|
||
_last_province,
|
||
_user_public,
|
||
ban_user,
|
||
create_user,
|
||
delete_user,
|
||
device_used,
|
||
get_user_by_email,
|
||
get_user_by_id,
|
||
get_user_by_name,
|
||
list_users,
|
||
register_ip_exceeded,
|
||
reset_password,
|
||
set_user_credits,
|
||
set_user_netease_cookie,
|
||
set_user_password,
|
||
set_user_status,
|
||
unban_user,
|
||
verify_login,
|
||
)
|
||
|
||
__all__ = [
|
||
'BACKUP_DIR',
|
||
'DATA_DIR',
|
||
'DB_PATH',
|
||
'DEFAULT_ADMIN_USER',
|
||
'DEFAULT_REGISTER_CREDITS',
|
||
'PROVINCE_BAN_LIMIT',
|
||
'PROVINCE_WINDOW',
|
||
'SECRET_KEY_PATH',
|
||
'SESSION_KEY',
|
||
'_BACKUP_ERR_TS',
|
||
'_BACKUP_NAME_LOCK',
|
||
'_CODE_EMAIL_TEMPLATES',
|
||
'_CODE_FAILS',
|
||
'_CODE_FAILS_MAX',
|
||
'_CODE_PURPOSES',
|
||
'_EMAIL_SENT_24H',
|
||
'_LOG_WRITE_COUNTER',
|
||
'_PBKDF2_ITERS',
|
||
'_PROVINCE_CACHE',
|
||
'_SMTP_ENC_PREFIX',
|
||
'RegistrationGuard',
|
||
'_auto_backup_loop',
|
||
'_backup_is_valid_db',
|
||
'_backup_thread_started',
|
||
'_before_restore_hook',
|
||
'_code_fails_trim',
|
||
'_hash',
|
||
'_hash_new',
|
||
'_is_private_ip',
|
||
'_last_province',
|
||
'_normalize_email',
|
||
'_q',
|
||
'_smtp_password_decrypt',
|
||
'_smtp_password_encrypt',
|
||
'_user_public',
|
||
'_verify_password',
|
||
'_x',
|
||
'add_credits',
|
||
'add_log',
|
||
'backup_path',
|
||
'ban_user',
|
||
'charge_credits',
|
||
'check_verify_code',
|
||
'clear_logs',
|
||
'create_backup',
|
||
'create_user',
|
||
'delete_backup',
|
||
'delete_card',
|
||
'delete_user',
|
||
'device_used',
|
||
'format_credits',
|
||
'generate_cards',
|
||
'get_announcement',
|
||
'get_secret_key',
|
||
'get_setting',
|
||
'get_smtp_config',
|
||
'get_user_by_email',
|
||
'get_user_by_id',
|
||
'get_user_by_name',
|
||
'init_db',
|
||
'ledger_cleanup_settled',
|
||
'ledger_get',
|
||
'ledger_open',
|
||
'ledger_recover_orphans',
|
||
'ledger_rename',
|
||
'ledger_settle',
|
||
'ledger_supplement',
|
||
'list_backups',
|
||
'list_cards',
|
||
'list_users',
|
||
'prune_backups',
|
||
'query_ip_province',
|
||
'query_logs',
|
||
'record_login_location',
|
||
'redeem_card',
|
||
'refund_credits',
|
||
'register_before_restore_hook',
|
||
'register_ip_exceeded',
|
||
'reserve_and_open',
|
||
'reserve_credits',
|
||
'reset_password',
|
||
'restore_backup',
|
||
'restore_verify_code',
|
||
'save_announcement',
|
||
'save_smtp_config',
|
||
'send_email',
|
||
'send_verify_code',
|
||
'set_card_disabled',
|
||
'set_setting',
|
||
'set_user_credits',
|
||
'set_user_netease_cookie',
|
||
'set_user_password',
|
||
'set_user_status',
|
||
'smtp_configured',
|
||
'start_auto_backup',
|
||
'unban_user',
|
||
'verify_login',
|
||
]
|