feat(auth): 注册页人机验证 + 邮箱验证码;品牌标识去 DeepSeek(附域名迁移线 序㊿ 补提交)
三条线合并入库 —— 均已完成并上线(源码与生产一致,此前只部署未入仓)。 ⚠️ 其中域名迁移线为**另一会话**产出,本会话只做入库、**未复验其正确性**(它自报零回归)。 【档案 134 · 注册页人机验证 + 邮箱验证码】 - DB 迁移 v10:users.email(唯一索引 LOWER(email))+ email_codes 事件表(2 索引) - 新增模块 src/web/{register-guard,mail,turnstile,email-code}.ts - routes/auth.ts:新增 GET /api/auth/register/config、POST /api/auth/register/email-code; 注册接口加人机验证与验证码校验;config.ts 新增 12 项配置(默认空 ⇒ 不配 = 老行为) - 邮件走**可插拔驱动**(brevo/http/log),发件人 [email protected](Brevo 域名已认证 + DKIM + SPF) - 防爆破:三层配额(邮箱 6/h、8/天;IP 20/h;全局 200/h)+ 递增冷却阶梯 (60→60→180→300→900→1800s)+ 试错 5 次作废 + 码只存哈希 + 单次使用 + 与用户名绑定 - Turnstile 服务端校 **success + action + hostname 三项**:sitekey 是公开的, 只校 success 时"拿我们的 sitekey 在自己站点替真人取合法 token 再打我们接口"这条路是通的 - 新增 test/register-guard.test.mjs(19 用例) 【档案 137 · 品牌标识改造 — 去 DeepSeek 图形】 - login/register/admin 页头:删 DeepSeek 鲸鱼图标 + 「DeepSeek」文字图形 → 平台标识(中文「能力枢纽」/英语及其他语言「CapabilityNet」,走 i18n 词条 brand.name) - portal 顶栏换图标(页面名「管理门户」保留) - 新建 web/favicon.svg(平台自有 hub 图标,避开 DeepSeek 蓝)+ 四页 favicon 指向它 - 新增 test/i18n-brand.test.mjs(node:vm 跑真实 i18n.js,六条语言路径断言渲染结果) - scripts/verify-static.mjs 新增 SVG 段:XML 注释不得含 ASCII 双连字符(否则整份 SVG 解析失败、图标静默不显示 —— 实际踩到过) - 🔴 会话页面(实例内官方 dsh 界面)的标识**按用户要求未动**(也受 R2 约束) 【档案 135/136 · 域名迁移线(另一会话产出)】 - 域名收敛为 ai1net.com;旧域 alotbuy.com 降级为 301 过渡装置 - src/net/relay/{addr-override,directory,rendezvous,switcher}.ts 种子与候选链更新; src/web/server.ts、src/worker/relay-tunnel.ts、scripts/verify-cluster-domain.mjs - 档案 136 = 控制面按两台中继取并集(**已立项、未落地**) 验证(本会话两条线):新增单测 21 条全通过|全量 221 pass / 0 fail / 1 skipped| verify-static 全合格|其余 10 个 verify 脚本全 OK|线上实测:Turnstile 假 token 403、 发码 delivered、四页 deepseek 命中 0、favicon 200。
This commit is contained in:
1 parent
d2ef362a98
commit
971ccc3703
56 files changed
+3498
-193
No files matched your search
+80
-3
@@ -17,6 +17,7 @@ import {
|
||||
toDomain,
|
||||
toDshHost,
|
||||
toDshInstance,
|
||||
toEmailCode,
|
||||
toPublicUser,
|
||||
toSession,
|
||||
toUser,
|
||||
@@ -34,7 +35,10 @@ import {
|
||||
type DshInstance,
|
||||
type DshInstanceRole,
|
||||
type DshInstanceStatus,
|
||||
type EmailCodeCounts,
|
||||
type EmailCodeRow,
|
||||
type PublicUser,
|
||||
type RecordEmailCodeInput,
|
||||
type SessionRow,
|
||||
type SessionUser,
|
||||
type UpsertBusinessPluginInput,
|
||||
@@ -45,7 +49,9 @@ import {
|
||||
type Workspace,
|
||||
} from './types.js'
|
||||
|
||||
const USER_COLS = 'id, username, pass_hash, role, home_dir, api_key_ref, created_at, approved_by, uid'
|
||||
const USER_COLS = 'id, username, pass_hash, role, home_dir, api_key_ref, created_at, approved_by, uid, email'
|
||||
const EMAIL_CODE_COLS =
|
||||
'id, email, purpose, code_hash, status, attempts, ip, username, reason, created_at, expires_at, consumed_at'
|
||||
const DOMAIN_COLS = 'id, user_id, domain, verified, nginx_config, updated_at'
|
||||
const BUSINESS_PLUGIN_COLS = 'id, name, description, version, tgz_path, file_size, uploaded_by, created_at, updated_at'
|
||||
const INSTANCE_COLS =
|
||||
@@ -56,8 +62,8 @@ export function createUser(db: Database, input: CreateUserInput, baseUid: number
|
||||
const createdAt = Date.now()
|
||||
return db.transaction((): User => {
|
||||
const info = prepare(db,
|
||||
'INSERT INTO users (id, username, pass_hash, role, home_dir, created_at) VALUES (?, ?, ?, ?, ?, ?)',
|
||||
).run(input.id, input.username, input.passHash, input.role, input.homeDir, createdAt)
|
||||
'INSERT INTO users (id, username, pass_hash, role, home_dir, email, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)',
|
||||
).run(input.id, input.username, input.passHash, input.role, input.homeDir, input.email ?? null, createdAt)
|
||||
// SQLite's implicit rowid is the per-user incrementing integer; uid = baseUid + it.
|
||||
const uid = baseUid + Number(info.lastInsertRowid)
|
||||
prepare(db, 'UPDATE users SET uid = ? WHERE id = ?').run(uid, input.id)
|
||||
@@ -71,6 +77,7 @@ export function createUser(db: Database, input: CreateUserInput, baseUid: number
|
||||
created_at: createdAt,
|
||||
approved_by: null,
|
||||
uid,
|
||||
email: input.email ?? null,
|
||||
}
|
||||
})()
|
||||
}
|
||||
@@ -86,6 +93,76 @@ export function findUserBySlug(db: Database, slug: string): User | undefined {
|
||||
return row ? toUser(row as Record<string, unknown>) : undefined
|
||||
}
|
||||
|
||||
/** v10:注册邮箱查重(大小写不敏感)。 */
|
||||
export function findUserByEmail(db: Database, email: string): User | undefined {
|
||||
const row = prepare(db, `SELECT ${USER_COLS} FROM users WHERE LOWER(email) = ?`).get(email.toLowerCase())
|
||||
return row ? toUser(row as Record<string, unknown>) : undefined
|
||||
}
|
||||
|
||||
// ── v10 邮箱验证码 ────────────────────────────────────────────────────────────
|
||||
// 全部计数都**现算**(不维护冗余计数器):省掉"计数器与事实不一致"的整类缺陷,
|
||||
// 代价只是一次带索引的 COUNT;量级(每邮箱每小时个位数行)完全够用。
|
||||
|
||||
export function recordEmailCode(db: Database, input: RecordEmailCodeInput): void {
|
||||
prepare(db,
|
||||
`INSERT INTO email_codes (${EMAIL_CODE_COLS}) VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?, NULL)`,
|
||||
).run(
|
||||
input.id,
|
||||
input.email,
|
||||
input.purpose,
|
||||
input.codeHash,
|
||||
input.status,
|
||||
input.ip ?? null,
|
||||
input.username ?? null,
|
||||
input.reason ?? null,
|
||||
input.createdAt,
|
||||
input.expiresAt ?? null,
|
||||
)
|
||||
}
|
||||
|
||||
export function emailCodeCounts(db: Database, email: string, ip: string | null, since: number): EmailCodeCounts {
|
||||
const row = prepare(db, `
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM email_codes WHERE email = ? AND created_at >= ?) AS email_total,
|
||||
(SELECT COUNT(*) FROM email_codes WHERE email = ? AND created_at >= ? AND status = 'sent') AS email_sent,
|
||||
(SELECT COALESCE(MAX(created_at), 0) FROM email_codes WHERE email = ?) AS email_last_at,
|
||||
(SELECT COUNT(*) FROM email_codes WHERE ip IS NOT NULL AND ip = ? AND created_at >= ?) AS ip_total,
|
||||
(SELECT COUNT(*) FROM email_codes WHERE created_at >= ?) AS global_total
|
||||
`).get(email, since, email, since, email, ip, since, since) as Record<string, unknown>
|
||||
return {
|
||||
emailTotal: Number(row.email_total ?? 0),
|
||||
emailSent: Number(row.email_sent ?? 0),
|
||||
emailLastAt: Number(row.email_last_at ?? 0),
|
||||
ipTotal: Number(row.ip_total ?? 0),
|
||||
globalTotal: Number(row.global_total ?? 0),
|
||||
}
|
||||
}
|
||||
|
||||
export function latestSentEmailCode(db: Database, email: string, purpose: string): EmailCodeRow | undefined {
|
||||
const row = prepare(db,
|
||||
`SELECT ${EMAIL_CODE_COLS} FROM email_codes WHERE email = ? AND purpose = ? AND status = 'sent' `
|
||||
+ 'ORDER BY created_at DESC LIMIT 1',
|
||||
).get(email, purpose)
|
||||
return row ? toEmailCode(row as Record<string, unknown>) : undefined
|
||||
}
|
||||
|
||||
export function bumpEmailCodeAttempts(db: Database, id: string, consume: boolean, now: number): boolean {
|
||||
const info = consume
|
||||
? prepare(db, 'UPDATE email_codes SET attempts = attempts + 1, consumed_at = ? WHERE id = ? AND consumed_at IS NULL')
|
||||
.run(now, id)
|
||||
: prepare(db, 'UPDATE email_codes SET attempts = attempts + 1 WHERE id = ? AND consumed_at IS NULL').run(id)
|
||||
return info.changes > 0
|
||||
}
|
||||
|
||||
export function consumeEmailCode(db: Database, id: string, now: number): boolean {
|
||||
const info = prepare(db, 'UPDATE email_codes SET consumed_at = ? WHERE id = ? AND consumed_at IS NULL').run(now, id)
|
||||
return info.changes > 0
|
||||
}
|
||||
|
||||
export function purgeEmailCodes(db: Database, before: number): number {
|
||||
return prepare(db, 'DELETE FROM email_codes WHERE created_at < ?').run(before).changes
|
||||
}
|
||||
|
||||
export function findUserById(db: Database, id: string): User | undefined {
|
||||
const row = prepare(db, `SELECT ${USER_COLS} FROM users WHERE id = ?`).get(id)
|
||||
return row ? toUser(row as Record<string, unknown>) : undefined
|
||||
|
||||
Reference in new issue
Block a user