forked from molecule-ai/molecule-core
fix(security): protect global secrets routes with AdminAuth middleware (Cycle 7)
Three unauthenticated routes allowed arbitrary read/write/delete of all global platform secrets (API keys, provider credentials) with zero auth: - GET/PUT/POST /settings/secrets - DELETE /settings/secrets/:key - GET/POST/DELETE /admin/secrets (legacy aliases) Fix: new AdminAuth middleware with same lazy-bootstrap contract as WorkspaceAuth — fail-open when no tokens exist (fresh install / pre-Phase-30 upgrade), enforce once any workspace has a live token. Any valid workspace bearer token grants access (platform-wide scope, no workspace binding needed). Changes: wsauth/tokens.go — HasAnyLiveTokenGlobal + ValidateAnyToken functions wsauth/tokens_test.go — 5 new tests covering both new functions middleware/wsauth_middleware.go — AdminAuth middleware router/router.go — global secrets routes now registered under adminAuth group Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
b308074ccc
commit
fec7ac82d3
@ -49,3 +49,38 @@ func WorkspaceAuth(database *sql.DB) gin.HandlerFunc {
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
// AdminAuth returns a Gin middleware for global/admin routes (e.g.
|
||||
// /settings/secrets, /admin/secrets) that have no per-workspace scope.
|
||||
//
|
||||
// Same lazy-bootstrap contract as WorkspaceAuth: if no live token exists
|
||||
// anywhere on the platform (fresh install / pre-Phase-30 upgrade), requests
|
||||
// are let through so existing deployments keep working. Once any workspace
|
||||
// has a live token every request to these routes MUST present a valid one.
|
||||
//
|
||||
// Any valid workspace bearer token is accepted — the route is not scoped to
|
||||
// a specific workspace so we only verify the token is live and unrevoked.
|
||||
func AdminAuth(database *sql.DB) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
ctx := c.Request.Context()
|
||||
|
||||
hasLive, err := wsauth.HasAnyLiveTokenGlobal(ctx, database)
|
||||
if err != nil {
|
||||
log.Printf("wsauth: AdminAuth: HasAnyLiveTokenGlobal failed: %v", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "auth check failed"})
|
||||
return
|
||||
}
|
||||
if hasLive {
|
||||
tok := wsauth.BearerTokenFromHeader(c.GetHeader("Authorization"))
|
||||
if tok == "" {
|
||||
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "admin auth required"})
|
||||
return
|
||||
}
|
||||
if err := wsauth.ValidateAnyToken(ctx, database, tok); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "invalid admin auth token"})
|
||||
return
|
||||
}
|
||||
}
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
@ -190,17 +190,19 @@ func Setup(hub *ws.Hub, broadcaster *events.Broadcaster, prov *provisioner.Provi
|
||||
wsAuth.GET("/model", sech.GetModel)
|
||||
}
|
||||
|
||||
// Global secrets — /settings/secrets is the canonical path; /admin/secrets kept for backward compat
|
||||
// These are admin-level paths outside the per-workspace auth group.
|
||||
// Global secrets — /settings/secrets is the canonical path; /admin/secrets kept for backward compat.
|
||||
// Fix (Cycle 7): protected by AdminAuth — any valid workspace bearer token grants access.
|
||||
// Fail-open when no tokens exist (fresh install / pre-Phase-30 upgrade).
|
||||
{
|
||||
adminAuth := r.Group("", middleware.AdminAuth(db.DB))
|
||||
sechGlobal := handlers.NewSecretsHandler(wh.RestartByID)
|
||||
r.GET("/settings/secrets", sechGlobal.ListGlobal)
|
||||
r.PUT("/settings/secrets", sechGlobal.SetGlobal)
|
||||
r.POST("/settings/secrets", sechGlobal.SetGlobal)
|
||||
r.DELETE("/settings/secrets/:key", sechGlobal.DeleteGlobal)
|
||||
r.GET("/admin/secrets", sechGlobal.ListGlobal)
|
||||
r.POST("/admin/secrets", sechGlobal.SetGlobal)
|
||||
r.DELETE("/admin/secrets/:key", sechGlobal.DeleteGlobal)
|
||||
adminAuth.GET("/settings/secrets", sechGlobal.ListGlobal)
|
||||
adminAuth.PUT("/settings/secrets", sechGlobal.SetGlobal)
|
||||
adminAuth.POST("/settings/secrets", sechGlobal.SetGlobal)
|
||||
adminAuth.DELETE("/settings/secrets/:key", sechGlobal.DeleteGlobal)
|
||||
adminAuth.GET("/admin/secrets", sechGlobal.ListGlobal)
|
||||
adminAuth.POST("/admin/secrets", sechGlobal.SetGlobal)
|
||||
adminAuth.DELETE("/admin/secrets/:key", sechGlobal.DeleteGlobal)
|
||||
}
|
||||
|
||||
// Terminal — shares Docker client with provisioner
|
||||
|
||||
@ -146,3 +146,42 @@ func BearerTokenFromHeader(h string) string {
|
||||
}
|
||||
return strings.TrimSpace(h[len(prefix):])
|
||||
}
|
||||
|
||||
// HasAnyLiveTokenGlobal reports whether ANY workspace has at least one live
|
||||
// (non-revoked) token on file. Used by AdminAuth to decide whether to enforce
|
||||
// auth on global/admin routes — fresh installs with no tokens fail open.
|
||||
func HasAnyLiveTokenGlobal(ctx context.Context, db *sql.DB) (bool, error) {
|
||||
var n int
|
||||
err := db.QueryRowContext(ctx, `
|
||||
SELECT COUNT(*) FROM workspace_auth_tokens WHERE revoked_at IS NULL
|
||||
`).Scan(&n)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return n > 0, nil
|
||||
}
|
||||
|
||||
// ValidateAnyToken confirms the presented plaintext matches any live workspace
|
||||
// token (not scoped to a specific workspace). Used for admin/global routes
|
||||
// where workspace-scoped auth is not applicable — any authenticated agent may
|
||||
// access platform-wide settings.
|
||||
func ValidateAnyToken(ctx context.Context, db *sql.DB, plaintext string) error {
|
||||
if plaintext == "" {
|
||||
return ErrInvalidToken
|
||||
}
|
||||
hash := sha256.Sum256([]byte(plaintext))
|
||||
|
||||
var tokenID string
|
||||
err := db.QueryRowContext(ctx, `
|
||||
SELECT id FROM workspace_auth_tokens
|
||||
WHERE token_hash = $1 AND revoked_at IS NULL
|
||||
`, hash[:]).Scan(&tokenID)
|
||||
if err != nil {
|
||||
return ErrInvalidToken
|
||||
}
|
||||
|
||||
// Best-effort last_used_at update.
|
||||
_, _ = db.ExecContext(ctx,
|
||||
`UPDATE workspace_auth_tokens SET last_used_at = now() WHERE id = $1`, tokenID)
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -190,3 +190,82 @@ func TestBearerTokenFromHeader(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// HasAnyLiveTokenGlobal
|
||||
// ------------------------------------------------------------
|
||||
|
||||
func TestHasAnyLiveTokenGlobal(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
count int
|
||||
want bool
|
||||
}{
|
||||
{"no tokens anywhere", 0, false},
|
||||
{"one live token", 1, true},
|
||||
{"many live tokens", 5, true},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
db, mock := setupMock(t)
|
||||
mock.ExpectQuery(`SELECT COUNT\(\*\) FROM workspace_auth_tokens`).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(tc.count))
|
||||
|
||||
got, err := HasAnyLiveTokenGlobal(context.Background(), db)
|
||||
if err != nil {
|
||||
t.Fatalf("err: %v", err)
|
||||
}
|
||||
if got != tc.want {
|
||||
t.Errorf("got %v, want %v", got, tc.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// ValidateAnyToken
|
||||
// ------------------------------------------------------------
|
||||
|
||||
func TestValidateAnyToken_HappyPath(t *testing.T) {
|
||||
db, mock := setupMock(t)
|
||||
|
||||
// Issue a token for some workspace.
|
||||
mock.ExpectExec(`INSERT INTO workspace_auth_tokens`).WillReturnResult(sqlmock.NewResult(1, 1))
|
||||
tok, err := IssueToken(context.Background(), db, "ws-admin")
|
||||
if err != nil {
|
||||
t.Fatalf("IssueToken: %v", err)
|
||||
}
|
||||
|
||||
// ValidateAnyToken: lookup by hash only (no workspace binding).
|
||||
mock.ExpectQuery(`SELECT id FROM workspace_auth_tokens`).
|
||||
WithArgs(sqlmock.AnyArg()).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow("tok-id-global"))
|
||||
// Best-effort last_used_at update.
|
||||
mock.ExpectExec(`UPDATE workspace_auth_tokens SET last_used_at`).
|
||||
WithArgs("tok-id-global").
|
||||
WillReturnResult(sqlmock.NewResult(0, 1))
|
||||
|
||||
if err := ValidateAnyToken(context.Background(), db, tok); err != nil {
|
||||
t.Errorf("expected valid token, got error: %v", err)
|
||||
}
|
||||
if err := mock.ExpectationsWereMet(); err != nil {
|
||||
t.Errorf("unmet expectations: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateAnyToken_UnknownTokenRejected(t *testing.T) {
|
||||
db, mock := setupMock(t)
|
||||
mock.ExpectQuery(`SELECT id FROM workspace_auth_tokens`).
|
||||
WillReturnError(sql.ErrNoRows)
|
||||
|
||||
if err := ValidateAnyToken(context.Background(), db, "not-a-real-token"); err != ErrInvalidToken {
|
||||
t.Errorf("got %v, want ErrInvalidToken", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateAnyToken_EmptyTokenRejected(t *testing.T) {
|
||||
db, _ := setupMock(t)
|
||||
if err := ValidateAnyToken(context.Background(), db, ""); err != ErrInvalidToken {
|
||||
t.Errorf("got %v, want ErrInvalidToken", err)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user