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 必填校验
266 lines
9.6 KiB
Go
266 lines
9.6 KiB
Go
package httpapi
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"log/slog"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/go-chi/chi/v5/middleware"
|
|
"github.com/go-chi/httprate"
|
|
|
|
"commilitia.net/cdrop/internal/brokerclient"
|
|
"commilitia.net/cdrop/internal/calls"
|
|
"commilitia.net/cdrop/internal/clipboard"
|
|
"commilitia.net/cdrop/internal/config"
|
|
"commilitia.net/cdrop/internal/db"
|
|
"commilitia.net/cdrop/internal/hub"
|
|
"commilitia.net/cdrop/internal/jwtauth"
|
|
"commilitia.net/cdrop/internal/push"
|
|
"commilitia.net/cdrop/internal/relay"
|
|
"commilitia.net/cdrop/internal/transfer"
|
|
"commilitia.net/cdrop/internal/webui"
|
|
)
|
|
|
|
type Server struct {
|
|
cfg *config.Config
|
|
db *sql.DB
|
|
queries *db.Queries
|
|
auth *jwtauth.Authenticator
|
|
hub *hub.Hub
|
|
transfers *transfer.Service
|
|
relay *relay.Manager
|
|
calls *calls.Provider // optional; nil → STUN-only fallback
|
|
clipboard *clipboard.Service // optional; nil → 503 on /api/clipboard
|
|
push *push.Sender // inert when VAPID keys unset → push endpoints 503
|
|
mux *chi.Mux
|
|
|
|
// broker delegates session lifecycle to the Auth Broker (mint / revoke / refresh).
|
|
broker *brokerclient.Client
|
|
// siteOrigin is the deployment's scheme://host, used for the CSRF Origin check
|
|
// and the scan-login QR link.
|
|
siteOrigin string
|
|
}
|
|
|
|
func New(
|
|
cfg *config.Config,
|
|
dbConn *sql.DB,
|
|
queries *db.Queries,
|
|
auth *jwtauth.Authenticator,
|
|
h *hub.Hub,
|
|
transfers *transfer.Service,
|
|
rm *relay.Manager,
|
|
cp *calls.Provider,
|
|
clip *clipboard.Service,
|
|
pushSender *push.Sender,
|
|
) *Server {
|
|
s := &Server{
|
|
cfg: cfg,
|
|
db: dbConn,
|
|
queries: queries,
|
|
auth: auth,
|
|
hub: h,
|
|
transfers: transfers,
|
|
relay: rm,
|
|
calls: cp,
|
|
clipboard: clip,
|
|
push: pushSender,
|
|
mux: chi.NewRouter(),
|
|
|
|
broker: brokerclient.New(cfg.BrokerBaseURL, cfg.BrokerInternalKey, cfg.BrokerAppOrDefault()),
|
|
siteOrigin: deriveSiteOrigin(cfg.PublicURL),
|
|
}
|
|
s.routes()
|
|
return s
|
|
}
|
|
|
|
func (s *Server) Handler() http.Handler { return s.mux }
|
|
|
|
func (s *Server) routes() {
|
|
s.mux.Use(middleware.RequestID)
|
|
s.mux.Use(middleware.RealIP)
|
|
s.mux.Use(middleware.Recoverer)
|
|
|
|
s.mux.Get("/healthz", s.handleHealth)
|
|
|
|
// Anything not matched below falls through to the embedded frontend bundle.
|
|
// In Docker the binary serves the SPA itself; in local dev the embed FS is
|
|
// empty and this 404s — vite dev on :5173 handles the UI instead.
|
|
s.mux.NotFound(webui.Handler().ServeHTTP)
|
|
|
|
s.mux.Route("/api", func(r chi.Router) {
|
|
// Public navigation: 302 to the broker's global-SSO login (bootstraps login).
|
|
r.Get("/auth/login", s.handleAuthLogin)
|
|
// Public: broker coordinates for native clients' device-authorization flow.
|
|
r.Get("/auth/config", s.handleAuthConfig)
|
|
|
|
// Public, rate-limited (per-IP; RealIP is mounted above). No bearer: the new
|
|
// device isn't logged in yet (its poll_secret is the only credential), and
|
|
// refresh runs precisely when the access token is expired. 60/min is ample
|
|
// for real use behind a shared NAT while choking a scripted flood.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(httprate.LimitByIP(60, time.Minute))
|
|
// Token refresh — proxied to the Auth Broker, so the SPA stays same-origin
|
|
// and cdrop stores no credential (it just relays the rotated pair).
|
|
r.Post("/auth/refresh", s.handleAuthRefresh)
|
|
// Scan-login: the new device opens a request and long-polls status. The
|
|
// private poll_secret in the X-Poll-Secret header is the only credential.
|
|
r.Post("/auth/qr/start", s.handleQRStart)
|
|
r.Get("/auth/qr/status", s.handleQRStatus)
|
|
})
|
|
|
|
// Authenticated routes. Every request past here carries the broker's
|
|
// edge-injected X-Auth-* identity (prod) or a dev token. Guests and full
|
|
// sessions both reach this tier. gzip / compress is intentionally NOT mounted —
|
|
// it would buffer the SSE stream.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(s.auth.Middleware)
|
|
|
|
// Clipboard, transfer, messaging, presence, push — guests included.
|
|
r.Get("/clipboard", s.handleClipboardGet)
|
|
r.Put("/clipboard", s.handleClipboardPut)
|
|
// Lightweight version probe — no content; lets pollers detect change
|
|
// cheaply before fetching the full body.
|
|
r.Get("/clipboard/version", s.handleClipboardVersion)
|
|
|
|
r.Get("/me", s.handleMe)
|
|
r.Post("/me/disconnect", s.handleDisconnect)
|
|
// 代铸: turn an edge-verified login (SSO cookie or device-authorize bootstrap)
|
|
// into a cdrop-managed device session bound to a stable device_id, so browser
|
|
// and native clients share one device list. Authenticated but not full-only —
|
|
// it mints at the caller's own tier. Rate-limited per IP: with R2 idempotency a
|
|
// normal client mints about once per login, so a generous cap simply bounds an
|
|
// authenticated identity that loops fresh device_ids to mint unbounded sessions.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(httprate.LimitByIP(20, time.Minute))
|
|
r.Post("/auth/device-session", s.handleDeviceSession)
|
|
})
|
|
// Logout revokes the calling device's own broker session (self-service).
|
|
r.Post("/auth/logout", s.handleLogout)
|
|
r.Get("/hub/events", s.handleEvents)
|
|
r.Post("/hub/signal", s.handleSignal)
|
|
r.Post("/message", s.handleMessage)
|
|
r.Get("/devices", s.handleDevices)
|
|
r.Get("/push/vapid-key", s.handlePushVAPIDKey)
|
|
r.Post("/push/subscribe", s.handlePushSubscribe)
|
|
r.Delete("/push/subscribe", s.handlePushUnsubscribe)
|
|
r.Get("/calls/credentials", s.handleCallsCredentials)
|
|
|
|
// Full sessions only — restricted guests (scan-login borrows) are
|
|
// rejected: they transfer files but can't manage devices, approve other
|
|
// devices, or revoke sessions.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(requireFullSession)
|
|
r.Delete("/devices/{device_id}", s.handleDeleteDevice)
|
|
r.Patch("/devices/{device_id}", s.handleRenameDevice)
|
|
// Scan-login approval side: the logged-in approver views and authorises
|
|
// the new device. Guests can't reach here, so a borrowed device can't
|
|
// approve further devices.
|
|
r.Get("/auth/qr/request", s.handleQRRequest)
|
|
r.Post("/auth/qr/approve", s.handleQRApprove)
|
|
r.Post("/auth/qr/deny", s.handleQRDeny)
|
|
// Session management: list logged-in devices with their permission
|
|
// level and revoke one (logout that device).
|
|
r.Get("/auth/sessions", s.handleSessionsList)
|
|
r.Delete("/auth/sessions/{id}", s.handleSessionRevoke)
|
|
})
|
|
|
|
r.Route("/transfer", func(r chi.Router) {
|
|
r.Post("/initiate", s.handleTransferInit)
|
|
r.Post("/{id}/accept", s.transitionHandler(transfer.StateAccepted, ""))
|
|
r.Post("/{id}/cancel", s.transitionHandler(transfer.StateCancelled, ""))
|
|
r.Post("/{id}/p2p", s.transitionHandler(transfer.StateP2PActive, transfer.ModeP2P))
|
|
r.Post("/{id}/fallback", s.transitionHandler(transfer.StateRelayActive, transfer.ModeRelay))
|
|
r.Post("/{id}/done", s.transitionHandler(transfer.StateDone, ""))
|
|
r.Post("/{id}/fail", s.transitionHandler(transfer.StateFailed, ""))
|
|
})
|
|
r.Route("/relay/{id}", func(r chi.Router) {
|
|
r.Post("/chunk", s.handleRelayChunk)
|
|
r.Get("/stream", s.handleRelayStream)
|
|
})
|
|
})
|
|
})
|
|
}
|
|
|
|
type healthResp struct {
|
|
Status string `json:"status"`
|
|
AuthMode string `json:"auth_mode"`
|
|
DBOK bool `json:"db_ok"`
|
|
}
|
|
|
|
func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
|
|
ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
|
|
defer cancel()
|
|
|
|
resp := healthResp{Status: "ok", AuthMode: s.cfg.AuthMode, DBOK: true}
|
|
if err := s.db.PingContext(ctx); err != nil {
|
|
resp.Status = "degraded"
|
|
resp.DBOK = false
|
|
slog.Error("healthz db ping failed", "err", err)
|
|
}
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|
|
|
|
type meResp struct {
|
|
UserID string `json:"user_id"`
|
|
// Name is the display name from the broker (X-Auth-Name); falls back to user_id.
|
|
Name string `json:"name"`
|
|
// Avatar is the broker account's picture URL (X-Auth-Avatar); empty when none.
|
|
Avatar string `json:"avatar,omitempty"`
|
|
Groups []string `json:"groups"`
|
|
DeviceName string `json:"device_name"`
|
|
// Scope is the session's capability level: "guest" (scan-login borrow,
|
|
// capability-limited) or "full" (normal login). The UI hides account-management
|
|
// affordances on guest sessions.
|
|
Scope string `json:"scope"`
|
|
}
|
|
|
|
func (s *Server) handleMe(w http.ResponseWriter, r *http.Request) {
|
|
claims, ok := jwtauth.ClaimsFromContext(r.Context())
|
|
if !ok {
|
|
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "claims missing"})
|
|
return
|
|
}
|
|
device, _ := jwtauth.DeviceNameFromContext(r.Context())
|
|
scope := "full"
|
|
if claims.Guest() {
|
|
scope = "guest"
|
|
}
|
|
name := claims.Name
|
|
if name == "" {
|
|
name = claims.UserID
|
|
}
|
|
writeJSON(w, http.StatusOK, meResp{
|
|
UserID: claims.UserID,
|
|
Name: name,
|
|
Avatar: claims.Avatar,
|
|
Groups: claims.Groups,
|
|
DeviceName: device,
|
|
Scope: scope,
|
|
})
|
|
}
|
|
|
|
// handleDisconnect 是用户主动告知"本机要下线"的轻量信号(登出 / 关页前)。
|
|
// auth 中间件会先 UPSERT device 把 last_seen 更新,本 handler 再 Kick 关闭
|
|
// SSE + 立刻广播 presence,让对端不必等 30s 宽限期就看到本设备离线。
|
|
func (s *Server) handleDisconnect(w http.ResponseWriter, r *http.Request) {
|
|
claims, _ := jwtauth.ClaimsFromContext(r.Context())
|
|
deviceName, _ := jwtauth.DeviceNameFromContext(r.Context())
|
|
if deviceName == "" {
|
|
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "missing device"})
|
|
return
|
|
}
|
|
s.hub.Kick(claims.UserID, deviceName)
|
|
s.hub.PublishPresence(r.Context(), claims.UserID)
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
|
|
func writeJSON(w http.ResponseWriter, status int, v any) {
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.WriteHeader(status)
|
|
_ = json.NewEncoder(w).Encode(v)
|
|
}
|