feat(HEL-560): 数据中枢接管数据源/模型池/会员，注册改一次性邀请码
主站 - 新增 m0006 invite_codes 迁移；注册强制邀请码（首个管理员除外），消码与建号 同一事务，并发提交只有一个能成功 - 新增 /api/hub-admin/* 服务端点（共享 HUB_ADMIN_TOKEN，先于鉴权校验），供数据 中枢桥接读写会话/密码/模型池/会员/邀请码，并提供供应商模型列表拉取 - 前端：注册表单加邀请码（桌面 login、index.html、移动端）；「系统管理」改为 「数据中枢」入口指向 8766，原模型池与会员管理分区移除，仅留「行情管理」； 随之清理陈旧 CSS 数据中枢 - 取消独立账号：删除 hub_admin/hub_sessions 与登录、改密、锁定逻辑，改为校验 主站 xiaobai_session，仅管理员可进，CSRF 由会话派生，危险操作二次确认走主站 - 控制台新增数据源凭证可编辑区（原有内容一项不删）、供应商制模型池（自动拉取 /models，失败退回卡内手动录入）、会员管理与邀请码页 - 日夜双主题：颜色收敛为同名 token 换值，SVG 改用 inline style 以吃到变量 自测 - 主站 verify_baseline 通过（498 项）；数据中枢 235 项通过 - tools/verify_datahub_console.py 端到端跑通两服务真实对话； tools/verify_datahub_console_ui.py 浏览器跑通门禁/凭证/模型池/会员/主题/1030 窄屏 Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
施工员
@@ -1,5 +1,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
import secrets
|
||||
import threading
|
||||
from collections.abc import Callable
|
||||
@@ -82,16 +83,123 @@ class AccountService:
|
||||
MAX_GRANTS_PER_DEVICE = 5
|
||||
SWITCH_REAUTH_MESSAGE = "该账号需重新验证"
|
||||
|
||||
def register(self, username: str, password: str, device_hash: str = "") -> dict[str, Any]:
|
||||
INVITE_ALPHABET = "ACDEFGHJKLMNPQRTUVWXY34679"
|
||||
INVITE_MAX_BATCH = 20
|
||||
INVITE_LIST_LIMIT = 500
|
||||
|
||||
def register(
|
||||
self,
|
||||
username: str,
|
||||
password: str,
|
||||
device_hash: str = "",
|
||||
invite_code: str = "",
|
||||
) -> dict[str, Any]:
|
||||
username = username.strip()
|
||||
self.validate_input(username, password)
|
||||
with self.auth_lock:
|
||||
code = self.checked_invite_code(invite_code)
|
||||
salt, password_digest = hash_password(password)
|
||||
user = self.database.create_user(username, salt, password_digest)
|
||||
user = self.database.create_user(username, salt, password_digest, code)
|
||||
result = self.create_session(user)
|
||||
self.remember_account(device_hash, int(user["id"]), fresh=True)
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
def normalize_invite_code(cls, value: str) -> str:
|
||||
raw = "".join(
|
||||
character
|
||||
for character in str(value or "").upper()
|
||||
if character.isalnum()
|
||||
)
|
||||
if raw.startswith("XB") and len(raw) == 14:
|
||||
body = raw[2:]
|
||||
return f"XB-{body[0:4]}-{body[4:8]}-{body[8:12]}"
|
||||
return raw[:64]
|
||||
|
||||
@staticmethod
|
||||
def mask_invite_code(code: str) -> str:
|
||||
groups = str(code or "").split("-")
|
||||
if len(groups) < 3:
|
||||
return str(code or "")
|
||||
return f"{groups[0]}-{groups[1]}-••••"
|
||||
|
||||
@staticmethod
|
||||
def invite_handle(code: str) -> str:
|
||||
return hashlib.sha256(str(code or "").encode("utf-8")).hexdigest()[:16]
|
||||
|
||||
def checked_invite_code(self, invite_code: str) -> str:
|
||||
if self.database.count_users() == 0:
|
||||
return ""
|
||||
code = self.normalize_invite_code(invite_code)
|
||||
if not code:
|
||||
raise ValueError("请填写邀请码，注册需要管理员发放的一次性邀请码。")
|
||||
record = self.database.invite_code(code)
|
||||
status = str((record or {}).get("status") or "")
|
||||
if not record:
|
||||
raise ValueError("邀请码不存在，请向管理员确认。")
|
||||
if status == "used":
|
||||
raise ValueError("该邀请码已被使用。")
|
||||
if status != "unused":
|
||||
raise ValueError("该邀请码已作废。")
|
||||
return code
|
||||
|
||||
def generate_invite_codes(
|
||||
self, count: int, note: str = "", created_by: int = 0
|
||||
) -> list[dict[str, str]]:
|
||||
try:
|
||||
total = int(count or 1)
|
||||
except (TypeError, ValueError) as exc:
|
||||
raise ValueError("生成数量不正确。") from exc
|
||||
if total < 1 or total > self.INVITE_MAX_BATCH:
|
||||
raise ValueError(f"每次最多生成 {self.INVITE_MAX_BATCH} 个邀请码。")
|
||||
codes: list[str] = []
|
||||
while len(codes) < total:
|
||||
body = "".join(secrets.choice(self.INVITE_ALPHABET) for _ in range(12))
|
||||
code = f"XB-{body[0:4]}-{body[4:8]}-{body[8:12]}"
|
||||
if code in codes or self.database.invite_code(code):
|
||||
continue
|
||||
codes.append(code)
|
||||
self.database.create_invite_codes(codes, str(note or "").strip()[:60], created_by)
|
||||
return [{"code": code, "code_id": self.invite_handle(code)} for code in codes]
|
||||
|
||||
def _stored_invite_code(self, reference: str) -> str:
|
||||
normalized = self.normalize_invite_code(reference)
|
||||
if normalized and self.database.invite_code(normalized):
|
||||
return normalized
|
||||
handle = str(reference or "").strip().lower()
|
||||
for row in self.database.list_invite_codes(self.INVITE_LIST_LIMIT):
|
||||
if self.invite_handle(str(row["code"])) == handle:
|
||||
return str(row["code"])
|
||||
return ""
|
||||
|
||||
def revoke_invite_code(self, reference: str) -> None:
|
||||
code = self._stored_invite_code(reference)
|
||||
record = self.database.invite_code(code) if code else None
|
||||
if not record:
|
||||
raise ValueError("邀请码不存在。")
|
||||
if str(record.get("status")) == "used":
|
||||
raise ValueError("该邀请码已被使用，无法作废。")
|
||||
if not self.database.revoke_invite_code(code):
|
||||
raise ValueError("该邀请码已作废。")
|
||||
|
||||
def invite_overview(self, limit: int = 100) -> dict[str, Any]:
|
||||
codes = []
|
||||
for row in self.database.list_invite_codes(limit):
|
||||
code = str(row["code"])
|
||||
codes.append(
|
||||
{
|
||||
"code_id": self.invite_handle(code),
|
||||
"code_masked": self.mask_invite_code(code),
|
||||
"status": str(row["status"]),
|
||||
"note": str(row.get("note") or ""),
|
||||
"created_at": str(row.get("created_at") or ""),
|
||||
"used_at": str(row.get("used_at") or ""),
|
||||
"revoked_at": str(row.get("revoked_at") or ""),
|
||||
"used_by_username": str(row.get("used_by_username") or ""),
|
||||
}
|
||||
)
|
||||
return {"summary": self.database.count_invite_codes(), "codes": codes}
|
||||
|
||||
def login(self, username: str, password: str, device_hash: str = "") -> dict[str, Any]:
|
||||
username = username.strip()
|
||||
if not username or not password:
|
||||
|
||||
Reference in New Issue
Block a user