Build SAML login (enterprise/internal/loginhandler), mirroring OIDC
Adds GET /auth/saml/login + POST /auth/saml/acs alongside the existing OIDC pair, both converging on the same upsert-user/resolve-tenant/ issue-session path. loginhandler.New now takes an optional *saml.ServiceProvider, RegisterRoutes registers each protocol's routes independently so either, both, or neither can be configured. SAML's replay/unsolicited-response defense (InResponseTo, standing in for OIDC's state) is carried via a SameSite=None sentry_saml_request cookie -- None because the ACS endpoint receives a cross-site POST from the IdP's origin, which SameSite=Lax cookies are never sent on. enterprise-auth's main.go now fetches+parses SAML_IDP_METADATA_URL at startup (samlsp.FetchMetadata) and wires the result through. Verified to the same bar as OIDC: a real fake IdP (crewjam/saml/samlidp, genuine XML signing/verification) drives the full login->ACS->session-cookie round trip and negative paths (bad InResponseTo, missing request cookie, missing email/NameID, no/multiple tenant memberships), all in loginhandler/saml_test.go, no Docker needed. The login-form HTML is bypassed by pre-seeding a saml.Session directly into samlidp's session store and presenting the matching `session` cookie -- an IdP-supported shortcut (confirmed by reading GetSession), the same "skip the UI, keep the crypto real" approach oidctest gave the OIDC tests. Writing that test caught two real bugs in internal/saml.ParseResponse, both fixed here: it never called r.ParseForm() before reading the POSTed SAMLResponse field, so every real ACS POST would have silently decoded an empty response; and its email-attribute matching missed urn:oid:0.9.2342.19200300.100.1.3 (the standard LDAP "mail" OID), which is what an IdP sends by default absent an explicit AttributeConsumingService request for "email" -- exactly what samlidp's own DefaultAssertionMaker does, and plausibly what real IdPs' default SAML app templates do too. Docs (CLAUDE.md, threat-model.md, architecture.md, enterprise/README.md, phase-4-runbook.md, docker-compose.yml's enterprise-auth comment) updated in lockstep: SAML login moves from "protocol mechanics only" to "built, verified with a real fake IdP, not yet tried against a real external IdP or a running enterprise-auth container" -- the same disclosed gap OIDC already carried.
This commit is contained in:
@@ -89,17 +89,24 @@ func New(cfg Config) (*ServiceProvider, error) {
|
||||
// round-trips through the IdP and comes back with the response --
|
||||
// typically where to send the browser after login completes, validated
|
||||
// by the caller the same way OIDC's state parameter is (this package
|
||||
// doesn't store it).
|
||||
func (s *ServiceProvider) LoginURL(relayState string) (string, error) {
|
||||
// doesn't store it). Also returns the AuthnRequest's ID: the caller must
|
||||
// persist it (e.g. a short-lived cookie, the same pattern
|
||||
// enterprise/internal/loginhandler uses for OIDC's state) and pass it
|
||||
// back via ParseResponse's possibleRequestIDs -- SAML's actual replay/
|
||||
// unsolicited-response defense, standing in for OIDC's simpler state
|
||||
// check. Skipping this (e.g. passing nil to ParseResponse) is exactly
|
||||
// the "don't validate you asked for this response" mistake that would
|
||||
// let an attacker replay a captured assertion.
|
||||
func (s *ServiceProvider) LoginURL(relayState string) (redirectURL, requestID string, err error) {
|
||||
req, err := s.sp.MakeAuthenticationRequest(s.sp.GetSSOBindingLocation(saml.HTTPRedirectBinding), saml.HTTPRedirectBinding, saml.HTTPPostBinding)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("saml: building authentication request: %w", err)
|
||||
return "", "", fmt.Errorf("saml: building authentication request: %w", err)
|
||||
}
|
||||
redirectURL, err := req.Redirect(relayState, &s.sp)
|
||||
redirect, err := req.Redirect(relayState, &s.sp)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("saml: building redirect URL: %w", err)
|
||||
return "", "", fmt.Errorf("saml: building redirect URL: %w", err)
|
||||
}
|
||||
return redirectURL.String(), nil
|
||||
return redirect.String(), req.ID, nil
|
||||
}
|
||||
|
||||
// Claims is the subset of an assertion Sentry uses -- same "extend
|
||||
@@ -114,6 +121,17 @@ type Claims struct {
|
||||
// the step that actually establishes trust -- crewjam/saml's
|
||||
// ParseResponse does the XML signature verification, not this package.
|
||||
func (s *ServiceProvider) ParseResponse(r *http.Request, possibleRequestIDs []string) (*Claims, error) {
|
||||
// crewjam/saml's ServiceProvider.ParseResponse reads req.PostForm
|
||||
// directly rather than parsing the body itself -- net/http only
|
||||
// populates PostForm once something calls ParseForm, which the
|
||||
// stdlib server never does on its own. Skipping this turns every
|
||||
// real ACS POST into an empty SAMLResponse (silently failing at the
|
||||
// base64-decode step), a bug this package's own real-fake-IdP test
|
||||
// caught immediately since it drives a genuine POST body.
|
||||
if err := r.ParseForm(); err != nil {
|
||||
return nil, fmt.Errorf("saml: parsing ACS POST body: %w", err)
|
||||
}
|
||||
|
||||
assertion, err := s.sp.ParseResponse(r, possibleRequestIDs)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("saml: parsing/validating response: %w", err)
|
||||
@@ -125,7 +143,16 @@ func (s *ServiceProvider) ParseResponse(r *http.Request, possibleRequestIDs []st
|
||||
}
|
||||
for _, stmt := range assertion.AttributeStatements {
|
||||
for _, attr := range stmt.Attributes {
|
||||
if attr.Name == "email" || attr.Name == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" {
|
||||
switch attr.Name {
|
||||
// "email" and the ADFS claims URI are what an IdP admin gets
|
||||
// by explicitly naming the attribute that way in the SAML
|
||||
// app's attribute-statement config. urn:oid:0.9.2342.19200300.100.1.3
|
||||
// is the standard LDAP "mail" OID -- what crewjam's own
|
||||
// DefaultAssertionMaker (and many real IdPs' default
|
||||
// templates) send when nothing more specific was requested,
|
||||
// found by tracing the actual assertion-building code this
|
||||
// test exercises rather than assuming "email" covers it.
|
||||
case "email", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress", "urn:oid:0.9.2342.19200300.100.1.3":
|
||||
if len(attr.Values) > 0 {
|
||||
claims.Email = attr.Values[0].Value
|
||||
}
|
||||
|
||||
@@ -48,11 +48,14 @@ func TestLoginURLBuildsAgainstRealIDPMetadata(t *testing.T) {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
|
||||
redirectURL, err := sp.LoginURL("relay-state-123")
|
||||
redirectURL, requestID, err := sp.LoginURL("relay-state-123")
|
||||
if err != nil {
|
||||
t.Fatalf("LoginURL: %v", err)
|
||||
}
|
||||
if redirectURL == "" {
|
||||
t.Fatalf("expected a non-empty redirect URL")
|
||||
}
|
||||
if requestID == "" {
|
||||
t.Fatalf("expected a non-empty AuthnRequest ID -- callers need this for ParseResponse's possibleRequestIDs")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user