10cf36ecee
后端(委托 Auth Broker,路径 A): - 删自建鉴权(OIDC exchange / 自签会话 / step-up / shortcut / web_sessions / accounts),cdrop 不再存任何凭证;鉴权中间件改读边缘注入的 X-Auth-Subject/Scope/Meta/Name/Roles 头(dev 旁路保留);Claims 加 Tier() / Guest() - internal/brokerclient:mint / revoke(带 X-Broker-App)/ refresh / ListSessions(R1 列举),直连内网、吊销幂等 统一会话模型“委派设备会话”(Delegated Device Sessions): - 每个客户端(浏览器 / 桌面 / 扫码设备)=一条带 meta(device_id) + label 的 broker 机器会话;Broker 作设备会话唯一注册表(R1 按用户+app 列举 + R2 按 (user,app,meta) 幂等铸造),cdrop 退化为薄覆盖层、不再自存权威会话表 - 新增代铸端点 POST /api/auth/device-session:凭边缘已验明的 X-Auth-Subject 委托 broker 铸 / 轮换设备会话(meta=device_id、按调用方 tier 防越权、sameOrigin CSRF、per-IP 限流);R2 幂等保证同一 device_id 重登原地轮换、不堆重复设备 - 会话列表=R1 权威 + 叠加 type(本地缓存)/ online(Hub presence,按设备名)/ current(meta 匹配本请求 X-Auth-Meta)+ 过滤 meta=""(device-authorize 引导会话残留);devices 表降级为 type/presence 薄缓存(非会话权威),device_id 主键、upsert 按 user 限定 - 吊销按 device_id → 缓存优先 / R1 兜底解析 sid → broker 吊销 + X-Broker-App;扫码登录保留三密钥编排,collect 改委托 broker 铸 + 落缓存行 Web 前端: - 登录走 broker 全局 SSO 代跳(/api/auth/login 302);bootstrap 经 /api/me 注入身份后代铸设备会话(稳定 device_id 存 localStorage、Web Locks 跨 tab 串行防重复铸造);refresh 走 /api/auth/refresh - 设备管理按 device_id;改名=同 device_id 重代铸(R2 原地轮换换 label、不产生重复行);登录页反应式守卫修登录回环 - 去 OIDC PKCE / step-up(删 oauth.callback / stepUp) 桌面客户端(Wails): - loopback PKCE(RFC 8252)改指 broker 设备授权流(/device/authorize + /device/token)拿引导令牌,再代铸出带 meta 的托管设备会话——与浏览器同模型、同管理、同吊销;身份取自代铸响应(修“显示名显示为 UUID”);refresh 保留显示名;稳定 device_id 入桌面配置 iOS 客户端(arch A,原生 SwiftUI + 离屏无头 WebView 引擎 + 原生↔JS 桥): - 引擎 / 文件管理 / 设备管理 / 应用图标 / 本地化(此前实现,随本次落入版本库) - 鉴权=引擎自刷(boot 注入 refresh_token)+ broker 轮换经 sessionRotated 回报原生更新 Keychain;去 cookie 同步;Session 加 refreshToken / deviceId 实时 / 健壮性: - presence 走 Hub union(设备表行 ∪ 表外实时连接,按名去重、live-only 标在线) - Hub 通道 close 一律在写锁内、非阻塞 send 一律在读锁内,消除 close-vs-send 闭通道 send panic(revoke 每次 Kick 后该路径变热) 配置 / 删旧栈: - config 改 broker 接入(CDROP_BROKER_* / CDROP_PUBLIC_URL / 按档 TTL),prod 强校验 broker 配置 + PUBLIC_URL(CSRF Origin 守卫不失效) - 删 auth.go / selftoken.go / shortcut.go / jwks.go + 三表(web_sessions / accounts / shortcut_tokens)及验证链;.env.example / compose.snippet.yaml / Caddyfile.snippet 更新为 broker 模型(人机分流 + 公开端点放行 + X-Auth-Meta 透传) - 测试全重写:QR / 会话含 mock broker(R1 列举 + R2 幂等);hub 加 close-vs-send 并发回归;config 加 prod 必填校验
173 lines
5.2 KiB
Go
173 lines
5.2 KiB
Go
package jwtauth
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"commilitia.net/cdrop/internal/config"
|
|
"commilitia.net/cdrop/internal/db"
|
|
)
|
|
|
|
type fakeDeviceStore struct {
|
|
touched []db.TouchDeviceParams
|
|
}
|
|
|
|
func (f *fakeDeviceStore) TouchDevice(_ context.Context, arg db.TouchDeviceParams) error {
|
|
f.touched = append(f.touched, arg)
|
|
return nil
|
|
}
|
|
|
|
// runMiddleware drives a request through the auth middleware and captures the claims
|
|
// the downstream handler sees (nil if the request was rejected before reaching it).
|
|
func runMiddleware(a *Authenticator, r *http.Request) (*httptest.ResponseRecorder, *Claims) {
|
|
var captured *Claims
|
|
h := a.Middleware(http.HandlerFunc(func(w http.ResponseWriter, rr *http.Request) {
|
|
if c, ok := ClaimsFromContext(rr.Context()); ok {
|
|
captured = c
|
|
}
|
|
w.WriteHeader(http.StatusOK)
|
|
}))
|
|
w := httptest.NewRecorder()
|
|
h.ServeHTTP(w, r)
|
|
return w, captured
|
|
}
|
|
|
|
func TestMiddleware_ProdReadsAuthHeaders(t *testing.T) {
|
|
a := New(&config.Config{AuthMode: "prod"}, &fakeDeviceStore{})
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
r.Header.Set("X-Auth-Subject", "user-1")
|
|
r.Header.Set("X-Auth-Scope", "app:cdrop:guest")
|
|
r.Header.Set("X-Auth-Meta", "dev_abc")
|
|
r.Header.Set("X-Auth-Name", "Alice")
|
|
r.Header.Set("X-Auth-Roles", "admin, user")
|
|
|
|
w, c := runMiddleware(a, r)
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("status: got %d, want 200", w.Code)
|
|
}
|
|
if c == nil {
|
|
t.Fatal("claims missing from context")
|
|
}
|
|
if c.UserID != "user-1" || c.DeviceID != "dev_abc" || c.Name != "Alice" {
|
|
t.Errorf("claims wrong: %+v", c)
|
|
}
|
|
if !c.Guest() {
|
|
t.Error("app:cdrop:guest scope should mark Guest()")
|
|
}
|
|
if len(c.Groups) != 2 || c.Groups[0] != "admin" || c.Groups[1] != "user" {
|
|
t.Errorf("groups: got %v", c.Groups)
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_ProdMissingSubjectRejected(t *testing.T) {
|
|
a := New(&config.Config{AuthMode: "prod"}, &fakeDeviceStore{})
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
w, c := runMiddleware(a, r)
|
|
if w.Code != http.StatusUnauthorized {
|
|
t.Fatalf("no X-Auth-Subject: got %d, want 401", w.Code)
|
|
}
|
|
if c != nil {
|
|
t.Error("handler must not run on rejected request")
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_TouchesManagedDevice(t *testing.T) {
|
|
fs := &fakeDeviceStore{}
|
|
a := New(&config.Config{AuthMode: "prod"}, fs)
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
r.Header.Set("X-Auth-Subject", "user-1")
|
|
r.Header.Set("X-Auth-Scope", "app:cdrop:full")
|
|
r.Header.Set("X-Auth-Meta", "dev_x")
|
|
runMiddleware(a, r)
|
|
if len(fs.touched) != 1 {
|
|
t.Fatalf("touch count: got %d, want 1", len(fs.touched))
|
|
}
|
|
if fs.touched[0].DeviceID != "dev_x" || fs.touched[0].Tier != "full" || fs.touched[0].UserID != "user-1" {
|
|
t.Errorf("touch params: %+v", fs.touched[0])
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_SkipsTouchWhenUnmanaged(t *testing.T) {
|
|
fs := &fakeDeviceStore{}
|
|
a := New(&config.Config{AuthMode: "prod"}, fs)
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
r.Header.Set("X-Auth-Subject", "user-1")
|
|
r.Header.Set("X-Auth-Scope", "full")
|
|
// no X-Auth-Meta → unmanaged caller (e.g. a global SSO browser)
|
|
runMiddleware(a, r)
|
|
if len(fs.touched) != 0 {
|
|
t.Errorf("unmanaged caller should not touch a device row; got %d", len(fs.touched))
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_DevMode(t *testing.T) {
|
|
a := New(&config.Config{AuthMode: "dev", DevToken: "devtok"}, &fakeDeviceStore{})
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
r.Header.Set("Authorization", "Bearer devtok")
|
|
r.Header.Set("X-Dev-User", "dev-alice")
|
|
r.Header.Set("X-Dev-Scope", "guest")
|
|
w, c := runMiddleware(a, r)
|
|
if w.Code != http.StatusOK || c == nil {
|
|
t.Fatalf("dev auth failed: %d", w.Code)
|
|
}
|
|
if c.UserID != "dev-alice" || !c.Guest() {
|
|
t.Errorf("dev claims wrong: %+v", c)
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_DevModeBadToken(t *testing.T) {
|
|
a := New(&config.Config{AuthMode: "dev", DevToken: "devtok"}, &fakeDeviceStore{})
|
|
r := httptest.NewRequest(http.MethodGet, "/api/me", nil)
|
|
r.Header.Set("Authorization", "Bearer wrong")
|
|
w, _ := runMiddleware(a, r)
|
|
if w.Code != http.StatusUnauthorized {
|
|
t.Fatalf("bad dev token: got %d, want 401", w.Code)
|
|
}
|
|
}
|
|
|
|
func TestClaimsTier(t *testing.T) {
|
|
cases := []struct {
|
|
scope string
|
|
tier string
|
|
guest bool
|
|
}{
|
|
{"app:cdrop:guest", "guest", true},
|
|
{"app:cdrop:full", "full", false},
|
|
{"full", "full", false},
|
|
{"app:cdrop", "cdrop", false},
|
|
{"", "", false},
|
|
}
|
|
for _, tc := range cases {
|
|
c := &Claims{Scope: tc.scope}
|
|
if c.Tier() != tc.tier {
|
|
t.Errorf("Tier(%q): got %q, want %q", tc.scope, c.Tier(), tc.tier)
|
|
}
|
|
if c.Guest() != tc.guest {
|
|
t.Errorf("Guest(%q): got %v, want %v", tc.scope, c.Guest(), tc.guest)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSanitizeDeviceName(t *testing.T) {
|
|
if got := SanitizeDeviceName(" Alice's Mac "); got != "Alice's Mac" {
|
|
t.Errorf("trim: got %q", got)
|
|
}
|
|
// Non-ASCII is stripped (the name rides an HTTP header).
|
|
if got := SanitizeDeviceName("名字abc"); got != "abc" {
|
|
t.Errorf("non-ascii strip: got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestNormalizeDeviceType(t *testing.T) {
|
|
for _, in := range []string{"macos", "windows", "linux", "ios", "browser"} {
|
|
if got := normalizeDeviceType(in); got != in {
|
|
t.Errorf("normalizeDeviceType(%q): got %q", in, got)
|
|
}
|
|
}
|
|
if got := normalizeDeviceType("rogue"); got != "browser" {
|
|
t.Errorf("unknown type should fall back to browser; got %q", got)
|
|
}
|
|
}
|