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 必填校验
182 lines
5.4 KiB
Go
182 lines
5.4 KiB
Go
package platform
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestNewPKCE(t *testing.T) {
|
|
v, c, err := newPKCE()
|
|
if err != nil {
|
|
t.Fatalf("newPKCE: %v", err)
|
|
}
|
|
if len(v) != 64 {
|
|
t.Errorf("verifier length = %d, want 64", len(v))
|
|
}
|
|
sum := sha256.Sum256([]byte(v))
|
|
want := base64.RawURLEncoding.EncodeToString(sum[:])
|
|
if c != want {
|
|
t.Errorf("challenge = %q, want S256(verifier) = %q", c, want)
|
|
}
|
|
// two calls must differ
|
|
v2, _, _ := newPKCE()
|
|
if v == v2 {
|
|
t.Error("two verifiers collided")
|
|
}
|
|
}
|
|
|
|
// decodeBody reads a JSON request body into a map.
|
|
func decodeBody(t *testing.T, r *http.Request) map[string]string {
|
|
t.Helper()
|
|
var m map[string]string
|
|
if err := json.NewDecoder(r.Body).Decode(&m); err != nil {
|
|
t.Fatalf("decode body: %v", err)
|
|
}
|
|
return m
|
|
}
|
|
|
|
// TestLogin_Success drives the whole broker device-authorization loopback flow with a
|
|
// fake /device/token endpoint and a fake browser — no real network or prod dependency.
|
|
func TestLogin_Success(t *testing.T) {
|
|
var gotBody map[string]string
|
|
brokerSrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path != "/device/token" {
|
|
t.Errorf("token path = %s, want /device/token", r.URL.Path)
|
|
}
|
|
gotBody = decodeBody(t, r)
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_ = json.NewEncoder(w).Encode(map[string]any{
|
|
"id": "sid-1",
|
|
"app": "cdrop",
|
|
"access": "at-123",
|
|
"refresh": "rtk-456",
|
|
"access_expires": time.Now().Add(15 * time.Minute).Unix(),
|
|
})
|
|
}))
|
|
defer brokerSrv.Close()
|
|
|
|
cfg := OAuthConfig{BrokerURL: brokerSrv.URL, App: "cdrop"}
|
|
|
|
// Fake browser: parse the /device/authorize URL, assert it carries app + PKCE,
|
|
// then GET the loopback redirect with a code + the same state (approved).
|
|
openURL := func(authURL string) {
|
|
u, err := url.Parse(authURL)
|
|
if err != nil {
|
|
t.Errorf("parse authURL: %v", err)
|
|
return
|
|
}
|
|
if !strings.HasSuffix(u.Path, "/device/authorize") {
|
|
t.Errorf("authorize path = %s, want /device/authorize", u.Path)
|
|
}
|
|
q := u.Query()
|
|
if q.Get("code_challenge") == "" || q.Get("code_challenge_method") != "S256" {
|
|
t.Errorf("authorize request missing PKCE challenge: %v", q)
|
|
}
|
|
if q.Get("app") != "cdrop" {
|
|
t.Errorf("authorize app = %q", q.Get("app"))
|
|
}
|
|
cb := q.Get("redirect_uri") + "?code=auth-code-xyz&state=" + url.QueryEscape(q.Get("state"))
|
|
resp, err := http.Get(cb)
|
|
if err != nil {
|
|
t.Errorf("callback GET: %v", err)
|
|
return
|
|
}
|
|
_ = resp.Body.Close()
|
|
}
|
|
|
|
tok, err := NewFlow(cfg, openURL).Login(context.Background())
|
|
if err != nil {
|
|
t.Fatalf("Login: %v", err)
|
|
}
|
|
if tok.AccessToken != "at-123" {
|
|
t.Errorf("access = %q, want at-123", tok.AccessToken)
|
|
}
|
|
if tok.RefreshToken != "rtk-456" {
|
|
t.Errorf("refresh = %q, want rtk-456", tok.RefreshToken)
|
|
}
|
|
if tok.ExpiresIn <= 0 || tok.ExpiresIn > 900 {
|
|
t.Errorf("expires_in = %d, want ~900 (derived from access_expires)", tok.ExpiresIn)
|
|
}
|
|
|
|
// The exchange must carry the code, the PKCE verifier, and the same redirect_uri.
|
|
if gotBody["code"] != "auth-code-xyz" {
|
|
t.Errorf("code = %q", gotBody["code"])
|
|
}
|
|
if gotBody["code_verifier"] == "" {
|
|
t.Error("token exchange missing code_verifier")
|
|
}
|
|
if !strings.HasPrefix(gotBody["redirect_uri"], "http://127.0.0.1:") {
|
|
t.Errorf("redirect_uri = %q, want loopback", gotBody["redirect_uri"])
|
|
}
|
|
}
|
|
|
|
func TestLogin_StateMismatch(t *testing.T) {
|
|
cfg := OAuthConfig{BrokerURL: "https://sso.example.net", App: "cdrop"}
|
|
openURL := func(authURL string) {
|
|
u, _ := url.Parse(authURL)
|
|
redirect := u.Query().Get("redirect_uri")
|
|
resp, err := http.Get(redirect + "?code=c&state=WRONG-STATE")
|
|
if err == nil {
|
|
_ = resp.Body.Close()
|
|
}
|
|
}
|
|
_, err := NewFlow(cfg, openURL).Login(context.Background())
|
|
if err == nil || !strings.Contains(err.Error(), "state mismatch") {
|
|
t.Fatalf("want state mismatch error, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestLogin_IncompleteConfig(t *testing.T) {
|
|
_, err := NewFlow(OAuthConfig{App: "only-app"}, func(string) {}).Login(context.Background())
|
|
if err == nil {
|
|
t.Fatal("want error for incomplete config, got nil")
|
|
}
|
|
}
|
|
|
|
func TestRefresh_Success(t *testing.T) {
|
|
var gotBody map[string]string
|
|
brokerSrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path != "/refresh" {
|
|
t.Errorf("refresh path = %s, want /refresh", r.URL.Path)
|
|
}
|
|
gotBody = decodeBody(t, r)
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_ = json.NewEncoder(w).Encode(map[string]any{
|
|
"access": "new-at",
|
|
"refresh": "new-rtk",
|
|
"access_expires": time.Now().Add(15 * time.Minute).Unix(),
|
|
})
|
|
}))
|
|
defer brokerSrv.Close()
|
|
|
|
cfg := OAuthConfig{BrokerURL: brokerSrv.URL, App: "cdrop"}
|
|
tok, err := NewFlow(cfg, func(string) {}).Refresh(context.Background(), "old-rtk")
|
|
if err != nil {
|
|
t.Fatalf("Refresh: %v", err)
|
|
}
|
|
if tok.AccessToken != "new-at" {
|
|
t.Errorf("access = %q, want new-at", tok.AccessToken)
|
|
}
|
|
if tok.RefreshToken != "new-rtk" {
|
|
t.Errorf("refresh = %q, want new-rtk (rotated)", tok.RefreshToken)
|
|
}
|
|
if gotBody["refresh"] != "old-rtk" {
|
|
t.Errorf("sent refresh = %q, want old-rtk", gotBody["refresh"])
|
|
}
|
|
}
|
|
|
|
func TestRefresh_EmptyToken(t *testing.T) {
|
|
cfg := OAuthConfig{BrokerURL: "https://sso.example.net", App: "cdrop"}
|
|
if _, err := NewFlow(cfg, func(string) {}).Refresh(context.Background(), ""); err == nil {
|
|
t.Fatal("want error for empty refresh token")
|
|
}
|
|
}
|