Archived
snowy-yang
5ad2152acc
为什么：注册是站点唯一的建号入口，84 行里五条「建号前失败」路径各自 手写一遍 restore_verify_code（有的还带失败日志），防刷双闸与三种建号 异常的口径全埋在分支里，改任何一条都要通读全函数核对还原时序。 拆出（顺序 = 原执行顺序，逐条语义对应）： - _validate_registration_input：入参四道闸（协议/用户名/密码/邮箱）， 按序返回第一条错误文案 - _reject_registration：统一拒绝出口——还原已消费验证码（可选失败 日志）；五处 restore 收敛为一处，docstring 写明「为何必须还原」 - _register_credits：赠送闸（同设备重复注册归零；顺带删除 credits<0 死分支——_safe_register_credits 已保证非负） - _issue_registration_session：成功收尾（login_seq 递增 + 日志 + Cookie） 先写测试后动代码：新增 tests/test_register_flow.py 9 例，在未改动 实现上一次跑绿。验证码由 check_verify_code DELETE 原子消费，测试用 「失败路径后 email_codes 行仍在」做 restore 实证断言（不 mock 还原）； 其中用户名重名路径用端到端方式验证——同一验证码不重发即可二次注册。 覆盖此前零测试的路径：IP 闸、设备赠送闸、IntegrityError/ValueError/ 读回 None 三种建号异常映射、非预期异常 500 泛化文案。 门禁：ruff 全过 · pyright 0/0 · pytest 339 passed（330→339）。
257 lines
12 KiB
Python
257 lines
12 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""注册 / 找回密码 / 卡密 / 验证码。
|
||
|
||
端点：
|
||
- POST /api/v1/auth/send_code ↔ Flask /auth/send_code
|
||
- POST /api/v1/auth/register ↔ Flask /auth/register
|
||
- POST /api/v1/auth/trial ↔ Flask /auth/trial
|
||
- POST /api/v1/auth/redeem ↔ Flask /auth/redeem
|
||
- POST /api/v1/auth/forgot_password ↔ Flask /auth/forgot_password
|
||
|
||
说明：
|
||
- 同步的 auth_system 调用（SQLite 事务、邮件 SMTP、PBKDF2）经 asyncio.to_thread 执行，
|
||
不阻塞事件循环；行为与历史实现完全一致。
|
||
- 发码 IP 限流复用 web.auth_state 的模块级状态 `_SEND_CODE_IP`。
|
||
- 失败锁定/验证码消费等安全口径逐字保留。
|
||
"""
|
||
import asyncio
|
||
import os
|
||
import sqlite3
|
||
import time
|
||
from typing import Annotated
|
||
|
||
from fastapi import APIRouter, Depends, Request
|
||
from fastapi.responses import JSONResponse
|
||
|
||
import auth_system as auth
|
||
import web.deps as deps
|
||
from core import db, repo
|
||
from core import session as cs
|
||
from web import ratelimit
|
||
from web.deps import SiteUser, current_user
|
||
from web.request_utils import (
|
||
request_data as _request_data,
|
||
)
|
||
from web.response import error, success
|
||
from web.serializers import user_public as _user_public
|
||
|
||
router = APIRouter()
|
||
|
||
SESSION_COOKIE = cs.COOKIE_NAME
|
||
_SESSION_MAX_AGE = cs.SESSION_MAX_AGE
|
||
|
||
|
||
|
||
|
||
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())})
|
||
resp.set_cookie(SESSION_COOKIE, cookie, max_age=_SESSION_MAX_AGE, httponly=True,
|
||
samesite='lax', path='/', secure=secure)
|
||
return resp
|
||
|
||
|
||
async def _safe_register_credits() -> int:
|
||
try:
|
||
credits = int(await repo.get_setting('register_credits', str(auth.DEFAULT_REGISTER_CREDITS)) or 0)
|
||
except (TypeError, ValueError):
|
||
return auth.DEFAULT_REGISTER_CREDITS
|
||
return max(0, credits)
|
||
|
||
|
||
@router.post('/auth/send_code')
|
||
async def send_code(request: Request):
|
||
"""发送邮箱验证码（注册/找回用途隔离）。"""
|
||
from web.auth_state import _send_code_ip_check
|
||
ip = ratelimit.client_ip(request)
|
||
if not _send_code_ip_check(ip):
|
||
return error('验证码请求过于频繁，请稍后再试')
|
||
data = await _request_data(request)
|
||
email = str(data.get('email') or '').strip()
|
||
purpose = str(data.get('purpose') or 'register').strip()
|
||
if purpose not in ('register', 'reset'):
|
||
return error('验证码用途不正确')
|
||
try:
|
||
await asyncio.to_thread(auth.send_verify_code, email, purpose)
|
||
return success(message='验证码已发送，请查收邮箱')
|
||
except (ValueError, RuntimeError) as e:
|
||
return error(str(e))
|
||
except Exception:
|
||
return error('验证码发送失败，请稍后重试', 500)
|
||
|
||
|
||
@router.post('/auth/trial')
|
||
async def trial():
|
||
"""试用已并入注册：注册即送 N 次。"""
|
||
return error(f'注册即送 {await _safe_register_credits()} 次免费下载次数，请直接注册账号')
|
||
|
||
|
||
@router.post('/auth/redeem')
|
||
async def redeem(user: Annotated[SiteUser | None, Depends(current_user)], request: Request):
|
||
"""卡密充值。"""
|
||
if user is None:
|
||
return error('请先登录', 401, error_code='unauthorized')
|
||
ip = ratelimit.client_ip(request)
|
||
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, '卡密充值',
|
||
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))
|
||
return error(str(e))
|
||
except Exception:
|
||
return error('充值失败，请稍后重试', 500)
|
||
|
||
|
||
@router.post('/auth/forgot_password')
|
||
async def forgot_password(request: Request):
|
||
"""自助找回密码：邮箱验证码 → 重置密码并踢下全部会话（响应防枚举）。"""
|
||
data = await _request_data(request)
|
||
email = auth._normalize_email(str(data.get('email') or ''))
|
||
code = str(data.get('code') or '').strip()
|
||
newpwd = str(data.get('password') or '')
|
||
if len(newpwd) < 8 or len(newpwd) > 128:
|
||
return error('新密码长度需在 8-128 位之间')
|
||
if not email:
|
||
return error('缺少邮箱')
|
||
try:
|
||
if not await asyncio.to_thread(auth.check_verify_code, email, code, 'reset'):
|
||
return error('邮箱验证码错误或已过期')
|
||
user = await asyncio.to_thread(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'],
|
||
ratelimit.client_ip(request), '自助找回密码', '邮箱验证码重置')
|
||
return success(message='密码已重置，请使用新密码登录（所有设备已下线）')
|
||
except Exception:
|
||
return error('重置失败，请稍后重试', 500)
|
||
|
||
|
||
def _validate_registration_input(username: str, password: str, email: str,
|
||
agree: str) -> str | None:
|
||
"""注册入参四道闸，按序返回第一条错误文案（None = 全部通过）。"""
|
||
from web.auth_state import re_username_ok
|
||
|
||
if agree.strip() != '1':
|
||
return '请先阅读并同意《用户协议》与《隐私政策》'
|
||
if not (3 <= len(username) <= 20 and re_username_ok(username)):
|
||
return '用户名需 3-20 位，仅支持中文、字母、数字、下划线，且不能纯下划线'
|
||
if len(password) < 8 or len(password) > 128:
|
||
return '密码长度需在 8-128 位之间'
|
||
if len(email) > 254:
|
||
return '邮箱格式不正确'
|
||
return None
|
||
|
||
|
||
async def _reject_registration(message: str, *, email: str, code: str, ttl: int,
|
||
username: str = '', ip: str = '',
|
||
log_detail: str | None = None) -> JSONResponse:
|
||
"""注册流程后续步骤失败的统一拒绝：还原已消费的验证码（可选失败日志）。
|
||
|
||
验证码在 check_verify_code 里已被 DELETE 原子消费，凡走到建号/查重/防刷
|
||
之后才失败的路径都必须还原，否则用户被迫重新收码。
|
||
"""
|
||
await asyncio.to_thread(auth.restore_verify_code, email, code, ttl, 'register')
|
||
if log_detail:
|
||
await asyncio.to_thread(auth.add_log, 'fail', username, ip, '注册', log_detail)
|
||
return error(message)
|
||
|
||
|
||
async def _register_credits(device_used: bool) -> int:
|
||
"""注册赠送次数：同设备重复注册账号照建，但不再赠送。"""
|
||
if device_used:
|
||
return 0
|
||
return await _safe_register_credits()
|
||
|
||
|
||
async def _issue_registration_session(user, credits: int, username: str,
|
||
ip: str) -> JSONResponse:
|
||
"""注册成功收尾：login_seq 递增 + 成功日志 + 签发会话 Cookie。"""
|
||
uid = int(user['id'])
|
||
now = int(time.time())
|
||
await db.execute('UPDATE users SET last_active=?, last_login=?, '
|
||
'login_seq=COALESCE(login_seq,0)+1 WHERE id=?', (now, now, uid))
|
||
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, '注册账号',
|
||
f'赠送 {credits} 次' if credits else '未赠送次数')
|
||
secure = os.environ.get('ENABLE_SECURE_COOKIE', '').strip().lower() in ('1', 'true', 'yes')
|
||
return _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',
|
||
}, '注册成功' + (f'，已赠送 {credits} 次下载次数' if credits else ''), uid, seq, secure)
|
||
|
||
|
||
@router.post('/auth/register')
|
||
async def register(request: Request):
|
||
"""注册：入参校验 → 验证码 → 查重/防刷 → 建号 → 会话。
|
||
|
||
五条「建号前失败」路径共用 _reject_registration（还原验证码），
|
||
顺序与历史实现逐条对应：用户名重名 / 邮箱重名 / IP 超限（+日志）/
|
||
建号 IntegrityError / 建号 ValueError（+日志）/ 读回 None（+日志）。
|
||
"""
|
||
data = await _request_data(request)
|
||
username = str(data.get('username') or '').strip()
|
||
password = str(data.get('password') or '')
|
||
email = auth._normalize_email(str(data.get('email') or ''))
|
||
code = str(data.get('code') or '').strip()
|
||
device_id = str(data.get('device_id') or '').strip()[:64]
|
||
ip = ratelimit.client_ip(request)
|
||
|
||
bad_input = _validate_registration_input(
|
||
username, password, email, str(data.get('agree') or ''))
|
||
if bad_input:
|
||
return error(bad_input)
|
||
|
||
try:
|
||
code_ttl = await asyncio.to_thread(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):
|
||
return await _reject_registration('用户名已被注册', **rej)
|
||
if email and await asyncio.to_thread(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):
|
||
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,
|
||
guard=auth.RegistrationGuard(
|
||
device_id=device_id, ip=ip,
|
||
ua=str(request.headers.get('user-agent') or ''),
|
||
ip_limit=3, device_once=True))
|
||
except sqlite3.IntegrityError:
|
||
return await _reject_registration('用户名或邮箱已被注册，请换一个再试', **rej)
|
||
except ValueError as e:
|
||
return await _reject_registration(str(e), username=username, ip=ip,
|
||
log_detail=str(e), **rej)
|
||
|
||
# 建号事务已提交却读不回（并发删除/库损坏）：按注册失败处理
|
||
if user is None:
|
||
return await _reject_registration('注册失败，请稍后重试', username=username,
|
||
ip=ip, log_detail='建号后读取用户失败', **rej)
|
||
|
||
return await _issue_registration_session(user, credits, username, ip)
|
||
except Exception:
|
||
return error('注册失败，请稍后重试', 500)
|