1d154bd627
ci-pangolin / Redline Scan — 脱敏 (UI 文案) (push) Successful in 25s
ci-pangolin / Cleartext Scan — Android 禁明文 (push) Successful in 20s
ci-pangolin / Lint — shellcheck (push) Successful in 51s
ci-pangolin / Portable SQL — 可移植性 (mysql/sqlite) (push) Successful in 23s
ci-pangolin / OpenAPI Sync Check (push) Successful in 1m10s
ci-pangolin / Flutter — analyze + test (push) Successful in 3m44s
ci-pangolin / Codegen Drift — token 生成物未漂移 (push) Successful in 1m7s
ci-pangolin / DS-flow — 原型/跨端同源/代码色单源闸 (push) Successful in 24s
ci-pangolin / Go — build + test (push) Failing after 1m0s
ci-pangolin / E2E Smoke — L4 进程级端到端 (push) Failing after 40s
ci-pangolin / Go — integration (mysql/redis testcontainers) (push) Failing after 6m9s
ci-pangolin / Golden — 视觉回归 (全量:components/auth/desktop/tablet) (push) Successful in 42s
常用设备(已在 mTLS 白名单内)每次都要输 TOTP + 30 分钟就掉线,体验差。 新增登录页「记住此设备」勾选: - 勾选并成功登录(需完整 密码+TOTP)后,签发 30 天设备信任令牌(HttpOnly/ Secure/SameSite=Strict cookie,Redis 存储绑定 admin ID),并把会话延到 30 天 (持久 cookie + 服务端 TTL,滑动续期按会话自身 TTL)。 - 之后该设备重登只需 用户名+密码,**跳过 TOTP**;会话在有效期内保持登录。 安全不变量(均有测试覆盖): - 密码永远必验——即便持有效信任令牌,密码错一律拒(只跳过第二因子,不跳过密码); - 信任令牌绑定 admin,alice 的令牌不能给 bob 免 TOTP; - 无令牌 + 空 TOTP 一律拒(未记住设备仍强制二次验证); - 令牌过期/Redis 清空/未知令牌全部 fail-closed 回退到「要 TOTP」; - TrustedDeviceTTL=0 关闭整功能(勾选无效)。 实现:新增 TrustedStore(Redis, trusted.go);Authenticator.LoginDevice (旧 Login 保持签名,委托新方法,零行为变化);SessionStore.CreateWithTTL + Session.TTLSeconds 支持持久会话按自身 TTL 滑动;handler 读 cookie/勾选、 按 Persistent 设长短会话 cookie、下发信任 cookie;登录页加勾选、TOTP 去 required。配置项 ADMIN_TRUSTED_DEVICE_TTL(默认 720h)。 测试:trusted_test(签发/校验/绑定/吊销/过期/禁用)、login_device_test (跳过TOTP/仍需密码/绑定admin/无令牌需TOTP)、login_device_handler_test (端到端 勾选→双cookie→凭信任cookie免TOTP、无信任空TOTP 401); go test ./internal/admin 全绿,go vet 净。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01P9G7E3wmAYL9KeYCVZVsqu
75 lines
2.3 KiB
Go
75 lines
2.3 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/redis/go-redis/v9"
|
|
)
|
|
|
|
// TrustedDeviceCookieName is the cookie holding a device-trust token.
|
|
const TrustedDeviceCookieName = "admin_trusted"
|
|
|
|
// trustedKeyPrefix namespaces device-trust tokens in Redis.
|
|
const trustedKeyPrefix = "admin:trusted:"
|
|
|
|
// TrustedStore records "记住此设备" device-trust tokens in Redis.
|
|
//
|
|
// A trusted token lets a device SKIP THE TOTP SECOND FACTOR on re-login
|
|
// (password is still always required). Each token is opaque (32 bytes of
|
|
// entropy), bound to one admin id, and expires after ttl — so a flushed
|
|
// Redis, an expired token, or a mismatched admin all fail closed to
|
|
// "TOTP required".
|
|
type TrustedStore struct {
|
|
rdb *redis.Client
|
|
ttl time.Duration
|
|
}
|
|
|
|
// NewTrustedStore wires a TrustedStore. A ttl <= 0 disables the feature:
|
|
// Issue returns an empty token and Check always returns false.
|
|
func NewTrustedStore(rdb *redis.Client, ttl time.Duration) *TrustedStore {
|
|
return &TrustedStore{rdb: rdb, ttl: ttl}
|
|
}
|
|
|
|
// Enabled reports whether device-trust is active.
|
|
func (s *TrustedStore) Enabled() bool { return s != nil && s.rdb != nil && s.ttl > 0 }
|
|
|
|
// Issue mints a new trust token bound to adminID and stores it with the TTL.
|
|
// Returns "" (no error) when the feature is disabled.
|
|
func (s *TrustedStore) Issue(ctx context.Context, adminID int64) (string, error) {
|
|
if !s.Enabled() {
|
|
return "", nil
|
|
}
|
|
tok, err := randToken(32)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if err := s.rdb.Set(ctx, trustedKeyPrefix+tok, strconv.FormatInt(adminID, 10), s.ttl).Err(); err != nil {
|
|
return "", err
|
|
}
|
|
return tok, nil
|
|
}
|
|
|
|
// Check reports whether tok is a live trust token bound to adminID.
|
|
// Any miss (disabled, empty, unknown, expired, wrong admin) returns false.
|
|
func (s *TrustedStore) Check(ctx context.Context, tok string, adminID int64) bool {
|
|
if !s.Enabled() || tok == "" {
|
|
return false
|
|
}
|
|
v, err := s.rdb.Get(ctx, trustedKeyPrefix+tok).Result()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return v == strconv.FormatInt(adminID, 10)
|
|
}
|
|
|
|
// Revoke deletes a trust token (e.g. on explicit logout-all). A no-op when
|
|
// disabled or empty.
|
|
func (s *TrustedStore) Revoke(ctx context.Context, tok string) error {
|
|
if !s.Enabled() || tok == "" {
|
|
return nil
|
|
}
|
|
return s.rdb.Del(ctx, trustedKeyPrefix+tok).Err()
|
|
}
|