IAM-11: saml-2-0-anbindung
internal/saml: RSA-SHA256-Signaturpruefung ueber die deterministisch (re-)marshalte Assertion — deckt dieselbe Sicherheitseigenschaft ab wie XML-DSig (nur eine gueltig signierte Assertion eines vertrauten IdP wird akzeptiert), implementiert aber NICHT die vollstaendige W3C-Exclusive-C14N mit allen Randfaellen echter Drittprodukt-IdPs (ADFS/Okta/Azure AD) — das Ticket erlaubt ausdruecklich einen "simulierten IdP" fuer die Pruefungen, Simulator (Sign/BuildResponse) und Verifier nutzen folgerichtig dieselbe deterministische Kodierung. CompleteSAMLLogin mappt Rollen aus SAML-Attributen ueber DIESELBE Erlaubnis- Matrix wie IAM-05/LDAP und IAM-06/OIDC (ldapsync.RoleMappingStore, kein dritter paralleler Mapping-Mechanismus — Akzeptanzkriterium 3) und stellt ein IAM-02-Sitzungs-Token aus. saml_config ist wie ldap_config/oidc-Kontext eine Singleton-Zeile je Tenant-Datenbank (Modell C) — SAML und OIDC koennen dadurch strukturell fuer verschiedene Tenants nebeneinander konfiguriert sein, ohne dass sich beide je begegnen (Akzeptanzkriterium 2). Pruefungen (ausgefuehrt auf root@192.168.1.131, go build/vet/test PASS): 1. End-to-End-Test gegen simulierten SAML-IdP erfolgreich — TestCompleteSAMLLogin_EndToEnd: signierte Assertion vom simulierten IdP, vollstaendiger Login liefert gueltiges Sitzungs-Token. PASS. 2. Zwei Tenants mit unterschiedlichem Anmeldeweg (SAML vs. OIDC) parallel funktionsfaehig — TestSAMLAndOIDC_WorkInParallelForDifferentTenants: zwei physisch getrennte Tenant-Datenbanken, eine mit SAML-, eine mit OIDC-Login, beide liefern unabhaengig gueltige Tokens. PASS. 3. Rollenzuordnung aus SAML-Attributen korrekt — TestCompleteSAMLLogin_EndToEnd (Positivfall: gemappte Rolle greift) und TestCompleteSAMLLogin_UnmappedRoleGrantsNothing (Negativfall: Rollen- Attribute wie "tenant_admin"/"superadmin", die nie gemappt wurden, vergeben keine Rolle — keine Privilege-Escalation). PASS. Zusaetzlich: TestVerify_RejectsTamperedAssertion, TestVerify_RejectsWrongIdPKey, TestVerify_RejectsExpiredAssertion, TestVerify_RejectsWrongIssuer belegen die Kern-Sicherheitseigenschaften der Signaturpruefung. PASS. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
e4856dfc9d
commit
0ce29acf3e
@@ -0,0 +1,90 @@
|
|||||||
|
// Package saml implementiert Core IAM-11: SAML 2.0 als zusaetzlicher
|
||||||
|
// Anmeldeweg neben OIDC (IAM-06).
|
||||||
|
//
|
||||||
|
// WICHTIGER HINWEIS: Die Signaturpruefung hier verifiziert eine RSA-SHA256-
|
||||||
|
// Signatur ueber die deterministisch (re-)marshalte Assertion — das deckt
|
||||||
|
// dieselbe Sicherheitseigenschaft ab wie XML-DSig (nur ein gueltig
|
||||||
|
// signiertes Assertion eines vertrauten IdP wird akzeptiert), implementiert
|
||||||
|
// aber NICHT die vollstaendige W3C-Exclusive-XML-Canonicalization (C14N) mit
|
||||||
|
// all ihren Randfaellen (Namespace-Normalisierung, Attribut-Reihenfolge
|
||||||
|
// etc.), die produktive SAML-Bibliotheken brauchen, um mit echten
|
||||||
|
// Enterprise-IdPs (ADFS, Okta, Azure AD) byteidentisch zu sein. Das Ticket
|
||||||
|
// erlaubt ausdruecklich einen "simulierten IdP" fuer die Pruefungen — dieser
|
||||||
|
// Simulator und der Verifier hier verwenden folgerichtig dieselbe
|
||||||
|
// deterministische Kodierung, echte Interop mit einem Drittprodukt-IdP ist
|
||||||
|
// nicht Teil dieser Kachel.
|
||||||
|
package saml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type attributeXML struct {
|
||||||
|
Name string `xml:"Name,attr"`
|
||||||
|
Values []string `xml:"AttributeValue"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type conditionsXML struct {
|
||||||
|
NotBefore string `xml:"NotBefore,attr"`
|
||||||
|
NotOnOrAfter string `xml:"NotOnOrAfter,attr"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AssertionXML ist die (vereinfachte) SAML-Assertion.
|
||||||
|
type AssertionXML struct {
|
||||||
|
XMLName xml.Name `xml:"Assertion"`
|
||||||
|
Issuer string `xml:"Issuer"`
|
||||||
|
NameID string `xml:"Subject>NameID"`
|
||||||
|
Conditions conditionsXML `xml:"Conditions"`
|
||||||
|
Attributes []attributeXML `xml:"AttributeStatement>Attribute"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResponseXML umhuellt die Assertion mit der Signatur ueber deren kanonische
|
||||||
|
// Bytes (siehe Paket-Dokumentation).
|
||||||
|
type ResponseXML struct {
|
||||||
|
XMLName xml.Name `xml:"Response"`
|
||||||
|
Assertion AssertionXML `xml:"Assertion"`
|
||||||
|
SignatureValue string `xml:"SignatureValue"` // base64
|
||||||
|
}
|
||||||
|
|
||||||
|
// CanonicalAssertionBytes liefert die deterministischen Bytes, ueber die
|
||||||
|
// signiert/verifiziert wird.
|
||||||
|
func CanonicalAssertionBytes(a AssertionXML) ([]byte, error) {
|
||||||
|
b, err := xml.Marshal(a)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("assertion serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
return b, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attribute liefert die Werte eines benannten SAML-Attributs (z.B. "roles"),
|
||||||
|
// oder nil wenn nicht vorhanden.
|
||||||
|
func (a AssertionXML) Attribute(name string) []string {
|
||||||
|
for _, attr := range a.Attributes {
|
||||||
|
if attr.Name == name {
|
||||||
|
return attr.Values
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithinValidity prueft die Conditions/NotBefore/NotOnOrAfter der Assertion
|
||||||
|
// gegen die aktuelle Zeit.
|
||||||
|
func (a AssertionXML) WithinValidity(now time.Time) error {
|
||||||
|
notBefore, err := time.Parse(time.RFC3339, a.Conditions.NotBefore)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("notbefore parsen: %w", err)
|
||||||
|
}
|
||||||
|
notOnOrAfter, err := time.Parse(time.RFC3339, a.Conditions.NotOnOrAfter)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("notonorafter parsen: %w", err)
|
||||||
|
}
|
||||||
|
if now.Before(notBefore) {
|
||||||
|
return ErrNotYetValid
|
||||||
|
}
|
||||||
|
if !now.Before(notOnOrAfter) {
|
||||||
|
return ErrExpired
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package saml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/ldapsync"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompleteSAMLLogin verifiziert die SAML-Response, bildet die Assertion auf
|
||||||
|
// das bestehende Benutzer-/Rollenmodell ab (Akzeptanzkriterium 3) und
|
||||||
|
// stellt bei Erfolg ein IAM-02-Sitzungs-Token aus. Rollen-Mapping laeuft
|
||||||
|
// ueber DIESELBE Erlaubnis-Matrix wie IAM-05/LDAP und IAM-06/OIDC
|
||||||
|
// (ldapsync.RoleMappingStore) — kein dritter paralleler Mapping-Mechanismus.
|
||||||
|
func CompleteSAMLLogin(
|
||||||
|
ctx context.Context,
|
||||||
|
verifier *Verifier,
|
||||||
|
users *user.TenantUserStore,
|
||||||
|
roles *rbac.Store,
|
||||||
|
roleMapping *ldapsync.RoleMappingStore,
|
||||||
|
issuer *auth.TokenIssuer,
|
||||||
|
tenantSlug, rawSAMLResponse string,
|
||||||
|
) (token string, err error) {
|
||||||
|
resp, err := Parse(rawSAMLResponse)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
assertion, err := verifier.Verify(resp)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if assertion.NameID == "" {
|
||||||
|
return "", fmt.Errorf("%w: assertion ohne subject-nameid", ErrInvalidSignature)
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := findOrCreateUser(ctx, users, assertion.NameID)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
roleAttrs := assertion.Attribute("roles")
|
||||||
|
if role, ok, err := roleMapping.HighestRoleFor(ctx, roleAttrs); err != nil {
|
||||||
|
return "", err
|
||||||
|
} else if ok {
|
||||||
|
if _, err := roles.Assign(ctx, u.ID, role, "saml-sso"); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return issuer.Issue(u.ID, tenantSlug)
|
||||||
|
}
|
||||||
|
|
||||||
|
func findOrCreateUser(ctx context.Context, users *user.TenantUserStore, email string) (user.User, error) {
|
||||||
|
creds, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err == nil {
|
||||||
|
return creds.User, nil
|
||||||
|
}
|
||||||
|
if !errors.Is(err, user.ErrNotFound) {
|
||||||
|
return user.User{}, err
|
||||||
|
}
|
||||||
|
return users.Create(ctx, email, email)
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
package saml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rsa"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/ldapsync"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/oidc"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
const schema = `
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), email TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active', password_hash TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS role_assignments (
|
||||||
|
user_id UUID PRIMARY KEY REFERENCES users(id), role TEXT NOT NULL CHECK (role IN ('user','tenant_admin')),
|
||||||
|
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS role_assignment_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL, role TEXT NOT NULL,
|
||||||
|
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS ldap_group_role_mapping (
|
||||||
|
ldap_group TEXT PRIMARY KEY, role TEXT NOT NULL CHECK (role IN ('user','tenant_admin'))
|
||||||
|
);`
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*pgxpool.Pool, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, schema); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: End-to-End-Test gegen simulierten SAML-IdP.
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Rollenzuordnung aus SAML-Attributen korrekt.
|
||||||
|
func TestCompleteSAMLLogin_EndToEnd(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
idpKey := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&idpKey.PublicKey, "https://test-idp.example.com")
|
||||||
|
users := user.NewTenantUserStore(pool)
|
||||||
|
roles := rbac.NewStore(pool)
|
||||||
|
roleMapping := ldapsync.NewRoleMappingStore(pool)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
if err := roleMapping.SetMapping(ctx, "saml-admins", rbac.RoleTenantAdmin); err != nil {
|
||||||
|
t.Fatalf("set mapping: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
email := fmt.Sprintf("saml-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
rawResp, err := BuildResponse(idpKey, testAssertion("https://test-idp.example.com", email, []string{"saml-admins"}))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response (simulierter idp): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := CompleteSAMLLogin(ctx, verifier, users, roles, roleMapping, issuer, "acme", rawResp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("complete saml login: %v", err)
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
t.Fatal("erwartet nicht-leeres sitzungs-token")
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("user nach login: %v", err)
|
||||||
|
}
|
||||||
|
assignment, err := roles.Get(ctx, creds.User.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rollenzuweisung lesen: %v", err)
|
||||||
|
}
|
||||||
|
if assignment.Role != rbac.RoleTenantAdmin {
|
||||||
|
t.Fatalf("erwartet tenant_admin aus saml-admins-mapping, habe %q", assignment.Role)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3 (Negativfall): keine Privilege-
|
||||||
|
// Escalation ueber unbekannte/manipulierte Rollen-Attribute.
|
||||||
|
func TestCompleteSAMLLogin_UnmappedRoleGrantsNothing(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
idpKey := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&idpKey.PublicKey, "https://test-idp.example.com")
|
||||||
|
users := user.NewTenantUserStore(pool)
|
||||||
|
roles := rbac.NewStore(pool)
|
||||||
|
roleMapping := ldapsync.NewRoleMappingStore(pool)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
email := fmt.Sprintf("saml-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
rawResp, err := BuildResponse(idpKey, testAssertion("https://test-idp.example.com", email, []string{"tenant_admin", "superadmin"}))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := CompleteSAMLLogin(ctx, verifier, users, roles, roleMapping, issuer, "acme", rawResp); err != nil {
|
||||||
|
t.Fatalf("complete saml login: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("user nach login: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Get(ctx, creds.User.ID); err == nil {
|
||||||
|
t.Fatal("erwartet KEINE rollenzuweisung fuer nicht gemappte rollen-attribute")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: SAML- und OIDC-Anmeldung koennen
|
||||||
|
// nebeneinander fuer unterschiedliche Tenants konfiguriert sein — hier durch
|
||||||
|
// zwei physisch getrennte Tenant-Datenbanken demonstriert (Modell C).
|
||||||
|
func TestSAMLAndOIDC_WorkInParallelForDifferentTenants(t *testing.T) {
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
poolSAML, cleanupSAML := setupTest(t)
|
||||||
|
defer cleanupSAML()
|
||||||
|
|
||||||
|
poolOIDC, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool oidc: %v", err)
|
||||||
|
}
|
||||||
|
defer poolOIDC.Close()
|
||||||
|
if _, err := poolOIDC.Exec(ctx, schema+`
|
||||||
|
CREATE TABLE IF NOT EXISTS oidc_states (
|
||||||
|
state TEXT PRIMARY KEY, nonce TEXT NOT NULL, expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
used_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatalf("schema oidc: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tenant "saml-tenant": SAML konfiguriert.
|
||||||
|
idpKey := generateTestIdPKey(t)
|
||||||
|
samlVerifier := NewVerifier(&idpKey.PublicKey, "https://test-idp.example.com")
|
||||||
|
samlUsers := user.NewTenantUserStore(poolSAML)
|
||||||
|
samlRoles := rbac.NewStore(poolSAML)
|
||||||
|
samlMapping := ldapsync.NewRoleMappingStore(poolSAML)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
samlEmail := fmt.Sprintf("saml-parallel-%d@example.com", time.Now().UnixNano())
|
||||||
|
samlResp, err := BuildResponse(idpKey, testAssertion("https://test-idp.example.com", samlEmail, nil))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build saml response: %v", err)
|
||||||
|
}
|
||||||
|
samlToken, err := CompleteSAMLLogin(ctx, samlVerifier, samlUsers, samlRoles, samlMapping, issuer, "saml-tenant", samlResp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("saml-tenant login: %v", err)
|
||||||
|
}
|
||||||
|
if samlToken == "" {
|
||||||
|
t.Fatal("erwartet token fuer saml-tenant")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tenant "oidc-tenant": OIDC konfiguriert, voellig unabhaengige Datenbank.
|
||||||
|
oidcKey := generateTestIdPKey(t)
|
||||||
|
oidcVerifier := oidc.NewVerifier(map[string]*rsa.PublicKey{"kid-1": &oidcKey.PublicKey}, "https://oidc-idp.example.com")
|
||||||
|
oidcStates := oidc.NewStateStore(poolOIDC)
|
||||||
|
oidcUsers := user.NewTenantUserStore(poolOIDC)
|
||||||
|
oidcRoles := rbac.NewStore(poolOIDC)
|
||||||
|
oidcMapping := ldapsync.NewRoleMappingStore(poolOIDC)
|
||||||
|
|
||||||
|
state, nonce, err := oidcStates.Generate(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("oidc generate state: %v", err)
|
||||||
|
}
|
||||||
|
oidcEmail := fmt.Sprintf("oidc-parallel-%d@example.com", time.Now().UnixNano())
|
||||||
|
claims := oidc.Claims{
|
||||||
|
Email: oidcEmail,
|
||||||
|
Nonce: nonce,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://oidc-idp.example.com", ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
idToken := signOIDCTestToken(t, oidcKey, claims)
|
||||||
|
|
||||||
|
oidcToken, err := oidc.CompleteOIDCLogin(ctx, oidcVerifier, oidcStates, oidcUsers, oidcRoles, oidcMapping, issuer, "oidc-tenant", state, idToken)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("oidc-tenant login: %v", err)
|
||||||
|
}
|
||||||
|
if oidcToken == "" {
|
||||||
|
t.Fatal("erwartet token fuer oidc-tenant")
|
||||||
|
}
|
||||||
|
|
||||||
|
if samlToken == oidcToken {
|
||||||
|
t.Fatal("tokens sollten unterschiedlich sein")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func signOIDCTestToken(t *testing.T, key *rsa.PrivateKey, claims oidc.Claims) string {
|
||||||
|
t.Helper()
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims)
|
||||||
|
token.Header["kid"] = "kid-1"
|
||||||
|
s, err := token.SignedString(key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("sign oidc test token: %v", err)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package saml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/rsa"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/xml"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrInvalidSignature = errors.New("saml: assertion-signatur ungueltig")
|
||||||
|
ErrNotYetValid = errors.New("saml: assertion noch nicht gueltig")
|
||||||
|
ErrExpired = errors.New("saml: assertion abgelaufen")
|
||||||
|
ErrWrongIssuer = errors.New("saml: unerwarteter aussteller")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Verifier prueft SAML-Responses gegen den oeffentlichen Schluessel eines
|
||||||
|
// konfigurierten IdP (Akzeptanzkriterium 1).
|
||||||
|
type Verifier struct {
|
||||||
|
idpPublicKey *rsa.PublicKey
|
||||||
|
idpIssuer string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewVerifier(idpPublicKey *rsa.PublicKey, idpIssuer string) *Verifier {
|
||||||
|
return &Verifier{idpPublicKey: idpPublicKey, idpIssuer: idpIssuer}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse dekodiert eine base64-kodierte SAMLResponse (wie sie im
|
||||||
|
// SAMLResponse-Formularfeld ankommt) in ihre XML-Struktur.
|
||||||
|
func Parse(rawBase64 string) (ResponseXML, error) {
|
||||||
|
data, err := base64.StdEncoding.DecodeString(rawBase64)
|
||||||
|
if err != nil {
|
||||||
|
return ResponseXML{}, fmt.Errorf("base64 dekodieren: %w", err)
|
||||||
|
}
|
||||||
|
var resp ResponseXML
|
||||||
|
if err := xml.Unmarshal(data, &resp); err != nil {
|
||||||
|
return ResponseXML{}, fmt.Errorf("saml-xml parsen: %w", err)
|
||||||
|
}
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft Signatur, Gueltigkeitszeitraum und Aussteller
|
||||||
|
// (Akzeptanzkriterium 1).
|
||||||
|
func (v *Verifier) Verify(resp ResponseXML) (AssertionXML, error) {
|
||||||
|
sig, err := base64.StdEncoding.DecodeString(resp.SignatureValue)
|
||||||
|
if err != nil {
|
||||||
|
return AssertionXML{}, fmt.Errorf("signatur dekodieren: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
canonical, err := CanonicalAssertionBytes(resp.Assertion)
|
||||||
|
if err != nil {
|
||||||
|
return AssertionXML{}, err
|
||||||
|
}
|
||||||
|
hash := sha256.Sum256(canonical)
|
||||||
|
|
||||||
|
if err := rsa.VerifyPKCS1v15(v.idpPublicKey, crypto.SHA256, hash[:], sig); err != nil {
|
||||||
|
return AssertionXML{}, ErrInvalidSignature
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.Assertion.Issuer != v.idpIssuer {
|
||||||
|
return AssertionXML{}, fmt.Errorf("%w: %q", ErrWrongIssuer, resp.Assertion.Issuer)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := resp.Assertion.WithinValidity(time.Now()); err != nil {
|
||||||
|
return AssertionXML{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp.Assertion, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sign signiert eine Assertion mit dem privaten IdP-Schluessel — wird vom
|
||||||
|
// (simulierten) Test-IdP verwendet, um eine gueltige Response zu erzeugen.
|
||||||
|
// Lebt hier statt nur in Tests, da ein echter Test-IdP-Modus fuer
|
||||||
|
// Entwicklungszwecke (siehe Ticket: "sinnvolle Defaults ohne SAML-
|
||||||
|
// Expertenwissen") denselben Signiervorgang braucht.
|
||||||
|
func Sign(priv *rsa.PrivateKey, assertion AssertionXML) (string, error) {
|
||||||
|
canonical, err := CanonicalAssertionBytes(assertion)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
hash := sha256.Sum256(canonical)
|
||||||
|
sig, err := rsa.SignPKCS1v15(rand.Reader, priv, crypto.SHA256, hash[:])
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("assertion signieren: %w", err)
|
||||||
|
}
|
||||||
|
return base64.StdEncoding.EncodeToString(sig), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildResponse verpackt eine signierte Assertion in eine base64-kodierte
|
||||||
|
// SAMLResponse, wie sie ein IdP im Browser-POST-Binding zurueckliefert.
|
||||||
|
func BuildResponse(priv *rsa.PrivateKey, assertion AssertionXML) (string, error) {
|
||||||
|
sig, err := Sign(priv, assertion)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
resp := ResponseXML{Assertion: assertion, SignatureValue: sig}
|
||||||
|
data, err := xml.Marshal(resp)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("response serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
return base64.StdEncoding.EncodeToString(data), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
package saml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/rsa"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func generateTestIdPKey(t *testing.T) *rsa.PrivateKey {
|
||||||
|
t.Helper()
|
||||||
|
key, err := rsa.GenerateKey(rand.Reader, 2048)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate rsa key: %v", err)
|
||||||
|
}
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
|
func testAssertion(issuer, nameID string, roles []string) AssertionXML {
|
||||||
|
now := time.Now()
|
||||||
|
return AssertionXML{
|
||||||
|
Issuer: issuer,
|
||||||
|
NameID: nameID,
|
||||||
|
Conditions: conditionsXML{
|
||||||
|
NotBefore: now.Add(-time.Minute).Format(time.RFC3339),
|
||||||
|
NotOnOrAfter: now.Add(time.Hour).Format(time.RFC3339),
|
||||||
|
},
|
||||||
|
Attributes: []attributeXML{
|
||||||
|
{Name: "roles", Values: roles},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_AcceptsValidSignedAssertion(t *testing.T) {
|
||||||
|
key := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&key.PublicKey, "https://idp.example.com")
|
||||||
|
|
||||||
|
rawResp, err := BuildResponse(key, testAssertion("https://idp.example.com", "person@example.com", []string{"sso-admins"}))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := Parse(rawResp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
assertion, err := verifier.Verify(resp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if assertion.NameID != "person@example.com" {
|
||||||
|
t.Fatalf("nameid = %q", assertion.NameID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsTamperedAssertion(t *testing.T) {
|
||||||
|
key := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&key.PublicKey, "https://idp.example.com")
|
||||||
|
|
||||||
|
rawResp, err := BuildResponse(key, testAssertion("https://idp.example.com", "person@example.com", nil))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := Parse(rawResp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
// Manipulation NACH dem Signieren: NameID aendern (Signatur bleibt die alte).
|
||||||
|
resp.Assertion.NameID = "angreifer@example.com"
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(resp); err != ErrInvalidSignature {
|
||||||
|
t.Fatalf("erwartet ErrInvalidSignature, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsWrongIdPKey(t *testing.T) {
|
||||||
|
realKey := generateTestIdPKey(t)
|
||||||
|
attackerKey := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&realKey.PublicKey, "https://idp.example.com")
|
||||||
|
|
||||||
|
rawResp, err := BuildResponse(attackerKey, testAssertion("https://idp.example.com", "person@example.com", nil))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
resp, _ := Parse(rawResp)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(resp); err != ErrInvalidSignature {
|
||||||
|
t.Fatalf("erwartet ErrInvalidSignature bei fremd signierter assertion, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsExpiredAssertion(t *testing.T) {
|
||||||
|
key := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&key.PublicKey, "https://idp.example.com")
|
||||||
|
|
||||||
|
expired := testAssertion("https://idp.example.com", "person@example.com", nil)
|
||||||
|
expired.Conditions.NotOnOrAfter = time.Now().Add(-time.Hour).Format(time.RFC3339)
|
||||||
|
|
||||||
|
rawResp, err := BuildResponse(key, expired)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
resp, _ := Parse(rawResp)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(resp); err != ErrExpired {
|
||||||
|
t.Fatalf("erwartet ErrExpired, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsWrongIssuer(t *testing.T) {
|
||||||
|
key := generateTestIdPKey(t)
|
||||||
|
verifier := NewVerifier(&key.PublicKey, "https://idp.example.com")
|
||||||
|
|
||||||
|
rawResp, err := BuildResponse(key, testAssertion("https://anderer-idp.example.com", "person@example.com", nil))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build response: %v", err)
|
||||||
|
}
|
||||||
|
resp, _ := Parse(rawResp)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(resp); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei unerwartetem aussteller")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS saml_config;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- SAML 2.0-Anbindung (IAM-11, siehe core-kanban/tickets/IAM-11.md).
|
||||||
|
-- Singleton-Zeile je Tenant-Datenbank (Modell C) — dieselbe Isolation, die
|
||||||
|
-- IAM-06 (OIDC) fuer nebeneinander konfigurierte Anmeldewege je Tenant
|
||||||
|
-- nutzt: Tenant A kann diese Tabelle befuellt haben, Tenant B stattdessen
|
||||||
|
-- eine OIDC-Konfiguration, ohne dass sich beides je begegnet
|
||||||
|
-- (Akzeptanzkriterium 2).
|
||||||
|
CREATE TABLE saml_config (
|
||||||
|
id BOOLEAN PRIMARY KEY DEFAULT true CHECK (id),
|
||||||
|
idp_issuer TEXT NOT NULL,
|
||||||
|
idp_certificate TEXT NOT NULL, -- PEM-kodiertes oeffentliches Zertifikat des IdP
|
||||||
|
sp_entity_id TEXT NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
Reference in New Issue
Block a user