Build the tenant-picker backend protocol (no frontend yet, by design)

A multi-membership identity (belongs to more than one tenant) used to
get a flat 501 refusal -- named as undesigned future work across
CLAUDE.md/threat-model.md/the runbook since early Phase 4. Scope for
this change was agreed via AskUserQuestion: backend protocol only,
fully verified via real HTTP round trips, not the actual picker page --
web has zero session/cookie-handling code today (confirmed while
researching this), so building that is separately-scoped, unverifiable
frontend work in this environment (no live backend, no browser).

session.Manager gains IssuePendingLogin/ValidatePendingLogin, a second
JWT token type proving identity without committing to a tenant yet
(10-minute TTL). PendingLoginClaims is deliberately a distinct Go type
from Claims, and -- caught by this change's own test suite before it
shipped -- needed a JSON field name disjoint from Claims.UserID's
"user_id" too: go-jose's unmarshal is happy to populate a struct from
any token whose claims happen to share a key, so a real session token
would otherwise have parsed successfully as a pending login. Fixed via
"pending_user_id" instead; both directions (session-as-pending,
pending-as-session) now have regression tests.

rbacstore.ListMembershipsWithTenantForUser joins tenant_memberships
with tenants, since a picker needs display names, not just IDs.

loginhandler.resolveIdentity's multiple-membership branch no longer
errors -- finishLogin routes it into startTenantSelection instead,
which issues a pending-login cookie (Path=/auth, so it's never sent on
ordinary requests) and redirects to a new configurable
SelectTenantRedirectURL (defaults to {POST_LOGIN_REDIRECT_URL}/select-
tenant). Two new routes complete the round trip: GET /auth/memberships
lists the pending identity's real tenant options, and POST
/auth/select-tenant re-derives the role for the chosen tenant
server-side (never trusts a client-supplied role, refuses a tenant_id
outside the identity's actual memberships with 403) before issuing the
real session -- responding with JSON {"redirect_url": ...}, not a
redirect, since a POST/fetch caller should control its own navigation.

Verified with the same real-fake-IdP tests the rest of this package
uses (coreos/go-oidc's oidctest, crewjam/saml's samlidp): the full
login -> pending cookie -> GET /auth/memberships -> POST
/auth/select-tenant -> real session round trip for both protocols, plus
negative paths (missing/expired pending cookie, a tenant_id outside
membership, a real session token rejected as a pending login and vice
versa). ErrMultipleMemberships is removed -- it's not an error path
anymore.

Docs updated in lockstep: CLAUDE.md, threat-model.md (including its
summary table), phase-4-runbook.md (new §12), enterprise/README.md
(new "Tenant selection" section, explicit about what's still not built
and why: no session handling in web, no CORS on enterprise-auth).
This commit is contained in:
2026-08-14 14:04:37 -07:00
parent cfcbc77507
commit d2c76aa3a4
12 changed files with 873 additions and 71 deletions
+72
View File
@@ -44,6 +44,12 @@ const (
// Rotation is by redeploying alerting with a freshly issued token,
// not automatic refresh.
ServiceTokenTTL = 24 * 365 * time.Hour
// PendingLoginTTL is intentionally short -- a pending login only
// bridges the gap between "the IdP round trip proved who you are"
// and "you picked which tenant to act as" for a multi-membership
// identity (see loginhandler's package doc comment), a single-page
// interaction, not a session lifetime.
PendingLoginTTL = 10 * time.Minute
// MinSigningKeyBytes: HS256 wants a key at least as long as its
// output (32 bytes/256 bits) to not weaken the MAC.
MinSigningKeyBytes = 32
@@ -115,6 +121,72 @@ func (m *Manager) IssueServiceToken(subject string) (string, error) {
return jwt.Signed(m.signer).Claims(claims).Serialize()
}
// PendingLoginClaims carries a proven-but-not-yet-tenant-scoped identity
// through the multi-membership tenant-selection round trip -- see
// loginhandler.startTenantSelection/handleSelectTenant. Deliberately a
// different Go type from Claims, not the same struct with an empty
// TenantID/Role: a pending token's JSON body never has those keys at
// all, so there's no field a caller could mistake for a real session's
// tenant/role, and no risk of this token type ever satisfying a
// role-gated check by accident (see ValidatePendingLogin -- callers
// that mistakenly feed a pending token to Validate instead just get a
// Claims with an empty Role, which authz.Role.Satisfies already treats
// as satisfying nothing).
//
// The json tag is deliberately "pending_user_id", not the "user_id" a
// real Claims token also carries -- found while writing this package's
// own test for "a real session token must not work as a pending
// login": go-jose's Claims() unmarshal is happy to populate any struct
// field whose json tag matches a key present in the token, key overlap
// included, so reusing "user_id" would have let a full session token
// parse successfully as a PendingLoginClaims too (extracting UserID
// from the session's own user_id field) -- exactly the token-type
// confusion this type's separate-Go-type design was supposed to
// prevent. A disjoint field name closes that regardless of which
// fields either struct happens to add later.
type PendingLoginClaims struct {
UserID string `json:"pending_user_id"`
jwt.Claims
}
// IssuePendingLogin issues a short-lived token proving userID's identity
// (already resolved by resolveIdentity's UpsertUserBySSO) without
// committing to a tenant yet -- called only when that identity has more
// than one tenant_memberships row.
func (m *Manager) IssuePendingLogin(userID string) (string, error) {
now := time.Now()
claims := PendingLoginClaims{
UserID: userID,
Claims: jwt.Claims{
Subject: userID,
IssuedAt: jwt.NewNumericDate(now),
Expiry: jwt.NewNumericDate(now.Add(PendingLoginTTL)),
},
}
return jwt.Signed(m.signer).Claims(claims).Serialize()
}
// ValidatePendingLogin is IssuePendingLogin's counterpart -- same
// signature/expiry checks as Validate, collapsed to ErrInvalidToken for
// the same reasoning (see that method's doc comment).
func (m *Manager) ValidatePendingLogin(token string) (userID string, err error) {
parsed, err := jwt.ParseSigned(token, []josev4.SignatureAlgorithm{josev4.HS256})
if err != nil {
return "", ErrInvalidToken
}
var claims PendingLoginClaims
if err := parsed.Claims(m.key, &claims); err != nil {
return "", ErrInvalidToken
}
if err := claims.Claims.Validate(jwt.Expected{}); err != nil {
return "", ErrInvalidToken
}
if claims.UserID == "" {
return "", ErrInvalidToken
}
return claims.UserID, nil
}
// Validate verifies signature and expiry and returns the token's claims.
// Every failure mode collapses to ErrInvalidToken -- see its doc comment.
func (m *Manager) Validate(token string) (Claims, error) {
+101
View File
@@ -95,6 +95,107 @@ func TestValidateRejectsWrongKey(t *testing.T) {
}
}
func TestIssueAndValidatePendingLogin(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {
t.Fatalf("NewManager: %v", err)
}
token, err := m.IssuePendingLogin("u1")
if err != nil {
t.Fatalf("IssuePendingLogin: %v", err)
}
userID, err := m.ValidatePendingLogin(token)
if err != nil {
t.Fatalf("ValidatePendingLogin: %v", err)
}
if userID != "u1" {
t.Fatalf("userID = %q, want u1", userID)
}
}
func TestValidatePendingLoginRejectsTamperedToken(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {
t.Fatalf("NewManager: %v", err)
}
token, err := m.IssuePendingLogin("u1")
if err != nil {
t.Fatalf("IssuePendingLogin: %v", err)
}
parts := strings.Split(token, ".")
if len(parts) != 3 {
t.Fatalf("expected a 3-segment JWT, got %d segments", len(parts))
}
tampered := parts[0] + "." + parts[1] + "x" + "." + parts[2]
if _, err := m.ValidatePendingLogin(tampered); err != ErrInvalidToken {
t.Fatalf("ValidatePendingLogin(tampered) error = %v, want ErrInvalidToken", err)
}
}
// TestValidatePendingLoginRejectsRealSessionToken is the regression test
// for PendingLoginClaims.UserID's "pending_user_id" json tag (see that
// field's doc comment): a real user-session token must not parse as a
// valid pending login just because both structs happen to be signed by
// the same key.
func TestValidatePendingLoginRejectsRealSessionToken(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {
t.Fatalf("NewManager: %v", err)
}
sessionToken, err := m.IssueUserSession("acme", "u1", "editor")
if err != nil {
t.Fatalf("IssueUserSession: %v", err)
}
if _, err := m.ValidatePendingLogin(sessionToken); err != ErrInvalidToken {
t.Fatalf("ValidatePendingLogin(a real session token) error = %v, want ErrInvalidToken", err)
}
}
// TestValidateRejectsPendingLoginToken is the same regression in the
// other direction: a pending-login token must not validate as a usable
// session either (it carries no tenant_id/role at all, so it would be
// inert even if it somehow parsed, but this proves that directly rather
// than relying on downstream role checks alone).
func TestValidateRejectsPendingLoginToken(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {
t.Fatalf("NewManager: %v", err)
}
pendingToken, err := m.IssuePendingLogin("u1")
if err != nil {
t.Fatalf("IssuePendingLogin: %v", err)
}
claims, err := m.Validate(pendingToken)
if err != nil {
t.Fatalf("Validate(pending token): %v", err)
}
if claims.TenantID != "" || claims.UserID != "" || claims.Role != "" {
t.Fatalf("a pending-login token must not carry any tenant/user/role claims when read as a session, got %+v", claims)
}
}
func TestValidatePendingLoginRejectsExpiredToken(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {
t.Fatalf("NewManager: %v", err)
}
now := time.Now()
claims := PendingLoginClaims{
UserID: "u1",
Claims: jwt.Claims{
IssuedAt: jwt.NewNumericDate(now.Add(-1 * time.Hour)),
Expiry: jwt.NewNumericDate(now.Add(-30 * time.Minute)),
},
}
token, err := jwt.Signed(m.signer).Claims(claims).Serialize()
if err != nil {
t.Fatalf("building an already-expired pending token: %v", err)
}
if _, err := m.ValidatePendingLogin(token); err != ErrInvalidToken {
t.Fatalf("ValidatePendingLogin(expired) error = %v, want ErrInvalidToken", err)
}
}
func TestValidateRejectsExpiredToken(t *testing.T) {
m, err := NewManager(testKey())
if err != nil {