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 必填校验
159 lines
5.4 KiB
Go
159 lines
5.4 KiB
Go
package httpapi
|
|
|
|
import (
|
|
"encoding/json"
|
|
"log/slog"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"commilitia.net/cdrop/internal/brokerclient"
|
|
"commilitia.net/cdrop/internal/db"
|
|
"commilitia.net/cdrop/internal/jwtauth"
|
|
)
|
|
|
|
// 代铸 (proxy-mint). The unified-session-model endpoint that makes every login — browser
|
|
// global-SSO and native device-authorize alike — a cdrop-managed device session, so all
|
|
// clients share one device list and one management surface.
|
|
//
|
|
// The caller has already been verified at the edge (X-Auth-Subject) by either a global-SSO
|
|
// cookie (browser) or a device-authorize bootstrap token (desktop/native). cdrop vouches for
|
|
// that subject and asks the broker (R2: idempotent by user+app+meta) to mint or rotate a
|
|
// device session bound to the client's stable device_id. Re-logins with the same device_id
|
|
// rotate the same session instead of piling up — the same trust model as scan-login collect.
|
|
|
|
type deviceSessionReq struct {
|
|
// DeviceID is the client's stable opaque id (persisted client-side). Empty on first
|
|
// contact — the server then mints one and returns it for the client to persist.
|
|
DeviceID string `json:"device_id"`
|
|
DeviceName string `json:"device_name"`
|
|
DeviceType string `json:"device_type"` // browser | macos | windows | linux | ios
|
|
}
|
|
|
|
type deviceSessionResp struct {
|
|
AccessToken string `json:"access_token"`
|
|
RefreshToken string `json:"refresh_token"`
|
|
ExpiresIn int `json:"expires_in"`
|
|
DeviceID string `json:"device_id"`
|
|
DeviceName string `json:"device_name"`
|
|
// UserID + Name + Avatar are the verified identity (X-Auth-Subject / X-Auth-Name /
|
|
// X-Auth-Avatar). They let a native client — which only ever sees nameless machine
|
|
// tokens — populate its identity with the real display name and picture instead of the
|
|
// subject UUID, without a /api/me round-trip.
|
|
UserID string `json:"user_id"`
|
|
Name string `json:"name"`
|
|
Avatar string `json:"avatar,omitempty"`
|
|
}
|
|
|
|
// handleDeviceSession mints (or idempotently rotates) the caller's cdrop device session.
|
|
func (s *Server) handleDeviceSession(w http.ResponseWriter, r *http.Request) {
|
|
// CSRF: a cookie-authenticated browser fetch carries a matching Origin; a cross-site
|
|
// forgery would not (blocking forged mints that would reintroduce phantom devices). The
|
|
// desktop's Go-initiated call sends no Origin and is allowed.
|
|
if !s.sameOrigin(r) {
|
|
writeJSON(w, http.StatusForbidden, map[string]string{"error": "bad origin"})
|
|
return
|
|
}
|
|
claims, _ := jwtauth.ClaimsFromContext(r.Context())
|
|
|
|
var req deviceSessionReq
|
|
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4096)).Decode(&req); err != nil {
|
|
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid json"})
|
|
return
|
|
}
|
|
|
|
deviceID := strings.TrimSpace(req.DeviceID)
|
|
if deviceID == "" {
|
|
var err error
|
|
if deviceID, err = newDeviceID(); err != nil {
|
|
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "id gen"})
|
|
return
|
|
}
|
|
} else if !validDeviceID(deviceID) {
|
|
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid device_id"})
|
|
return
|
|
}
|
|
|
|
deviceName := jwtauth.SanitizeDeviceName(req.DeviceName)
|
|
if deviceName == "" {
|
|
deviceName = "New device"
|
|
}
|
|
deviceType := qrDeviceType(req.DeviceType)
|
|
|
|
// Mint at the caller's current trust tier: an SSO / device-authorize login is full, a
|
|
// restricted guest stays guest. This stops a borrowed (guest) browser from minting
|
|
// itself a full device session.
|
|
tier := "full"
|
|
if claims.Guest() {
|
|
tier = "guest"
|
|
}
|
|
accessTTL, refreshTTL := s.tierTTLs(tier)
|
|
|
|
sess, err := s.broker.MintSession(r.Context(), brokerclient.MintParams{
|
|
UserID: claims.UserID,
|
|
Tier: tier,
|
|
AccessTTL: accessTTL,
|
|
RefreshTTL: refreshTTL,
|
|
Sliding: true,
|
|
Label: deviceName,
|
|
Meta: deviceID,
|
|
})
|
|
if err != nil {
|
|
slog.Error("device-session mint failed", "err", err, "user", claims.UserID)
|
|
writeJSON(w, http.StatusBadGateway, map[string]string{"error": "mint failed"})
|
|
return
|
|
}
|
|
|
|
now := time.Now().Unix()
|
|
if err := s.queries.CreateDevice(r.Context(), db.CreateDeviceParams{
|
|
DeviceID: deviceID,
|
|
UserID: claims.UserID,
|
|
Name: deviceName,
|
|
Type: deviceType,
|
|
Tier: tier,
|
|
BrokerSid: sess.SID,
|
|
CreatedAt: now,
|
|
LastSeen: now,
|
|
}); err != nil {
|
|
// The session is minted and usable; a failed cache-row write only costs the local
|
|
// type/presence overlay, so proceed rather than strand the device without tokens.
|
|
slog.Error("device-session cache write failed", "err", err, "user", claims.UserID, "device", deviceID)
|
|
}
|
|
|
|
name := claims.Name
|
|
if name == "" {
|
|
name = claims.UserID
|
|
}
|
|
expiresIn := int(sess.AccessExpires - now)
|
|
if expiresIn < 0 {
|
|
expiresIn = 0
|
|
}
|
|
writeJSON(w, http.StatusOK, deviceSessionResp{
|
|
AccessToken: sess.Access,
|
|
RefreshToken: sess.Refresh,
|
|
ExpiresIn: expiresIn,
|
|
DeviceID: deviceID,
|
|
DeviceName: deviceName,
|
|
UserID: claims.UserID,
|
|
Name: name,
|
|
Avatar: claims.Avatar,
|
|
})
|
|
}
|
|
|
|
// validDeviceID accepts a cdrop device_id: the "dev_" prefix plus pure [A-Za-z0-9_-], capped
|
|
// in length. This both recognises cdrop's own ids (newDeviceID) and guarantees the value is
|
|
// control-byte-free, so it is safe to pass to the broker as meta (echoed into X-Auth-Meta).
|
|
func validDeviceID(id string) bool {
|
|
if !strings.HasPrefix(id, "dev_") || len(id) > 128 {
|
|
return false
|
|
}
|
|
for _, c := range id {
|
|
switch {
|
|
case c >= 'a' && c <= 'z', c >= 'A' && c <= 'Z', c >= '0' && c <= '9', c == '_', c == '-':
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|