018a77b13a
接续 90a3790(扫码 A0+A1+B + step-up 雏形)。蓝本见 AUTH.md。
OIDC 统一到 cdrop 自签 token
- /auth/exchange 先 JWKS 验 id_token 签名(自签 token 的唯一信任锚)再签 cdrop
自签 HS256 access token(绑 sid),不再把 IdP RS256 下发浏览器;验签失败仅告警
并回退 RS256(会话仍建、下次 refresh 自愈),登录不中断
- /auth/refresh oidc 路径仍打 IdP 轮换 refresh_token + 探测 IdP 侧吊销,但同样回
自签 token;createWebSession 改返回行 id
- verify 链保留 RS256 分支仅供桌面端 loopback(其即时吊销留后续)
吊销即时生效 + 被吊销设备自知回退
- verifySelfToken 每请求按 sid 查 web_sessions 行,行删即拒 → 吊销在被吊销设备
下一次请求即生效(不等 TTL),oidc / self / guest 一致
- 前端仅在「服务端以 401 确证会话失效」时 forceLogout 清登录态、回登录页;短期连接
失败(5xx / 网络)一律保留登录态(refreshTokens 改三态 refreshed/invalid/transient,
cookieRefresh 改 discriminated 结果)
- __root 反应式守卫:prod 下失登录态且非认证路由即跳登录页;新增 auth.sessionLost.* 三语
设备列表并入会话列表 + 孤儿自动清除
- GET /api/auth/sessions 统一 web_sessions 与原生客户端设备(桌面 / iOS,自 devices
登记表呈现,native=true,离线也列);同名不重复列出,排除 shortcut 与无会话 browser
- 吊销网页会话连带删其设备登记(无同名在用会话时);原生「登出」走
DELETE /api/devices/{name}(同要求 step-up)
- 新增 DeleteOrphanBrowserDevices(browser 型且无存活 web_session),接入设备清扫器(1h)
应用内扫码 + 聚珍崩溃 / CJK 禁则修复
- 登录页内置 getUserMedia + jsqr 扫码,不再外跳系统应用(避免开错浏览器)
- 修聚珍(cjk-autospace)MutationObserver 与 React 重渲染同子树冲突致的 insertBefore
崩溃:扫码 / 显码 / 批准三状态机页整页跳过聚珍(data-jz-skip)
- 修流动正文未跑 CJK 禁则(jinze 为段落级、须 opt-in):设置 / 快捷指令 / 桌面页一批
hint 补 data-jz-level="paragraph" + justify,短标签 / 状态仍留文本级
step-up 完善
- auth_time 改可选(Casdoor 不下发,原强制致死循环);stepped_up_at 按会话绑定、
StepUpMaxAgeSeconds 窗口内不复要求;新增 POST /api/auth/stepup
- 批准页 persist 编进 step-up returnTo 防整页跳转丢失;scope 随档绑定(信任=full /
仅此次=guest),默认偏安全的「仅此次」
文档与测试
- AUTH.md:折中架构、accounts 薄表、令牌架构、扫码流程、step-up、§4.4 统一会话列表
- 新增 Go 测试:OIDC 自签验证、verifySelfToken 吊销即拒、会话吊销连带删设备、
统一会话列表(含原生 / 不含 shortcut / 不重复)、孤儿清扫、删设备需 step-up
123 lines
4.0 KiB
Go
123 lines
4.0 KiB
Go
package db
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
_ "embed"
|
|
"fmt"
|
|
"net/url"
|
|
|
|
_ "modernc.org/sqlite"
|
|
)
|
|
|
|
//go:embed migrations/0001_init.sql
|
|
var initSchema string
|
|
|
|
// Open dials a sqlite db with WAL + busy timeout pragmas wired in.
|
|
// dbPath is the on-disk file path; passing ":memory:" works for tests.
|
|
func Open(dbPath string) (*sql.DB, error) {
|
|
dsn := buildDSN(dbPath)
|
|
d, err := sql.Open("sqlite", dsn)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("open sqlite: %w", err)
|
|
}
|
|
if err := d.PingContext(context.Background()); err != nil {
|
|
_ = d.Close()
|
|
return nil, fmt.Errorf("ping sqlite: %w", err)
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
func buildDSN(dbPath string) string {
|
|
q := url.Values{}
|
|
q.Add("_pragma", "journal_mode(WAL)")
|
|
q.Add("_pragma", "busy_timeout(5000)")
|
|
q.Add("_pragma", "foreign_keys(1)")
|
|
return dbPath + "?" + q.Encode()
|
|
}
|
|
|
|
// Bootstrap runs the embedded init schema in a single transaction.
|
|
// Idempotent: every CREATE TABLE uses IF NOT EXISTS.
|
|
func Bootstrap(ctx context.Context, d *sql.DB) error {
|
|
tx, err := d.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("begin bootstrap tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
if _, err := tx.ExecContext(ctx, initSchema); err != nil {
|
|
return fmt.Errorf("exec init schema: %w", err)
|
|
}
|
|
// Additive migration for DBs created before clipboard_state.version existed:
|
|
// CREATE TABLE IF NOT EXISTS won't add the column to an existing table, and
|
|
// SQLite has no ADD COLUMN IF NOT EXISTS, so guard it with a pragma check.
|
|
if err := ensureColumn(ctx, tx, "clipboard_state", "version",
|
|
"ALTER TABLE clipboard_state ADD COLUMN version INTEGER NOT NULL DEFAULT 0"); err != nil {
|
|
return fmt.Errorf("migrate clipboard_state.version: %w", err)
|
|
}
|
|
if err := ensureColumn(ctx, tx, "clipboard_state", "origin_ts",
|
|
"ALTER TABLE clipboard_state ADD COLUMN origin_ts INTEGER NOT NULL DEFAULT 0"); err != nil {
|
|
return fmt.Errorf("migrate clipboard_state.origin_ts: %w", err)
|
|
}
|
|
// web_sessions gained kind/scope/granted_by for cdrop self-signed sessions
|
|
// (AUTH.md §2.2). Existing rows predate these columns; backfill them so a
|
|
// pre-existing browser session keeps behaving as a normal IdP-backed login.
|
|
if err := ensureColumn(ctx, tx, "web_sessions", "kind",
|
|
"ALTER TABLE web_sessions ADD COLUMN kind TEXT NOT NULL DEFAULT 'oidc'"); err != nil {
|
|
return fmt.Errorf("migrate web_sessions.kind: %w", err)
|
|
}
|
|
if err := ensureColumn(ctx, tx, "web_sessions", "scope",
|
|
"ALTER TABLE web_sessions ADD COLUMN scope TEXT NOT NULL DEFAULT 'full'"); err != nil {
|
|
return fmt.Errorf("migrate web_sessions.scope: %w", err)
|
|
}
|
|
if err := ensureColumn(ctx, tx, "web_sessions", "granted_by",
|
|
"ALTER TABLE web_sessions ADD COLUMN granted_by TEXT NOT NULL DEFAULT ''"); err != nil {
|
|
return fmt.Errorf("migrate web_sessions.granted_by: %w", err)
|
|
}
|
|
if err := ensureColumn(ctx, tx, "web_sessions", "stepped_up_at",
|
|
"ALTER TABLE web_sessions ADD COLUMN stepped_up_at INTEGER NOT NULL DEFAULT 0"); err != nil {
|
|
return fmt.Errorf("migrate web_sessions.stepped_up_at: %w", err)
|
|
}
|
|
if err := tx.Commit(); err != nil {
|
|
return fmt.Errorf("commit bootstrap: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ensureColumn runs addSQL only when table lacks the named column — an idempotent
|
|
// additive migration for already-created tables.
|
|
func ensureColumn(ctx context.Context, tx *sql.Tx, table, column, addSQL string) error {
|
|
has, err := columnExists(ctx, tx, table, column)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if has {
|
|
return nil
|
|
}
|
|
_, err = tx.ExecContext(ctx, addSQL)
|
|
return err
|
|
}
|
|
|
|
func columnExists(ctx context.Context, tx *sql.Tx, table, column string) (bool, error) {
|
|
// table is a trusted compile-time constant, not user input.
|
|
rows, err := tx.QueryContext(ctx, "PRAGMA table_info("+table+")")
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
defer rows.Close()
|
|
for rows.Next() {
|
|
var (
|
|
cid, notnull, pk int
|
|
name, ctype string
|
|
dflt sql.NullString
|
|
)
|
|
if err := rows.Scan(&cid, &name, &ctype, ¬null, &dflt, &pk); err != nil {
|
|
return false, err
|
|
}
|
|
if name == column {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, rows.Err()
|
|
}
|