Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ce29acf3e | ||
|
|
e4856dfc9d | ||
|
|
1a82da211d | ||
|
|
3d20d86a4f | ||
|
|
e4793303fc |
+10
-1
@@ -8,6 +8,7 @@ import (
|
|||||||
"gitea.perlbach24.de/scripte/nexarch/internal/config"
|
"gitea.perlbach24.de/scripte/nexarch/internal/config"
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -34,12 +35,20 @@ func main() {
|
|||||||
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
||||||
tenantHandler := tenant.NewHandler(provisioner)
|
tenantHandler := tenant.NewHandler(provisioner)
|
||||||
|
|
||||||
|
// Superadmin-Konten leben mandantenuebergreifend in der Registry-DB.
|
||||||
|
// Tenant-User-CRUD (user.TenantUserStore) braucht Connection-Routing pro
|
||||||
|
// Mandant (TEN-06, noch nicht gebaut) und wird hier bewusst noch nicht
|
||||||
|
// verdrahtet — Package ist bereits eigenstaendig nutzbar/testbar.
|
||||||
|
superadmins := user.NewSuperadminStore(registryPool)
|
||||||
|
userHandler := user.NewHandler(nil, superadmins)
|
||||||
|
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
})
|
})
|
||||||
// Vorlaeufiger Pfad ohne Versionierung/Auth — wird mit API-01/IAM-01 abgeloest.
|
// Vorlaeufige Pfade ohne Versionierung/Auth — werden mit API-01/IAM-02 abgeloest.
|
||||||
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
||||||
|
mux.HandleFunc("/internal/superadmins", userHandler.CreateSuperadmin)
|
||||||
|
|
||||||
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
||||||
if err := http.ListenAndServe(cfg.ListenAddr, mux); err != nil {
|
if err := http.ListenAndServe(cfg.ListenAddr, mux); err != nil {
|
||||||
|
|||||||
@@ -2,13 +2,16 @@ module gitea.perlbach24.de/scripte/nexarch
|
|||||||
|
|
||||||
go 1.22
|
go 1.22
|
||||||
|
|
||||||
require github.com/jackc/pgx/v5 v5.6.0
|
require (
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||||
|
github.com/jackc/pgx/v5 v5.6.0
|
||||||
|
golang.org/x/crypto v0.17.0
|
||||||
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
||||||
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
||||||
golang.org/x/crypto v0.17.0 // indirect
|
|
||||||
golang.org/x/sync v0.1.0 // indirect
|
golang.org/x/sync v0.1.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.14.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt Login/Logout als HTTP-Endpunkte bereit. Registrierung,
|
||||||
|
// Passwort-Reset, 2FA, SSO/LDAP und Rate-Limiting sind ausdruecklich nicht
|
||||||
|
// Teil dieser Kachel (siehe IAM-03..07).
|
||||||
|
type Handler struct {
|
||||||
|
login *LoginService
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(login *LoginService) *Handler {
|
||||||
|
return &Handler{login: login}
|
||||||
|
}
|
||||||
|
|
||||||
|
type loginRequest struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req loginRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := h.login.Login(r.Context(), req.Email, req.Password)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, ErrInvalidCredentials.Error(), http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: CookieName,
|
||||||
|
Value: token,
|
||||||
|
Path: "/",
|
||||||
|
HttpOnly: true,
|
||||||
|
Secure: true,
|
||||||
|
SameSite: http.SameSiteStrictMode,
|
||||||
|
MaxAge: int(AccessTokenTTL.Seconds()),
|
||||||
|
})
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logout loescht das Session-Cookie. Da JWT hier bewusst zustandslos bleibt
|
||||||
|
// (kein serverseitiger Blocklist-Speicher — das waere ueber "Grundgerüst"
|
||||||
|
// hinaus und widerspraeche der projektweiten zustandslosen-JWT-Entscheidung),
|
||||||
|
// bleibt ein bereits ausgestelltes Token bis zu seinem Ablauf technisch
|
||||||
|
// gueltig, wenn es separat vom Cookie extrahiert und wiederverwendet wird.
|
||||||
|
func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: CookieName,
|
||||||
|
Value: "",
|
||||||
|
Path: "/",
|
||||||
|
HttpOnly: true,
|
||||||
|
Secure: true,
|
||||||
|
SameSite: http.SameSiteStrictMode,
|
||||||
|
MaxAge: -1,
|
||||||
|
Expires: time.Unix(0, 0),
|
||||||
|
})
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrInvalidCredentials = errors.New("auth: E-Mail oder Passwort falsch")
|
||||||
|
|
||||||
|
// LoginService arbeitet gegen GENAU EINE Tenant-Datenbank (uebergeben ueber
|
||||||
|
// den TenantUserStore-Pool) — das Login ist damit strukturell auf den
|
||||||
|
// richtigen Tenant gescopt, siehe user.TenantUserStore.GetByEmailForAuth.
|
||||||
|
type LoginService struct {
|
||||||
|
users *user.TenantUserStore
|
||||||
|
issuer *TokenIssuer
|
||||||
|
// tenantSlug identifiziert im ausgestellten Token, gegen welchen Mandanten
|
||||||
|
// eingeloggt wurde (fuer nachgelagerte Pruefungen, z.B. Middleware-Logs).
|
||||||
|
tenantSlug string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLoginService(users *user.TenantUserStore, issuer *TokenIssuer, tenantSlug string) *LoginService {
|
||||||
|
return &LoginService{users: users, issuer: issuer, tenantSlug: tenantSlug}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Login liefert bei falscher E-Mail UND bei falschem Passwort denselben
|
||||||
|
// Fehler (ErrInvalidCredentials), um keine Rueckschluesse auf die Existenz
|
||||||
|
// eines Kontos zuzulassen (User-Enumeration-Schutz).
|
||||||
|
func (s *LoginService) Login(ctx context.Context, email, password string) (string, error) {
|
||||||
|
creds, err := s.users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
// Trotzdem einen bcrypt-Vergleich gegen einen Dummy-Hash ausfuehren,
|
||||||
|
// damit die Antwortzeit bei unbekannter E-Mail nicht messbar kuerzer
|
||||||
|
// ist als bei falschem Passwort (Timing-Seitenkanal).
|
||||||
|
VerifyPassword(dummyHash, password)
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
if creds.User.Status != user.StatusActive {
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
if !VerifyPassword(creds.PasswordHash, password) {
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.issuer.Issue(creds.User.ID, s.tenantSlug)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dummyHash ist ein echter bcrypt-Hash (Kostenfaktor BcryptCost) eines
|
||||||
|
// beliebigen Platzhalter-Klartexts — bewusst KEIN kaputtes Format, da
|
||||||
|
// bcrypt.CompareHashAndPassword bei ungueltigem Hash sofort ohne den
|
||||||
|
// eigentlichen Kostenfaktor-Vergleich zurueckkehrt und die
|
||||||
|
// Timing-Angleichung damit wirkungslos waere.
|
||||||
|
const dummyHash = "$2a$12$cmwiETrG9DK5/uTM2fg4uetngYUspKjME5P8fNpk0QYTaO64N0r3C"
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
const usersSchema = `
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
CREATE TABLE 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()
|
||||||
|
);`
|
||||||
|
|
||||||
|
func setupTenantDB(t *testing.T, dbName string) *pgxpool.Pool {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
adminPool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin pool: %v", err)
|
||||||
|
}
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
if _, err := adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
|
t.Fatalf("testdatenbank anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dsn := strings.Replace(adminDSN, "/postgres?", "/"+dbName+"?", 1)
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("connect testdatenbank: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, usersSchema); err != nil {
|
||||||
|
t.Fatalf("schema anwenden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
pool.Close()
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
adminPool.Close()
|
||||||
|
})
|
||||||
|
return pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func createUserWithPassword(t *testing.T, store *user.TenantUserStore, email, password string) user.User {
|
||||||
|
t.Helper()
|
||||||
|
ctx := context.Background()
|
||||||
|
u, err := store.Create(ctx, email, "Test User")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create user: %v", err)
|
||||||
|
}
|
||||||
|
hash, err := HashPassword(password)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash password: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.SetPasswordHash(ctx, u.ID, hash); err != nil {
|
||||||
|
t.Fatalf("set password: %v", err)
|
||||||
|
}
|
||||||
|
return u
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoginService_SuccessAndWrongPassword(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "test_iam02_login")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
createUserWithPassword(t, store, "alice@example.com", "korrektes-passwort")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
login := NewLoginService(store, issuer, "acme")
|
||||||
|
|
||||||
|
token, err := login.Login(context.Background(), "alice@example.com", "korrektes-passwort")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("login: %v", err)
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
t.Fatal("erwartet nicht-leeres token")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := login.Login(context.Background(), "alice@example.com", "falsches-passwort"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := login.Login(context.Background(), "unbekannt@example.com", "irgendwas"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials bei unbekannter email, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 1: kein Cross-Tenant-Login moeglich, obwohl dieselbe E-Mail in
|
||||||
|
// zwei unterschiedlichen Tenant-Datenbanken mit unterschiedlichen Passwoertern
|
||||||
|
// existiert.
|
||||||
|
func TestLoginService_NoCrossTenantLogin(t *testing.T) {
|
||||||
|
poolA := setupTenantDB(t, "test_iam02_tenant_a")
|
||||||
|
poolB := setupTenantDB(t, "test_iam02_tenant_b")
|
||||||
|
|
||||||
|
storeA := user.NewTenantUserStore(poolA)
|
||||||
|
storeB := user.NewTenantUserStore(poolB)
|
||||||
|
createUserWithPassword(t, storeA, "shared@example.com", "passwort-tenant-a")
|
||||||
|
createUserWithPassword(t, storeB, "shared@example.com", "passwort-tenant-b")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
loginA := NewLoginService(storeA, issuer, "tenant-a")
|
||||||
|
|
||||||
|
// Login gegen Tenant A mit dem Passwort von Tenant B darf nicht klappen,
|
||||||
|
// obwohl die E-Mail-Adresse identisch ist — die Store-Instanz kennt
|
||||||
|
// strukturell nur die Zeilen ihrer eigenen Datenbank.
|
||||||
|
if _, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-b"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials fuer fremdes tenant-passwort, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-a")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("login gegen eigenen tenant sollte klappen: %v", err)
|
||||||
|
}
|
||||||
|
claims, err := issuer.Verify(token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.TenantSlug != "tenant-a" {
|
||||||
|
t.Fatalf("token tenant = %q, want tenant-a", claims.TenantSlug)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: geschuetzte Route ohne gueltige Session nicht erreichbar.
|
||||||
|
func TestRequireAuth_BlocksWithoutValidCookie(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
protected := RequireAuth(issuer, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Kein Cookie.
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("ohne cookie: status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Manipuliertes Cookie.
|
||||||
|
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: "kaputt.token.hier"})
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("mit kaputtem cookie: status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gueltiges Token.
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: token})
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("mit gueltigem cookie: status = %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
const CookieName = "nexarch_session"
|
||||||
|
|
||||||
|
type contextKey int
|
||||||
|
|
||||||
|
const claimsContextKey contextKey = iota
|
||||||
|
|
||||||
|
// RequireAuth schuetzt eine Route: ohne gueltiges, nicht abgelaufenes Token
|
||||||
|
// im Session-Cookie wird 401 zurueckgegeben und der Handler nicht aufgerufen
|
||||||
|
// (IAM-02 Akzeptanzkriterium 3).
|
||||||
|
func RequireAuth(issuer *TokenIssuer, next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
cookie, err := r.Cookie(CookieName)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := issuer.Verify(cookie.Value)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.WithValue(r.Context(), claimsContextKey, claims)
|
||||||
|
next(w, r.WithContext(ctx))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClaimsFromContext liest die Claims, die RequireAuth in den Request-Context
|
||||||
|
// gelegt hat.
|
||||||
|
func ClaimsFromContext(ctx context.Context) (*Claims, bool) {
|
||||||
|
c, ok := ctx.Value(claimsContextKey).(*Claims)
|
||||||
|
return c, ok
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Package auth implementiert Core IAM-02: Login/Logout, Passwort-Hashing und
|
||||||
|
// die Middleware zum Schutz von Routen. Autorisierung (was ein Benutzer darf)
|
||||||
|
// ist ausdruecklich NICHT Teil dieses Pakets, siehe RBAC-01 — auth prueft nur
|
||||||
|
// "wer bin ich" (Casbin-Architekturprinzip, siehe IAM-02-Ticket).
|
||||||
|
package auth
|
||||||
|
|
||||||
|
import "golang.org/x/crypto/bcrypt"
|
||||||
|
|
||||||
|
// BcryptCost ist bewusst explizit festgelegt statt bcrypt.DefaultCost (10)
|
||||||
|
// unreflektiert zu uebernehmen (IAM-02 Akzeptanzkriterium 4). Kostenfaktor 12
|
||||||
|
// wurde gegen die Ziel-Login-Latenz benchmarkt, siehe password_bench_test.go
|
||||||
|
// und den Pruefungs-Eintrag in der Commit-Nachricht.
|
||||||
|
const BcryptCost = 12
|
||||||
|
|
||||||
|
func HashPassword(plain string) (string, error) {
|
||||||
|
hash, err := bcrypt.GenerateFromPassword([]byte(plain), BcryptCost)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(hash), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// VerifyPassword ist timing-safe: bcrypt.CompareHashAndPassword vergleicht
|
||||||
|
// konstant in der Zeit bzgl. des Hash-Inhalts (Referenzimplementierung fuer
|
||||||
|
// die projektweite Timing-safe-Vergleich-Konvention aus IAM-02).
|
||||||
|
func VerifyPassword(hash, plain string) bool {
|
||||||
|
return bcrypt.CompareHashAndPassword([]byte(hash), []byte(plain)) == nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TargetLoginLatency ist der Zielwert aus IAM-02 Akzeptanzkriterium 4: der
|
||||||
|
// bcrypt-Vergleich allein darf die Login-Latenz nicht dominieren. 400ms ist
|
||||||
|
// grosszuegig genug, um auf unterschiedlicher Hardware stabil zu sein, aber
|
||||||
|
// eng genug, um eine versehentliche Kostenfaktor-Explosion (z.B. 16 statt 12)
|
||||||
|
// zuverlaessig aufzudecken.
|
||||||
|
const TargetLoginLatency = 400 * time.Millisecond
|
||||||
|
|
||||||
|
// TestBcryptCostAgainstLatencyTarget misst die tatsaechliche Dauer eines
|
||||||
|
// Passwort-Vergleichs mit dem festgelegten BcryptCost und dokumentiert das
|
||||||
|
// Ergebnis (IAM-02 Pruefung 4).
|
||||||
|
func TestBcryptCostAgainstLatencyTarget(t *testing.T) {
|
||||||
|
hash, err := HashPassword("benchmark-passwort")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
if !VerifyPassword(hash, "benchmark-passwort") {
|
||||||
|
t.Fatal("verifikation haette erfolgreich sein muessen")
|
||||||
|
}
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
|
||||||
|
t.Logf("bcrypt-vergleich mit cost=%d dauerte %s (ziel: unter %s)", BcryptCost, elapsed, TargetLoginLatency)
|
||||||
|
if elapsed > TargetLoginLatency {
|
||||||
|
t.Fatalf("bcrypt-vergleich zu langsam: %s > ziel %s", elapsed, TargetLoginLatency)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func BenchmarkVerifyPassword(b *testing.B) {
|
||||||
|
hash, _ := HashPassword("benchmark-passwort")
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
VerifyPassword(hash, "benchmark-passwort")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestHashAndVerifyPassword(t *testing.T) {
|
||||||
|
hash, err := HashPassword("s3hr-geheim!")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash: %v", err)
|
||||||
|
}
|
||||||
|
if hash == "s3hr-geheim!" {
|
||||||
|
t.Fatal("passwort wurde nicht gehasht")
|
||||||
|
}
|
||||||
|
if !VerifyPassword(hash, "s3hr-geheim!") {
|
||||||
|
t.Fatal("erwartet erfolgreiche verifikation")
|
||||||
|
}
|
||||||
|
if VerifyPassword(hash, "falsches-passwort") {
|
||||||
|
t.Fatal("erwartet fehlgeschlagene verifikation")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDummyHashIsValidBcryptHash(t *testing.T) {
|
||||||
|
// Stellt sicher, dass der Timing-Angleichs-Hash in login.go tatsaechlich
|
||||||
|
// ein gueltiges bcrypt-Format hat und den vollen Kostenfaktor durchlaeuft
|
||||||
|
// (siehe Kommentar dort) statt sofort mit einem Format-Fehler abzubrechen.
|
||||||
|
if VerifyPassword(dummyHash, "irgendein-text") {
|
||||||
|
t.Fatal("dummyHash sollte fuer beliebigen text nicht passen")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AccessTokenTTL ist bewusst kurz gehalten (Session-Ablauf statt langlebiger
|
||||||
|
// Tokens), passend zur "so vertrauenswuerdig wie noetig"-Produkt-DNA.
|
||||||
|
const AccessTokenTTL = 30 * time.Minute
|
||||||
|
|
||||||
|
var ErrInvalidToken = errors.New("auth: ungueltiges oder abgelaufenes token")
|
||||||
|
|
||||||
|
type Claims struct {
|
||||||
|
UserID string `json:"uid"`
|
||||||
|
TenantSlug string `json:"tenant"`
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// TokenIssuer signiert/verifiziert JWTs mit einem HMAC-Secret. Das
|
||||||
|
// asymmetrische Core-weite Signaturschema (API-05, kid-Rotation) ist
|
||||||
|
// ausdruecklich nicht Teil dieser Kachel — hier geht es nur um das
|
||||||
|
// Login-Grundgerüst innerhalb eines einzelnen Core-Prozesses.
|
||||||
|
type TokenIssuer struct {
|
||||||
|
secret []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTokenIssuer(secret string) *TokenIssuer {
|
||||||
|
return &TokenIssuer{secret: []byte(secret)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *TokenIssuer) Issue(userID, tenantSlug string) (string, error) {
|
||||||
|
now := time.Now()
|
||||||
|
claims := Claims{
|
||||||
|
UserID: userID,
|
||||||
|
TenantSlug: tenantSlug,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(now.Add(AccessTokenTTL)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||||
|
return token.SignedString(i.secret)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft Signatur UND Ablauf (jwt.ParseWithClaims lehnt abgelaufene
|
||||||
|
// Tokens automatisch ab) — der Signaturvergleich in golang-jwt ist
|
||||||
|
// timing-safe (hmac.Equal).
|
||||||
|
func (i *TokenIssuer) Verify(tokenString string) (*Claims, error) {
|
||||||
|
claims := &Claims{}
|
||||||
|
token, err := jwt.ParseWithClaims(tokenString, claims, func(t *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return i.secret, nil
|
||||||
|
})
|
||||||
|
if err != nil || !token.Valid {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestTokenIssueAndVerify(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := issuer.Verify(token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.UserID != "user-1" || claims.TenantSlug != "acme" {
|
||||||
|
t.Fatalf("claims unerwartet: %+v", claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 2: Token-Manipulationstest.
|
||||||
|
func TestTokenVerify_RejectsManipulatedPayload(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.Split(token, ".")
|
||||||
|
if len(parts) != 3 {
|
||||||
|
t.Fatalf("unerwartetes token-format: %d teile", len(parts))
|
||||||
|
}
|
||||||
|
// Payload-Segment leicht veraendern (Signatur passt danach nicht mehr).
|
||||||
|
tampered := parts[0] + "." + parts[1] + "x" + "." + parts[2]
|
||||||
|
|
||||||
|
if _, err := issuer.Verify(tampered); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei manipuliertem token, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTokenVerify_RejectsWrongSecret(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("secret-a")
|
||||||
|
other := NewTokenIssuer("secret-b")
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := other.Verify(token); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei falschem secret, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 3: abgelaufenes Token erzwingt Neuanmeldung.
|
||||||
|
func TestTokenVerify_RejectsExpiredToken(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
UserID: "user-1",
|
||||||
|
TenantSlug: "acme",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(time.Now().Add(-2 * AccessTokenTTL)),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(-time.Minute)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||||
|
expired, err := tok.SignedString([]byte("test-secret-nur-fuer-tests"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("signieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := issuer.Verify(expired); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei abgelaufenem token, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultCacheTTL ist die dokumentierte Cache-Invalidierungszeit
|
|
||||||
// (Akzeptanzkriterium 2 / Pruefung 2 in diesem Ticket bezieht sich auf die
|
|
||||||
// Aenderungsnachvollziehbarkeit — die Cache-Frist selbst folgt demselben
|
|
||||||
// Muster wie internal/flag.DefaultCacheTTL).
|
|
||||||
const DefaultCacheTTL = 5 * time.Second
|
|
||||||
|
|
||||||
type cacheEntry struct {
|
|
||||||
value Value
|
|
||||||
expiresAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// Service ist die Leseseite mit Vorrangregel (Akzeptanzkriterium 1:
|
|
||||||
// Tenant-Override vor Global-Default) und lokalem TTL-Cache.
|
|
||||||
type Service struct {
|
|
||||||
store *Store
|
|
||||||
ttl time.Duration
|
|
||||||
|
|
||||||
mu sync.RWMutex
|
|
||||||
cache map[string]cacheEntry // Schluessel: key + "\x00" + tenantSlug
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewService(store *Store, ttl time.Duration) *Service {
|
|
||||||
if ttl <= 0 {
|
|
||||||
ttl = DefaultCacheTTL
|
|
||||||
}
|
|
||||||
return &Service{store: store, ttl: ttl, cache: make(map[string]cacheEntry)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func cacheKey(key, tenantSlug string) string {
|
|
||||||
return key + "\x00" + tenantSlug
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve liefert den Konfigurationswert fuer einen Tenant: ein
|
|
||||||
// Tenant-spezifischer Override hat Vorrang vor dem globalen Default
|
|
||||||
// (Akzeptanzkriterium 1 / Pruefung 1). tenantSlug == "" wertet nur den
|
|
||||||
// globalen Wert aus.
|
|
||||||
func (s *Service) Resolve(ctx context.Context, tenantSlug, key string) (Value, error) {
|
|
||||||
ck := cacheKey(key, tenantSlug)
|
|
||||||
|
|
||||||
s.mu.RLock()
|
|
||||||
entry, exists := s.cache[ck]
|
|
||||||
fresh := exists && time.Now().Before(entry.expiresAt)
|
|
||||||
s.mu.RUnlock()
|
|
||||||
if fresh {
|
|
||||||
return entry.value, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
v, err := s.resolveUncached(ctx, tenantSlug, key)
|
|
||||||
if err != nil {
|
|
||||||
return Value{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
s.mu.Lock()
|
|
||||||
s.cache[ck] = cacheEntry{value: v, expiresAt: time.Now().Add(s.ttl)}
|
|
||||||
s.mu.Unlock()
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) resolveUncached(ctx context.Context, tenantSlug, key string) (Value, error) {
|
|
||||||
if tenantSlug != "" {
|
|
||||||
v, err := s.store.Get(ctx, key, tenantSlug)
|
|
||||||
if err == nil {
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
if !errors.Is(err, ErrNotFound) {
|
|
||||||
return Value{}, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s.store.Get(ctx, key, GlobalScope)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invalidate erzwingt beim naechsten Resolve-Aufruf ein sofortiges Neuladen
|
|
||||||
// fuer einen bestimmten (key, tenantSlug) statt auf den TTL-Ablauf zu warten
|
|
||||||
// — analog internal/flag.Service.Invalidate.
|
|
||||||
func (s *Service) Invalidate(key, tenantSlug string) {
|
|
||||||
s.mu.Lock()
|
|
||||||
delete(s.cache, cacheKey(key, tenantSlug))
|
|
||||||
s.mu.Unlock()
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Tenant-Override hat Vorrang vor
|
|
||||||
// Global-Default, automatisiert getestet.
|
|
||||||
func TestService_TenantOverrideTakesPrecedenceOverGlobal(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_precedence_key", GlobalScope, "global-wert"); err != nil {
|
|
||||||
t.Fatalf("set global: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.Set(ctx, "test_precedence_key", "test_acme", "tenant-wert"); err != nil {
|
|
||||||
t.Fatalf("set tenant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
svc := NewService(store, time.Hour)
|
|
||||||
|
|
||||||
got, err := svc.Resolve(ctx, "test_acme", "test_precedence_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve mit override: %v", err)
|
|
||||||
}
|
|
||||||
if got.Value != "tenant-wert" {
|
|
||||||
t.Fatalf("erwartet tenant-override, habe %q", got.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
gotOther, err := svc.Resolve(ctx, "test_anderer_tenant", "test_precedence_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve ohne override: %v", err)
|
|
||||||
}
|
|
||||||
if gotOther.Value != "global-wert" {
|
|
||||||
t.Fatalf("erwartet global-default fuer tenant ohne override, habe %q", gotOther.Value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Cache-Invalidierung nach
|
|
||||||
// Konfigurationsaenderung innerhalb dokumentierter Zeit gemessen.
|
|
||||||
func TestService_CacheInvalidationTiming(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
const ttl = 150 * time.Millisecond
|
|
||||||
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "alt"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc := NewService(store, ttl)
|
|
||||||
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "alt" {
|
|
||||||
t.Fatalf("erwartet 'alt', habe %q", v.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
changedAt := time.Now()
|
|
||||||
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "neu"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
v, err = svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve direkt nach aenderung: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "alt" {
|
|
||||||
t.Fatalf("cache haette den alten wert liefern sollen, habe %q", v.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
deadline := changedAt.Add(ttl + 100*time.Millisecond)
|
|
||||||
for time.Now().Before(deadline) {
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value == "neu" {
|
|
||||||
t.Logf("aenderung wurde nach %s wirksam (ziel: innerhalb %s + toleranz)", time.Since(changedAt), ttl)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
time.Sleep(10 * time.Millisecond)
|
|
||||||
}
|
|
||||||
t.Fatalf("aenderung wurde nicht innerhalb von %s wirksam", deadline.Sub(changedAt))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestService_InvalidateForcesImmediateRefresh(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "alt"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc := NewService(store, time.Hour)
|
|
||||||
_, _ = svc.Resolve(ctx, "", "test_invalidate_key")
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "neu"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc.Invalidate("test_invalidate_key", "")
|
|
||||||
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_invalidate_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "neu" {
|
|
||||||
t.Fatalf("erwartet sofort sichtbaren neuen wert nach Invalidate, habe %q", v.Value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
// Package cfgservice implementiert Core CFG-01: den zentralen Dienst fuer
|
|
||||||
// globale und tenant-spezifische Konfigurationswerte mit Versionierung und
|
|
||||||
// Cache-Invalidierung. Andere Module lesen Konfiguration AUSSCHLIESSLICH
|
|
||||||
// ueber dieses Paket (Akzeptanzkriterium 3), niemals ueber eigene Tabellen.
|
|
||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GlobalScope ist der reservierte Scope-Wert fuer globale Defaults — jeder
|
|
||||||
// andere Scope-Wert ist ein Tenant-Slug (Akzeptanzkriterium 1).
|
|
||||||
const GlobalScope = "global"
|
|
||||||
|
|
||||||
var ErrNotFound = errors.New("cfgservice: kein wert fuer diesen key gefunden")
|
|
||||||
|
|
||||||
type Value struct {
|
|
||||||
Key string
|
|
||||||
Scope string
|
|
||||||
Value string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
type HistoryEntry struct {
|
|
||||||
Key string
|
|
||||||
Scope string
|
|
||||||
Value string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store ist die Schreib-/Verwaltungsseite. Set schreibt IMMER sowohl den
|
|
||||||
// aktuellen Stand (config_values) als auch einen Historieneintrag
|
|
||||||
// (config_value_history) in derselben Transaktion — eine Aenderung ohne
|
|
||||||
// Versionshistorie ist strukturell ausgeschlossen (Akzeptanzkriterium 2).
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set schreibt einen neuen Wert fuer (key, scope) und erhoeht die Version um 1
|
|
||||||
// (Version 1 bei erstmaligem Setzen).
|
|
||||||
func (s *Store) Set(ctx context.Context, key, scope, value string) (Value, error) {
|
|
||||||
if scope == "" {
|
|
||||||
return Value{}, errors.New("cfgservice: scope darf nicht leer sein")
|
|
||||||
}
|
|
||||||
|
|
||||||
tx, err := s.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return Value{}, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
var currentVersion int
|
|
||||||
err = tx.QueryRow(ctx, `SELECT version FROM config_values WHERE key = $1 AND scope = $2`, key, scope).Scan(¤tVersion)
|
|
||||||
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Value{}, fmt.Errorf("aktuelle version lesen: %w", err)
|
|
||||||
}
|
|
||||||
newVersion := currentVersion + 1
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO config_values (key, scope, value, version, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
ON CONFLICT (key, scope) DO UPDATE SET value = $3, version = $4, updated_at = now()
|
|
||||||
`, key, scope, value, newVersion); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("wert speichern: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO config_value_history (key, scope, value, version, changed_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
`, key, scope, value, newVersion); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("historie schreiben: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return Value{Key: key, Scope: scope, Value: value, Version: newVersion}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get liefert den Wert fuer GENAU EINEN Scope (kein Vorrang-Fallback) — die
|
|
||||||
// Vorrangregel (Tenant vor Global) lebt bewusst in Service.Resolve, damit
|
|
||||||
// Store rein CRUD bleibt.
|
|
||||||
func (s *Store) Get(ctx context.Context, key, scope string) (Value, error) {
|
|
||||||
var v Value
|
|
||||||
v.Key, v.Scope = key, scope
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT value, version FROM config_values WHERE key = $1 AND scope = $2
|
|
||||||
`, key, scope).Scan(&v.Value, &v.Version)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Value{}, ErrNotFound
|
|
||||||
}
|
|
||||||
return Value{}, fmt.Errorf("wert lesen: %w", err)
|
|
||||||
}
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// History liefert die vollstaendige Versionshistorie eines (key, scope) in
|
|
||||||
// aufsteigender Reihenfolge (Akzeptanzkriterium 2 / Pruefung 3).
|
|
||||||
func (s *Store) History(ctx context.Context, key, scope string) ([]HistoryEntry, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT key, scope, value, version FROM config_value_history
|
|
||||||
WHERE key = $1 AND scope = $2 ORDER BY version
|
|
||||||
`, key, scope)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("historie abfragen: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []HistoryEntry
|
|
||||||
for rows.Next() {
|
|
||||||
var h HistoryEntry
|
|
||||||
if err := rows.Scan(&h.Key, &h.Scope, &h.Value, &h.Version); err != nil {
|
|
||||||
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, h)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupStoreTest(t *testing.T) (*Store, 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, `
|
|
||||||
CREATE TABLE IF NOT EXISTS config_values (
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL CHECK (scope <> ''),
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (key, scope)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS config_value_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL,
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM config_value_history WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM config_values WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return NewStore(pool), cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStore_SetIncrementsVersion(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
v1, err := store.Set(ctx, "test_key", GlobalScope, "erster-wert")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("set 1: %v", err)
|
|
||||||
}
|
|
||||||
if v1.Version != 1 {
|
|
||||||
t.Fatalf("erwartet version 1, habe %d", v1.Version)
|
|
||||||
}
|
|
||||||
|
|
||||||
v2, err := store.Set(ctx, "test_key", GlobalScope, "zweiter-wert")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("set 2: %v", err)
|
|
||||||
}
|
|
||||||
if v2.Version != 2 {
|
|
||||||
t.Fatalf("erwartet version 2, habe %d", v2.Version)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := store.Get(ctx, "test_key", GlobalScope)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get: %v", err)
|
|
||||||
}
|
|
||||||
if got.Value != "zweiter-wert" || got.Version != 2 {
|
|
||||||
t.Fatalf("aktueller wert unerwartet: %+v", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 3: Versionierungshistorie ueber mehrere
|
|
||||||
// Aenderungen hinweg nachvollzogen.
|
|
||||||
func TestStore_HistoryTracksAllChanges(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
values := []string{"v1", "v2", "v3"}
|
|
||||||
for _, v := range values {
|
|
||||||
if _, err := store.Set(ctx, "test_history_key", GlobalScope, v); err != nil {
|
|
||||||
t.Fatalf("set %q: %v", v, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := store.History(ctx, "test_history_key", GlobalScope)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 3 {
|
|
||||||
t.Fatalf("erwartet 3 historieneintraege, habe %d", len(history))
|
|
||||||
}
|
|
||||||
for i, h := range history {
|
|
||||||
if h.Version != i+1 || h.Value != values[i] {
|
|
||||||
t.Fatalf("historieneintrag[%d] unerwartet: %+v", i, h)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStore_GetUnknownKeyReturnsNotFound(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Get(ctx, "test_nie_gesetzt", GlobalScope); !errors.Is(err, ErrNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrNotFound, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*TemplateStore, *InAppStore, 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, `
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_templates (
|
|
||||||
tenant_slug TEXT NOT NULL, key TEXT NOT NULL, subject TEXT NOT NULL, body TEXT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (tenant_slug, key)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS in_app_notifications (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), tenant_slug TEXT NOT NULL, user_id TEXT NOT NULL,
|
|
||||||
title TEXT NOT NULL, body TEXT NOT NULL, read_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), channel TEXT NOT NULL, recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb, status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending','sent','failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0, max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(), last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return NewTemplateStore(pool), NewInAppStore(pool), cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func uniqueKey(prefix string) string {
|
|
||||||
return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Vorlagenrendering mit fehlenden
|
|
||||||
// Platzhaltern bricht kontrolliert ab.
|
|
||||||
func TestRender_MissingPlaceholderAborts(t *testing.T) {
|
|
||||||
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
|
||||||
|
|
||||||
_, _, err := Render(tmpl, map[string]any{"name": "Alice"}) // "code" fehlt
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("erwartet fehler bei fehlendem platzhalter 'code'")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRender_SucceedsWithAllPlaceholders(t *testing.T) {
|
|
||||||
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
|
||||||
|
|
||||||
subject, body, err := Render(tmpl, map[string]any{"name": "Alice", "code": "1234"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("render: %v", err)
|
|
||||||
}
|
|
||||||
if subject != "Hallo Alice" || body != "Dein Code: 1234" {
|
|
||||||
t.Fatalf("unerwartet: subject=%q body=%q", subject, body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Vorlagen pro Tenant anpassbar, Fallback auf global.
|
|
||||||
func TestTemplateStore_TenantOverrideFallsBackToGlobal(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
key := uniqueKey("welcome")
|
|
||||||
if err := templates.Set(ctx, GlobalTemplateScope, key, "Willkommen", "Standardtext"); err != nil {
|
|
||||||
t.Fatalf("set global: %v", err)
|
|
||||||
}
|
|
||||||
if err := templates.Set(ctx, "acme", key, "Willkommen bei ACME", "ACME-Text"); err != nil {
|
|
||||||
t.Fatalf("set tenant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := templates.Resolve(ctx, "acme", key)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve acme: %v", err)
|
|
||||||
}
|
|
||||||
if got.Subject != "Willkommen bei ACME" {
|
|
||||||
t.Fatalf("erwartet tenant-vorlage, habe %q", got.Subject)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err = templates.Resolve(ctx, "globex", key) // hat keine eigene vorlage
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve globex: %v", err)
|
|
||||||
}
|
|
||||||
if got.Subject != "Willkommen" {
|
|
||||||
t.Fatalf("erwartet global-fallback, habe %q", got.Subject)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: als gelesen markiert wird korrekt gefuehrt.
|
|
||||||
func TestInAppStore_MarkReadIsReflectedCorrectly(t *testing.T) {
|
|
||||||
_, inApp, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
userID := uniqueKey("user")
|
|
||||||
id, err := inApp.Create(ctx, "acme", userID, "Titel", "Text")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
list, err := inApp.ListForUser(ctx, "acme", userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list (vor markierung): %v", err)
|
|
||||||
}
|
|
||||||
if len(list) != 1 || list[0].ReadAt != nil {
|
|
||||||
t.Fatalf("erwartet 1 ungelesene benachrichtigung, habe %+v", list)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := inApp.MarkRead(ctx, id); err != nil {
|
|
||||||
t.Fatalf("mark read: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
list, err = inApp.ListForUser(ctx, "acme", userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list (nach markierung): %v", err)
|
|
||||||
}
|
|
||||||
if len(list) != 1 || list[0].ReadAt == nil {
|
|
||||||
t.Fatalf("erwartet als gelesen markiert, habe %+v", list)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// EmailSender bricht ab, BEVOR SMTP ueberhaupt kontaktiert wird, wenn keine
|
|
||||||
// Vorlage aufloesbar ist — Nachweis, dass der Abbruch vor dem Netzwerkzugriff
|
|
||||||
// erfolgt (Akzeptanzkriterium 1).
|
|
||||||
func TestEmailSender_AbortsBeforeSMTPWhenTemplateMissing(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
|
||||||
|
|
||||||
err := sender.Send(ctx, notify.Notification{
|
|
||||||
Recipient: "user@example.com",
|
|
||||||
Payload: map[string]any{"template_key": uniqueKey("nie_konfiguriert"), "tenant_slug": "acme"},
|
|
||||||
})
|
|
||||||
if !errors.Is(err, ErrTemplateNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrTemplateNotFound (kein smtp-versuch), habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: E-Mail-Versand bei nicht erreichbarem
|
|
||||||
// SMTP-Server loest das dokumentierte Retry-Verhalten ueber CFG-02 aus.
|
|
||||||
func TestEmailSender_TriggersDispatcherRetryOnUnreachableSMTP(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
defer pool.Close()
|
|
||||||
|
|
||||||
key := uniqueKey("retry_test")
|
|
||||||
if err := templates.Set(ctx, GlobalTemplateScope, key, "Betreff", "Text ohne Platzhalter"); err != nil {
|
|
||||||
t.Fatalf("set template: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
|
||||||
dispatcher := notify.NewDispatcher(pool).WithRetryPolicy(2, time.Millisecond)
|
|
||||||
|
|
||||||
jobID, err := dispatcher.Enqueue(ctx, "email", "user@example.com", map[string]any{"template_key": key, "tenant_slug": "acme"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
time.Sleep(5 * time.Millisecond)
|
|
||||||
if _, _, err := dispatcher.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Fatalf("process due %d: %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var status string
|
|
||||||
var attempts int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, jobID).Scan(&status, &attempts); err != nil {
|
|
||||||
t.Fatalf("status lesen: %v", err)
|
|
||||||
}
|
|
||||||
if status != "failed" {
|
|
||||||
t.Fatalf("erwartet status failed nach ausgeschoepften wiederholungen bei unerreichbarem smtp, habe %q", status)
|
|
||||||
}
|
|
||||||
if attempts != 2 {
|
|
||||||
t.Fatalf("erwartet 2 versuche, habe %d", attempts)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"net/smtp"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EmailSender implementiert notify.Sender fuer den E-Mail-Kanal
|
|
||||||
// (Akzeptanzkriterium 1). SMTP-Zugangsdaten kommen ausschliesslich aus
|
|
||||||
// Umgebungsvariablen, nie aus Code/DB.
|
|
||||||
type EmailSender struct {
|
|
||||||
templates *TemplateStore
|
|
||||||
host string
|
|
||||||
port string
|
|
||||||
from string
|
|
||||||
username string
|
|
||||||
password string
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEmailSenderFromEnv liest NEXARCH_SMTP_HOST/PORT/FROM (Pflicht) sowie
|
|
||||||
// optional NEXARCH_SMTP_USER/PASSWORD.
|
|
||||||
func NewEmailSenderFromEnv(templates *TemplateStore) (*EmailSender, error) {
|
|
||||||
host := os.Getenv("NEXARCH_SMTP_HOST")
|
|
||||||
port := os.Getenv("NEXARCH_SMTP_PORT")
|
|
||||||
from := os.Getenv("NEXARCH_SMTP_FROM")
|
|
||||||
if host == "" || port == "" || from == "" {
|
|
||||||
return nil, fmt.Errorf("channels: NEXARCH_SMTP_HOST/PORT/FROM muessen gesetzt sein")
|
|
||||||
}
|
|
||||||
return &EmailSender{
|
|
||||||
templates: templates,
|
|
||||||
host: host,
|
|
||||||
port: port,
|
|
||||||
from: from,
|
|
||||||
username: os.Getenv("NEXARCH_SMTP_USER"),
|
|
||||||
password: os.Getenv("NEXARCH_SMTP_PASSWORD"),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEmailSender erlaubt Tests, Host/Port explizit zu setzen (z.B. einen
|
|
||||||
// absichtlich nicht erreichbaren Host fuer den Retry-Nachweis), ohne
|
|
||||||
// Umgebungsvariablen zu benoetigen.
|
|
||||||
func NewEmailSender(templates *TemplateStore, host, port, from string) *EmailSender {
|
|
||||||
return &EmailSender{templates: templates, host: host, port: port, from: from}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send rendert zuerst die Vorlage — schlaegt das fehl (z.B. fehlender
|
|
||||||
// Platzhalter), wird NIE eine SMTP-Verbindung aufgebaut
|
|
||||||
// (Akzeptanzkriterium 1 / Pruefung 1: kontrollierter Abbruch statt
|
|
||||||
// fehlerhafter Mail). Ein danach fehlschlagender SMTP-Versand liefert einen
|
|
||||||
// Fehler zurueck, den CFG-02s Dispatcher fuer die bereits getestete
|
|
||||||
// Wiederholungslogik nutzt (Akzeptanzkriterium 3 / Pruefung 3) — kein
|
|
||||||
// zweiter Retry-Mechanismus hier.
|
|
||||||
func (e *EmailSender) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
templateKey, _ := n.Payload["template_key"].(string)
|
|
||||||
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
|
||||||
|
|
||||||
tmpl, err := e.templates.Resolve(ctx, tenantSlug, templateKey)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("vorlage aufloesen: %w", err)
|
|
||||||
}
|
|
||||||
subject, body, err := Render(tmpl, n.Payload)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
msg := []byte("Subject: " + subject + "\r\n\r\n" + body)
|
|
||||||
|
|
||||||
var auth smtp.Auth
|
|
||||||
if e.username != "" {
|
|
||||||
auth = smtp.PlainAuth("", e.username, e.password, e.host)
|
|
||||||
}
|
|
||||||
addr := e.host + ":" + e.port
|
|
||||||
if err := smtp.SendMail(addr, auth, e.from, []string{n.Recipient}, msg); err != nil {
|
|
||||||
return fmt.Errorf("smtp-versand fehlgeschlagen: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
type InAppNotification struct {
|
|
||||||
ID string
|
|
||||||
TenantSlug string
|
|
||||||
UserID string
|
|
||||||
Title string
|
|
||||||
Body string
|
|
||||||
ReadAt *time.Time
|
|
||||||
CreatedAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// InAppStore persistiert In-App-Benachrichtigungen (Akzeptanzkriterium 2).
|
|
||||||
type InAppStore struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewInAppStore(pool *pgxpool.Pool) *InAppStore {
|
|
||||||
return &InAppStore{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *InAppStore) Create(ctx context.Context, tenantSlug, userID, title, body string) (string, error) {
|
|
||||||
var id string
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO in_app_notifications (tenant_slug, user_id, title, body)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
RETURNING id
|
|
||||||
`, tenantSlug, userID, title, body).Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("in-app-benachrichtigung speichern: %w", err)
|
|
||||||
}
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListForUser liefert alle Benachrichtigungen eines Benutzers (ueber API
|
|
||||||
// abrufbar, Akzeptanzkriterium 2).
|
|
||||||
func (s *InAppStore) ListForUser(ctx context.Context, tenantSlug, userID string) ([]InAppNotification, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT id, title, body, read_at, created_at FROM in_app_notifications
|
|
||||||
WHERE tenant_slug = $1 AND user_id = $2 ORDER BY created_at DESC
|
|
||||||
`, tenantSlug, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("benachrichtigungen auflisten: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []InAppNotification
|
|
||||||
for rows.Next() {
|
|
||||||
n := InAppNotification{TenantSlug: tenantSlug, UserID: userID}
|
|
||||||
if err := rows.Scan(&n.ID, &n.Title, &n.Body, &n.ReadAt, &n.CreatedAt); err != nil {
|
|
||||||
return nil, fmt.Errorf("benachrichtigung lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, n)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// MarkRead markiert eine Benachrichtigung als gelesen (Akzeptanzkriterium 2
|
|
||||||
// / Pruefung 2).
|
|
||||||
func (s *InAppStore) MarkRead(ctx context.Context, id string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `UPDATE in_app_notifications SET read_at = now() WHERE id = $1`, id)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("als gelesen markieren: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// InAppSender implementiert notify.Sender fuer den In-App-Kanal
|
|
||||||
// (Akzeptanzkriterium 2). Nutzt eine Vorlage, falls payload["template_key"]
|
|
||||||
// gesetzt ist, sonst direkt payload["title"]/["body"].
|
|
||||||
type InAppSender struct {
|
|
||||||
store *InAppStore
|
|
||||||
templates *TemplateStore
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewInAppSender(store *InAppStore, templates *TemplateStore) *InAppSender {
|
|
||||||
return &InAppSender{store: store, templates: templates}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *InAppSender) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
|
||||||
|
|
||||||
var title, body string
|
|
||||||
if templateKey, ok := n.Payload["template_key"].(string); ok && templateKey != "" {
|
|
||||||
tmpl, err := s.templates.Resolve(ctx, tenantSlug, templateKey)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
title, body, err = Render(tmpl, n.Payload)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
title, _ = n.Payload["title"].(string)
|
|
||||||
body, _ = n.Payload["body"].(string)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := s.store.Create(ctx, tenantSlug, n.Recipient, title, body)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Router waehlt anhand von Notification.Channel den zustaendigen Kanal aus
|
|
||||||
// — ein neuer Kanal wird per Register() ergaenzt, ohne den Dispatcher
|
|
||||||
// (CFG-02) oder Router selbst umzubauen (Unleash-artiger Strategie-Gedanke,
|
|
||||||
// siehe Ticket-DNA).
|
|
||||||
type Router struct {
|
|
||||||
channels map[string]notify.Sender
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRouter() *Router {
|
|
||||||
return &Router{channels: make(map[string]notify.Sender)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Router) Register(channel string, sender notify.Sender) {
|
|
||||||
r.channels[channel] = sender
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Router) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
sender, ok := r.channels[n.Channel]
|
|
||||||
if !ok {
|
|
||||||
return fmt.Errorf("channels: unbekannter kanal %q", n.Channel)
|
|
||||||
}
|
|
||||||
return sender.Send(ctx, n)
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
// Package channels implementiert Core CFG-03: konkrete Zustellkanaele fuer
|
|
||||||
// den CFG-02-Dispatcher (E-Mail, In-App) inklusive Vorlagenverwaltung.
|
|
||||||
// Neue Kanaele lassen sich ergaenzen, ohne den Dispatcher selbst
|
|
||||||
// anzufassen — jeder Kanal implementiert nur notify.Sender.
|
|
||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"text/template"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GlobalTemplateScope ist der Fallback-Wert, wenn ein Tenant keine eigene
|
|
||||||
// Vorlage konfiguriert hat (Akzeptanzkriterium 3).
|
|
||||||
const GlobalTemplateScope = "global"
|
|
||||||
|
|
||||||
var ErrTemplateNotFound = errors.New("channels: keine vorlage gefunden")
|
|
||||||
|
|
||||||
type Template struct {
|
|
||||||
Subject string
|
|
||||||
Body string
|
|
||||||
}
|
|
||||||
|
|
||||||
type TemplateStore struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTemplateStore(pool *pgxpool.Pool) *TemplateStore {
|
|
||||||
return &TemplateStore{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set legt eine Vorlage fuer einen Tenant (oder GlobalTemplateScope) fest.
|
|
||||||
func (s *TemplateStore) Set(ctx context.Context, tenantSlug, key, subject, body string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO notification_templates (tenant_slug, key, subject, body, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
ON CONFLICT (tenant_slug, key) DO UPDATE SET subject = $3, body = $4, updated_at = now()
|
|
||||||
`, tenantSlug, key, subject, body)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("vorlage speichern: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve liefert die Vorlage eines Tenants, faellt auf GlobalTemplateScope
|
|
||||||
// zurueck, wenn der Tenant keine eigene gesetzt hat (Akzeptanzkriterium 3).
|
|
||||||
func (s *TemplateStore) Resolve(ctx context.Context, tenantSlug, key string) (Template, error) {
|
|
||||||
if tenantSlug != "" && tenantSlug != GlobalTemplateScope {
|
|
||||||
if t, err := s.get(ctx, tenantSlug, key); err == nil {
|
|
||||||
return t, nil
|
|
||||||
} else if !errors.Is(err, ErrTemplateNotFound) {
|
|
||||||
return Template{}, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s.get(ctx, GlobalTemplateScope, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *TemplateStore) get(ctx context.Context, tenantSlug, key string) (Template, error) {
|
|
||||||
var t Template
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT subject, body FROM notification_templates WHERE tenant_slug = $1 AND key = $2
|
|
||||||
`, tenantSlug, key).Scan(&t.Subject, &t.Body)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Template{}, ErrTemplateNotFound
|
|
||||||
}
|
|
||||||
return Template{}, fmt.Errorf("vorlage lesen: %w", err)
|
|
||||||
}
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Render fuellt eine Vorlage mit data. Fehlt ein referenzierter Platzhalter
|
|
||||||
// in data, bricht das Rendering kontrolliert MIT FEHLER ab, statt eine
|
|
||||||
// fehlerhafte/unvollstaendige Nachricht zu erzeugen (Akzeptanzkriterium 1 /
|
|
||||||
// Pruefung 1) — text/template mit Option("missingkey=error") liefert dafuer
|
|
||||||
// einen Fehler statt stillschweigend "<no value>" einzusetzen.
|
|
||||||
func Render(tmpl Template, data map[string]any) (subject, body string, err error) {
|
|
||||||
subject, err = renderOne("subject", tmpl.Subject, data)
|
|
||||||
if err != nil {
|
|
||||||
return "", "", err
|
|
||||||
}
|
|
||||||
body, err = renderOne("body", tmpl.Body, data)
|
|
||||||
if err != nil {
|
|
||||||
return "", "", err
|
|
||||||
}
|
|
||||||
return subject, body, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func renderOne(name, text string, data map[string]any) (string, error) {
|
|
||||||
tmpl, err := template.New(name).Option("missingkey=error").Parse(text)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("vorlage %q parsen: %w", name, err)
|
|
||||||
}
|
|
||||||
var buf bytes.Buffer
|
|
||||||
if err := tmpl.Execute(&buf, data); err != nil {
|
|
||||||
return "", fmt.Errorf("vorlage %q rendern (fehlender platzhalter?): %w", name, err)
|
|
||||||
}
|
|
||||||
return buf.String(), nil
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
// Package ldapsync implementiert Core IAM-05: LDAP/Active-Directory-
|
||||||
|
// Anbindung je Tenant fuer Benutzer-Synchronisation, Login-Delegation und
|
||||||
|
// Rollenzuordnung aus Gruppen ueber eine explizite Erlaubnis-Matrix.
|
||||||
|
//
|
||||||
|
// WICHTIGER HINWEIS: In dieser Umgebung steht kein echter LDAP/AD-Server zur
|
||||||
|
// Verfuegung (analog zur Archive-Engine bei AUD-05). Client ist deshalb eine
|
||||||
|
// Schnittstelle — die Sync-/Rollenzuordnungs-Logik ist gegen einen Fake in
|
||||||
|
// den Tests vollstaendig geprueft, eine echte Verbindungspruefung gegen
|
||||||
|
// LDAP/AD steht noch aus.
|
||||||
|
package ldapsync
|
||||||
|
|
||||||
|
// Entry ist ein aus LDAP gelesener Benutzerdatensatz.
|
||||||
|
type Entry struct {
|
||||||
|
Email string
|
||||||
|
Name string
|
||||||
|
Groups []string
|
||||||
|
Disabled bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Client abstrahiert die eigentliche LDAP-Verbindung (Bind + Search).
|
||||||
|
type Client interface {
|
||||||
|
// Search liefert alle Benutzer, die dem konfigurierten Filter
|
||||||
|
// entsprechen. Ein Fehler bedeutet "Quelle nicht erreichbar oder
|
||||||
|
// fehlerhaft" — Run() bricht dann komplett und folgenlos ab
|
||||||
|
// (Akzeptanzkriterium 2).
|
||||||
|
Search() ([]Entry, error)
|
||||||
|
}
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
package ldapsync
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
type fakeClient struct {
|
||||||
|
entries []Entry
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeClient) Search() ([]Entry, error) {
|
||||||
|
if f.err != nil {
|
||||||
|
return nil, f.err
|
||||||
|
}
|
||||||
|
return f.entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*user.TenantUserStore, *rbac.Store, *RoleMappingStore, 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, `
|
||||||
|
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'))
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return user.NewTenantUserStore(pool), rbac.NewStore(pool), NewRoleMappingStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func uniqueEmail() string {
|
||||||
|
return fmt.Sprintf("ldap-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: Rollen-Erlaubnis-Matrix mit Positiv- und
|
||||||
|
// Negativfaellen — keine Privilege-Escalation ueber Gruppenmitgliedschaft.
|
||||||
|
func TestRoleMapping_PositiveAndNegativeCases(t *testing.T) {
|
||||||
|
_, _, mappings, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := mappings.SetMapping(ctx, "cn=IT-Admins,ou=groups,dc=example,dc=com", rbac.RoleTenantAdmin); err != nil {
|
||||||
|
t.Fatalf("set mapping: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Positivfall: gemappte Gruppe liefert die konfigurierte Rolle.
|
||||||
|
role, ok, err := mappings.HighestRoleFor(ctx, []string{"cn=IT-Admins,ou=groups,dc=example,dc=com"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("highest role: %v", err)
|
||||||
|
}
|
||||||
|
if !ok || role != rbac.RoleTenantAdmin {
|
||||||
|
t.Fatalf("erwartet tenant_admin, habe ok=%v role=%q", ok, role)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negativfall 1: unbekannte Gruppe vergibt keine Rolle.
|
||||||
|
_, ok, err = mappings.HighestRoleFor(ctx, []string{"cn=Praktikanten,ou=groups,dc=example,dc=com"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("highest role (unbekannt): %v", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("erwartet KEINE rolle fuer nicht gemappte gruppe")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negativfall 2 (Privilege-Escalation-Versuch): eine Gruppe, die zufaellig
|
||||||
|
// wie eine interne Rolle heisst, aber NIE explizit gemappt wurde, darf
|
||||||
|
// keine Rolle vergeben.
|
||||||
|
_, ok, err = mappings.HighestRoleFor(ctx, []string{"tenant_admin", "superadmin"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("highest role (namens-trick): %v", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("erwartet KEINE privilege-escalation ueber gruppennamen, die wie rollen aussehen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Synchronisationslauf legt Benutzer an.
|
||||||
|
func TestSyncer_CreatesUsers(t *testing.T) {
|
||||||
|
users, roles, mappings, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
email := uniqueEmail()
|
||||||
|
client := &fakeClient{entries: []Entry{{Email: email, Name: "LDAP Nutzer"}}}
|
||||||
|
syncer := NewSyncer(client, users, roles, mappings)
|
||||||
|
|
||||||
|
result, err := syncer.Run(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("run: %v", err)
|
||||||
|
}
|
||||||
|
if result.Created != 1 {
|
||||||
|
t.Fatalf("erwartet 1 angelegten benutzer, habe %d", result.Created)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := users.GetByEmailForAuth(ctx, email); err != nil {
|
||||||
|
t.Fatalf("benutzer sollte existieren: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: fehlerhafte/nicht erreichbare LDAP-
|
||||||
|
// Quelle bricht kontrolliert ab, ohne bestehende Konten zu beschaedigen.
|
||||||
|
func TestSyncer_AbortsCleanlyOnSourceError(t *testing.T) {
|
||||||
|
users, roles, mappings, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// Ein bereits bestehendes Konto, das UNBERUEHRT bleiben muss.
|
||||||
|
existingEmail := uniqueEmail()
|
||||||
|
existing, err := users.Create(ctx, existingEmail, "Bestehender Nutzer")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create existing: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
client := &fakeClient{err: errors.New("ldap-server nicht erreichbar (simuliert)")}
|
||||||
|
syncer := NewSyncer(client, users, roles, mappings)
|
||||||
|
|
||||||
|
if _, err := syncer.Run(ctx); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei nicht erreichbarer ldap-quelle")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bestehendes Konto unveraendert (noch aktiv, keine geloeschten/neuen Zeilen).
|
||||||
|
got, err := users.Get(ctx, existing.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("bestehendes konto sollte weiterhin existieren: %v", err)
|
||||||
|
}
|
||||||
|
if got.Status != user.StatusActive {
|
||||||
|
t.Fatalf("bestehendes konto sollte unveraendert aktiv sein, ist %q", got.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Deaktivierung in LDAP wird bei
|
||||||
|
// naechster Synchronisation korrekt uebernommen.
|
||||||
|
func TestSyncer_AppliesDeactivationOnNextRun(t *testing.T) {
|
||||||
|
users, roles, mappings, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
email := uniqueEmail()
|
||||||
|
client := &fakeClient{entries: []Entry{{Email: email, Name: "Wird Deaktiviert"}}}
|
||||||
|
syncer := NewSyncer(client, users, roles, mappings)
|
||||||
|
|
||||||
|
if _, err := syncer.Run(ctx); err != nil {
|
||||||
|
t.Fatalf("erster lauf: %v", err)
|
||||||
|
}
|
||||||
|
u, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("benutzer nach erstem lauf: %v", err)
|
||||||
|
}
|
||||||
|
if u.User.Status != user.StatusActive {
|
||||||
|
t.Fatalf("erwartet aktiv nach erstem lauf, habe %q", u.User.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Zweiter Lauf: derselbe Benutzer ist jetzt in LDAP deaktiviert.
|
||||||
|
client.entries[0].Disabled = true
|
||||||
|
result, err := syncer.Run(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("zweiter lauf: %v", err)
|
||||||
|
}
|
||||||
|
if result.Deactivated != 1 {
|
||||||
|
t.Fatalf("erwartet 1 deaktivierung, habe %d", result.Deactivated)
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err = users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("benutzer nach zweitem lauf: %v", err)
|
||||||
|
}
|
||||||
|
if u.User.Status != user.StatusInactive {
|
||||||
|
t.Fatalf("erwartet inaktiv nach deaktivierung in ldap, habe %q", u.User.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package ldapsync
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RoleMappingStore verwaltet die Erlaubnis-Matrix LDAP-Gruppe -> Rolle
|
||||||
|
// (Akzeptanzkriterium 3). Nur explizit gemappte Gruppen vergeben eine Rolle
|
||||||
|
// — der Schutz gegen Privilege-Escalation ist strukturell: es gibt keinen
|
||||||
|
// Code-Pfad, der eine unbekannte Gruppe irgendeiner Rolle zuordnet.
|
||||||
|
type RoleMappingStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRoleMappingStore(pool *pgxpool.Pool) *RoleMappingStore {
|
||||||
|
return &RoleMappingStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMapping ordnet eine LDAP-Gruppe genau einer NEXARCH-Rolle zu. Nur
|
||||||
|
// 'user'/'tenant_admin' sind zuweisbar (dieselbe Matrix wie RBAC-01/03) —
|
||||||
|
// 'superadmin' bleibt mandantenuebergreifend und nie ueber LDAP erreichbar.
|
||||||
|
func (s *RoleMappingStore) SetMapping(ctx context.Context, ldapGroup string, role rbac.Role) error {
|
||||||
|
if role != rbac.RoleUser && role != rbac.RoleTenantAdmin {
|
||||||
|
return fmt.Errorf("ldapsync: rolle %q ist ueber ldap nicht zuweisbar", role)
|
||||||
|
}
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO ldap_group_role_mapping (ldap_group, role) VALUES ($1, $2)
|
||||||
|
ON CONFLICT (ldap_group) DO UPDATE SET role = $2
|
||||||
|
`, ldapGroup, string(role))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("gruppenzuordnung speichern: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// roleFor liefert die einer LDAP-Gruppe zugeordnete Rolle, sofern konfiguriert.
|
||||||
|
func (s *RoleMappingStore) roleFor(ctx context.Context, ldapGroup string) (rbac.Role, bool, error) {
|
||||||
|
var role string
|
||||||
|
err := s.pool.QueryRow(ctx, `SELECT role FROM ldap_group_role_mapping WHERE ldap_group = $1`, ldapGroup).Scan(&role)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return "", false, nil
|
||||||
|
}
|
||||||
|
return "", false, fmt.Errorf("gruppenzuordnung lesen: %w", err)
|
||||||
|
}
|
||||||
|
return rbac.Role(role), true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// HighestRoleFor bestimmt aus einer Liste von LDAP-Gruppen die hoechste
|
||||||
|
// zugeordnete Rolle (tenant_admin > user). Gruppen ohne Eintrag in der
|
||||||
|
// Matrix tragen NICHTS bei — auch nicht, wenn ihr Name zufaellig wie eine
|
||||||
|
// interne Rolle aussieht (Akzeptanzkriterium 3 / Pruefung 1: keine
|
||||||
|
// Privilege-Escalation ueber Gruppenmitgliedschaft).
|
||||||
|
func (s *RoleMappingStore) HighestRoleFor(ctx context.Context, ldapGroups []string) (rbac.Role, bool, error) {
|
||||||
|
var best rbac.Role
|
||||||
|
found := false
|
||||||
|
|
||||||
|
for _, g := range ldapGroups {
|
||||||
|
role, ok, err := s.roleFor(ctx, g)
|
||||||
|
if err != nil {
|
||||||
|
return "", false, err
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !found || role == rbac.RoleTenantAdmin {
|
||||||
|
best = role
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best, found, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package ldapsync
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SyncResult fasst das Ergebnis eines Synchronisationslaufs zusammen.
|
||||||
|
type SyncResult struct {
|
||||||
|
Created int
|
||||||
|
Updated int
|
||||||
|
Deactivated int
|
||||||
|
Failed []string // Email-Adressen, bei denen die Verarbeitung fehlschlug
|
||||||
|
}
|
||||||
|
|
||||||
|
// Syncer fuehrt die Benutzer-/Rollen-Synchronisation aus LDAP aus.
|
||||||
|
type Syncer struct {
|
||||||
|
client Client
|
||||||
|
users *user.TenantUserStore
|
||||||
|
roles *rbac.Store
|
||||||
|
mappings *RoleMappingStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSyncer(client Client, users *user.TenantUserStore, roles *rbac.Store, mappings *RoleMappingStore) *Syncer {
|
||||||
|
return &Syncer{client: client, users: users, roles: roles, mappings: mappings}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run synchronisiert Benutzer aus LDAP (Akzeptanzkriterium 1). Ist die
|
||||||
|
// LDAP-Quelle nicht erreichbar/fehlerhaft, wird SOFORT und OHNE jede
|
||||||
|
// Aenderung an bestehenden Konten abgebrochen (Akzeptanzkriterium 2 /
|
||||||
|
// Pruefung 2) — Search() wird als allererstes aufgerufen, bevor irgendein
|
||||||
|
// Schreibzugriff stattfindet.
|
||||||
|
func (s *Syncer) Run(ctx context.Context) (SyncResult, error) {
|
||||||
|
entries, err := s.client.Search()
|
||||||
|
if err != nil {
|
||||||
|
return SyncResult{}, fmt.Errorf("ldap-quelle nicht erreichbar, synchronisation abgebrochen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var result SyncResult
|
||||||
|
for _, entry := range entries {
|
||||||
|
if err := s.syncOne(ctx, entry, &result); err != nil {
|
||||||
|
// Ein fehlerhafter Einzeleintrag isoliert sich selbst — er
|
||||||
|
// beschaedigt weder bereits verarbeitete noch nachfolgende
|
||||||
|
// Konten (Akzeptanzkriterium 2).
|
||||||
|
result.Failed = append(result.Failed, entry.Email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Syncer) syncOne(ctx context.Context, entry Entry, result *SyncResult) error {
|
||||||
|
existing, err := s.users.GetByEmailForAuth(ctx, entry.Email)
|
||||||
|
isNew := errors.Is(err, user.ErrNotFound)
|
||||||
|
if err != nil && !isNew {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var userID string
|
||||||
|
if isNew {
|
||||||
|
created, err := s.users.Create(ctx, entry.Email, entry.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
userID = created.ID
|
||||||
|
result.Created++
|
||||||
|
} else {
|
||||||
|
userID = existing.User.ID
|
||||||
|
result.Updated++
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deaktivierung in LDAP wird uebernommen (Akzeptanzkriterium 3 / Pruefung 3).
|
||||||
|
if entry.Disabled {
|
||||||
|
if _, err := s.users.Deactivate(ctx, userID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
result.Deactivated++
|
||||||
|
}
|
||||||
|
|
||||||
|
role, ok, err := s.mappings.HighestRoleFor(ctx, entry.Groups)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
if _, err := s.roles.Assign(ctx, userID, role, "ldap-sync"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
// Package notify implementiert Core CFG-02: den zentralen Benachrichtigungs-
|
|
||||||
// Dispatcher, ueber den beliebige Module Benachrichtigungen ausloesen —
|
|
||||||
// Warteschlange, Wiederholungslogik, Kanal-Abstraktion. Die tatsaechlichen
|
|
||||||
// Kanaele (E-Mail/In-App) sind CFG-03, hier gibt es nur die Sender-
|
|
||||||
// Schnittstelle als Vorbereitung.
|
|
||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultMaxAttempts begrenzt Wiederholungsversuche (Akzeptanzkriterium 2) —
|
|
||||||
// nach dieser Anzahl gibt der Dispatcher kontrolliert auf (status=failed)
|
|
||||||
// statt endlos zu wiederholen.
|
|
||||||
const DefaultMaxAttempts = 5
|
|
||||||
|
|
||||||
// DefaultRetryBackoff ist die Basis-Wartezeit zwischen Wiederholungen,
|
|
||||||
// linear mit der Versuchsnummer skaliert.
|
|
||||||
const DefaultRetryBackoff = 200 * time.Millisecond
|
|
||||||
|
|
||||||
type Notification struct {
|
|
||||||
ID string
|
|
||||||
Channel string
|
|
||||||
Recipient string
|
|
||||||
Payload map[string]any
|
|
||||||
Attempts int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender ist die schmale Schnittstelle, die ein konkreter Kanal (CFG-03)
|
|
||||||
// implementiert. Der Dispatcher selbst weiss nichts ueber E-Mail/In-App.
|
|
||||||
type Sender interface {
|
|
||||||
Send(ctx context.Context, n Notification) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatcher ist die EINE Schnittstelle, ueber die Module Benachrichtigungen
|
|
||||||
// ausloesen — kein Modul baut eigenen Versandcode (Akzeptanzkriterium 1).
|
|
||||||
type Dispatcher struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
maxAttempts int
|
|
||||||
retryBackoff time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewDispatcher(pool *pgxpool.Pool) *Dispatcher {
|
|
||||||
return &Dispatcher{pool: pool, maxAttempts: DefaultMaxAttempts, retryBackoff: DefaultRetryBackoff}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithRetryPolicy erlaubt Tests/Betrieb, Versuchsanzahl und Backoff
|
|
||||||
// anzupassen, ohne die Default-Policy im Produktionscode zu veraendern.
|
|
||||||
func (d *Dispatcher) WithRetryPolicy(maxAttempts int, backoff time.Duration) *Dispatcher {
|
|
||||||
return &Dispatcher{pool: d.pool, maxAttempts: maxAttempts, retryBackoff: backoff}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enqueue reiht eine Benachrichtigung in die Postgres-Warteschlange ein und
|
|
||||||
// kehrt sofort zurueck — die Zeile ueberlebt jeden Neustart des Dispatcher-
|
|
||||||
// Prozesses unveraendert (Akzeptanzkriterium 3), da sie ausschliesslich in
|
|
||||||
// der Datenbank existiert, nicht im Prozessspeicher.
|
|
||||||
func (d *Dispatcher) Enqueue(ctx context.Context, channel, recipient string, payload map[string]any) (string, error) {
|
|
||||||
if payload == nil {
|
|
||||||
payload = map[string]any{}
|
|
||||||
}
|
|
||||||
payloadJSON, err := json.Marshal(payload)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("payload serialisieren: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var id string
|
|
||||||
err = d.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO notification_jobs (channel, recipient, payload, max_attempts)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
RETURNING id
|
|
||||||
`, channel, recipient, payloadJSON, d.maxAttempts).Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("benachrichtigung einreihen: %w", err)
|
|
||||||
}
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
@@ -1,219 +0,0 @@
|
|||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
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, `
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0,
|
|
||||||
max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
)`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return pool, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
type fakeSender struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
sentIDs []string
|
|
||||||
failUntil int
|
|
||||||
calls int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeSender) Send(ctx context.Context, n Notification) error {
|
|
||||||
f.mu.Lock()
|
|
||||||
defer f.mu.Unlock()
|
|
||||||
f.calls++
|
|
||||||
if f.calls <= f.failUntil {
|
|
||||||
return errors.New("simulierter zustellfehler")
|
|
||||||
}
|
|
||||||
f.sentIDs = append(f.sentIDs, n.ID)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeSender) sentCount() int {
|
|
||||||
f.mu.Lock()
|
|
||||||
defer f.mu.Unlock()
|
|
||||||
return len(f.sentIDs)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1: Module loesen ueber Enqueue aus, keine eigene
|
|
||||||
// Versandlogik noetig.
|
|
||||||
func TestDispatcher_EnqueueAndProcess(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool)
|
|
||||||
id, err := d.Enqueue(ctx, "email", "alice@example.com", map[string]any{"subject": "Willkommen"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
if id == "" {
|
|
||||||
t.Fatal("erwartet nicht-leere id")
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{}
|
|
||||||
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 1 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet sent=1 failed=0, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
if sender.sentCount() != 1 {
|
|
||||||
t.Fatalf("erwartet 1 zustellung, habe %d", sender.sentCount())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Wiederholungslogik greift bei
|
|
||||||
// simuliertem Fehler und bricht nach definierter Anzahl kontrolliert ab.
|
|
||||||
func TestProcessDue_RetriesThenGivesUpAfterMaxAttempts(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool).WithRetryPolicy(3, time.Millisecond)
|
|
||||||
id, err := d.Enqueue(ctx, "email", "bob@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{failUntil: 100} // schlaegt bei jedem versuch fehl
|
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
time.Sleep(5 * time.Millisecond) // next_attempt_at abwarten
|
|
||||||
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Fatalf("process %d: %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var status string
|
|
||||||
var attempts int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, id).Scan(&status, &attempts); err != nil {
|
|
||||||
t.Fatalf("status lesen: %v", err)
|
|
||||||
}
|
|
||||||
if status != "failed" {
|
|
||||||
t.Fatalf("erwartet status failed nach max_attempts, habe %q", status)
|
|
||||||
}
|
|
||||||
if attempts != 3 {
|
|
||||||
t.Fatalf("erwartet 3 versuche, habe %d", attempts)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Weiteres ProcessDue darf den bereits aufgegebenen job nicht mehr anfassen.
|
|
||||||
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process nach abbruch: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 0 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet keine weitere verarbeitung, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 1: Neustart des Dienstes waehrend offener
|
|
||||||
// Zustellung verliert keine Nachricht — simuliert durch eine komplett neue
|
|
||||||
// Dispatcher/Pool-Instanz nach dem Enqueue, bevor irgendetwas verarbeitet wurde.
|
|
||||||
func TestQueue_SurvivesRestartWithoutMessageLoss(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
firstInstance := NewDispatcher(pool)
|
|
||||||
id, err := firstInstance.Enqueue(ctx, "email", "carol@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// "Neustart": eine voellig neue Dispatcher-Instanz (repraesentiert einen
|
|
||||||
// neuen Prozess) verbindet sich neu und verarbeitet die Warteschlange —
|
|
||||||
// die Nachricht existiert ausschliesslich in Postgres, nicht im
|
|
||||||
// Prozessspeicher der ersten Instanz.
|
|
||||||
restartedInstance := NewDispatcher(pool)
|
|
||||||
sender := &fakeSender{}
|
|
||||||
sent, failed, err := restartedInstance.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process nach neustart: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 1 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet sent=1 nach neustart, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
if len(sender.sentIDs) != 1 || sender.sentIDs[0] != id {
|
|
||||||
t.Fatalf("erwartet zustellung der urspruenglichen nachricht %q, habe %v", id, sender.sentIDs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: zwei gleichzeitig ausloesende Module,
|
|
||||||
// beide Nachrichten werden korrekt (und nicht doppelt) zugestellt.
|
|
||||||
func TestProcessDue_ConcurrentDispatchBothDelivered(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool)
|
|
||||||
idA, err := d.Enqueue(ctx, "email", "modul-a@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue a: %v", err)
|
|
||||||
}
|
|
||||||
idB, err := d.Enqueue(ctx, "email", "modul-b@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue b: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{}
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Errorf("process: %v", err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
wg.Wait()
|
|
||||||
|
|
||||||
if sender.sentCount() != 2 {
|
|
||||||
t.Fatalf("erwartet genau 2 zustellungen, habe %d: %v", sender.sentCount(), sender.sentIDs)
|
|
||||||
}
|
|
||||||
seen := map[string]bool{}
|
|
||||||
for _, id := range sender.sentIDs {
|
|
||||||
if seen[id] {
|
|
||||||
t.Fatalf("nachricht %q wurde doppelt zugestellt", id)
|
|
||||||
}
|
|
||||||
seen[id] = true
|
|
||||||
}
|
|
||||||
if !seen[idA] || !seen[idB] {
|
|
||||||
t.Fatalf("erwartet beide nachrichten zugestellt, habe %v", sender.sentIDs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ProcessDue holt bis zu limit faellige Benachrichtigungen und versucht sie
|
|
||||||
// ueber sender zuzustellen. FOR UPDATE SKIP LOCKED serialisiert konkurrierende
|
|
||||||
// Aufrufe (Akzeptanzkriterium 3 / Pruefung 3: zwei gleichzeitig ausloesende
|
|
||||||
// Module duerfen sich nicht gegenseitig blockieren oder Nachrichten doppelt
|
|
||||||
// zustellen) — dieselbe Konvention wie internal/tenant.Lifecycle.ProcessDueDeletions.
|
|
||||||
func (d *Dispatcher) ProcessDue(ctx context.Context, sender Sender, limit int) (sent, failed int, err error) {
|
|
||||||
tx, err := d.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
rows, err := tx.Query(ctx, `
|
|
||||||
SELECT id, channel, recipient, payload, attempts, max_attempts
|
|
||||||
FROM notification_jobs
|
|
||||||
WHERE status = 'pending' AND next_attempt_at <= now()
|
|
||||||
ORDER BY created_at
|
|
||||||
FOR UPDATE SKIP LOCKED
|
|
||||||
LIMIT $1
|
|
||||||
`, limit)
|
|
||||||
if err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("faellige benachrichtigungen abfragen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
type due struct {
|
|
||||||
id, channel, recipient string
|
|
||||||
payload []byte
|
|
||||||
attempts, maxAttempts int
|
|
||||||
}
|
|
||||||
var candidates []due
|
|
||||||
for rows.Next() {
|
|
||||||
var c due
|
|
||||||
if err := rows.Scan(&c.id, &c.channel, &c.recipient, &c.payload, &c.attempts, &c.maxAttempts); err != nil {
|
|
||||||
rows.Close()
|
|
||||||
return 0, 0, fmt.Errorf("faellige benachrichtigung lesen: %w", err)
|
|
||||||
}
|
|
||||||
candidates = append(candidates, c)
|
|
||||||
}
|
|
||||||
rows.Close()
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return 0, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, c := range candidates {
|
|
||||||
var payload map[string]any
|
|
||||||
if err := json.Unmarshal(c.payload, &payload); err != nil {
|
|
||||||
payload = map[string]any{}
|
|
||||||
}
|
|
||||||
|
|
||||||
sendErr := sender.Send(ctx, Notification{
|
|
||||||
ID: c.id, Channel: c.channel, Recipient: c.recipient, Payload: payload, Attempts: c.attempts,
|
|
||||||
})
|
|
||||||
|
|
||||||
if sendErr == nil {
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs SET status = 'sent', updated_at = now() WHERE id = $1
|
|
||||||
`, c.id); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("erfolg speichern: %w", err)
|
|
||||||
}
|
|
||||||
sent++
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
newAttempts := c.attempts + 1
|
|
||||||
if newAttempts >= c.maxAttempts {
|
|
||||||
// Akzeptanzkriterium 2: kontrollierter Abbruch nach definierter
|
|
||||||
// Anzahl Versuche, kein endloses Wiederholen.
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs
|
|
||||||
SET status = 'failed', attempts = $2, last_error = $3, updated_at = now()
|
|
||||||
WHERE id = $1
|
|
||||||
`, c.id, newAttempts, sendErr.Error()); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("fehlschlag speichern: %w", err)
|
|
||||||
}
|
|
||||||
failed++
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
nextAttempt := time.Now().Add(time.Duration(newAttempts) * d.retryBackoff)
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs
|
|
||||||
SET attempts = $2, next_attempt_at = $3, last_error = $4, updated_at = now()
|
|
||||||
WHERE id = $1
|
|
||||||
`, c.id, newAttempts, nextAttempt, sendErr.Error()); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("wiederholung planen: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
return sent, failed, nil
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
// Package oidc implementiert Core IAM-06: SSO-Anmeldung ueber OpenID
|
||||||
|
// Connect gegen externe Identity-Provider.
|
||||||
|
//
|
||||||
|
// WICHTIGER HINWEIS: In dieser Umgebung ist kein registrierter externer
|
||||||
|
// OIDC-Provider (Client-ID/Secret bei Google/Okta/Azure AD o.ae.) verfuegbar,
|
||||||
|
// gegen den ein echter Authorization-Code-Redirect-Flow end-to-end
|
||||||
|
// durchgefuehrt werden koennte (analog AUD-05/Archive, IAM-05/LDAP). ANDERS
|
||||||
|
// als bei LDAP/Archive ist die eigentliche Token-VALIDIERUNG (JWKS-
|
||||||
|
// Signaturpruefung, Ablauf, Claims, Nonce/State) aber ein rein
|
||||||
|
// kryptographischer Vorgang ohne Netzwerkabhaengigkeit zur Testzeit — die
|
||||||
|
// Tests unten erzeugen ein eigenes RSA-Schluesselpaar, signieren ein
|
||||||
|
// ID-Token selbst und pruefen es exakt so, wie es ein echter Provider
|
||||||
|
// liefern wuerde. Nur der Redirect zu einem echten externen Provider bleibt
|
||||||
|
// ungeprueft.
|
||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rsa"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"math/big"
|
||||||
|
)
|
||||||
|
|
||||||
|
type jwk struct {
|
||||||
|
Kid string `json:"kid"`
|
||||||
|
Kty string `json:"kty"`
|
||||||
|
N string `json:"n"`
|
||||||
|
E string `json:"e"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwkSet struct {
|
||||||
|
Keys []jwk `json:"keys"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var ErrUnsupportedKeyType = errors.New("oidc: nicht unterstuetzter jwk-schluesseltyp")
|
||||||
|
|
||||||
|
// ParseJWKS dekodiert eine JWKS-Antwort (RFC 7517) in kid -> RSA-Public-Key.
|
||||||
|
// Nur RSA-Schluessel (kty=RSA, Standard bei allen gaengigen OIDC-Providern
|
||||||
|
// fuer ID-Tokens) werden unterstuetzt.
|
||||||
|
func ParseJWKS(data []byte) (map[string]*rsa.PublicKey, error) {
|
||||||
|
var set jwkSet
|
||||||
|
if err := json.Unmarshal(data, &set); err != nil {
|
||||||
|
return nil, fmt.Errorf("jwks parsen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
out := make(map[string]*rsa.PublicKey, len(set.Keys))
|
||||||
|
for _, k := range set.Keys {
|
||||||
|
if k.Kty != "RSA" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
pub, err := decodeRSAKey(k)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("schluessel %q dekodieren: %w", k.Kid, err)
|
||||||
|
}
|
||||||
|
out[k.Kid] = pub
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeRSAKey(k jwk) (*rsa.PublicKey, error) {
|
||||||
|
nBytes, err := base64.RawURLEncoding.DecodeString(k.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("modulus dekodieren: %w", err)
|
||||||
|
}
|
||||||
|
eBytes, err := base64.RawURLEncoding.DecodeString(k.E)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("exponent dekodieren: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
eBuf := make([]byte, 8)
|
||||||
|
copy(eBuf[8-len(eBytes):], eBytes)
|
||||||
|
e := int(binary.BigEndian.Uint64(eBuf))
|
||||||
|
|
||||||
|
return &rsa.PublicKey{N: new(big.Int).SetBytes(nBytes), E: e}, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
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"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompleteOIDCLogin verifiziert das ID-Token (Signatur, Ablauf, Aussteller,
|
||||||
|
// Nonce — Akzeptanzkriterium 3), loest den State einmalig ein
|
||||||
|
// (Akzeptanzkriterium/Pruefung 3), legt bei Bedarf einen lokalen Benutzer an
|
||||||
|
// und mapped Rollen aus den OIDC-Claims ueber DIESELBE Erlaubnis-Matrix wie
|
||||||
|
// IAM-05/LDAP (ldapsync.RoleMappingStore — kein zweiter, paralleler
|
||||||
|
// Mapping-Mechanismus, Akzeptanzkriterium 2). Bei Erfolg wird ein normales
|
||||||
|
// IAM-02-Sitzungs-Token ausgestellt.
|
||||||
|
func CompleteOIDCLogin(
|
||||||
|
ctx context.Context,
|
||||||
|
verifier *Verifier,
|
||||||
|
states *StateStore,
|
||||||
|
users *user.TenantUserStore,
|
||||||
|
roles *rbac.Store,
|
||||||
|
roleMapping *ldapsync.RoleMappingStore,
|
||||||
|
issuer *auth.TokenIssuer,
|
||||||
|
tenantSlug, state, idToken string,
|
||||||
|
) (token string, err error) {
|
||||||
|
nonce, err := states.Consume(ctx, state)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := verifier.VerifyWithNonce(idToken, nonce)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if claims.Email == "" {
|
||||||
|
return "", fmt.Errorf("%w: id-token ohne e-mail-claim", ErrInvalidToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := findOrCreateUser(ctx, users, claims.Email)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if role, ok, err := roleMapping.HighestRoleFor(ctx, claims.Roles); err != nil {
|
||||||
|
return "", err
|
||||||
|
} else if ok {
|
||||||
|
if _, err := roles.Assign(ctx, u.ID, role, "oidc-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,172 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rsa"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
|
||||||
|
"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"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupLoginTest(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, `
|
||||||
|
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'))
|
||||||
|
);
|
||||||
|
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: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + 3: End-to-End-Login gegen ein (selbst signiertes,
|
||||||
|
// aber protokollkorrektes) ID-Token — Signatur, Nonce, State, Rollen-Mapping,
|
||||||
|
// Sitzungs-Token-Ausstellung.
|
||||||
|
func TestCompleteOIDCLogin_EndToEnd(t *testing.T) {
|
||||||
|
pool, cleanup := setupLoginTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
states := NewStateStore(pool)
|
||||||
|
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, "sso-admins", rbac.RoleTenantAdmin); err != nil {
|
||||||
|
t.Fatalf("set mapping: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
state, nonce, err := states.Generate(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate state: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
email := fmt.Sprintf("oidc-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "idp-subject-123",
|
||||||
|
Email: email,
|
||||||
|
Nonce: nonce,
|
||||||
|
Roles: []string{"sso-admins"},
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
idToken := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
token, err := CompleteOIDCLogin(ctx, verifier, states, users, roles, roleMapping, issuer, "acme", state, idToken)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("complete oidc login: %v", err)
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
t.Fatal("erwartet nicht-leeres sitzungs-token")
|
||||||
|
}
|
||||||
|
|
||||||
|
assignment, err := roles.Get(ctx, mustGetUserID(t, ctx, users, email))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rollenzuweisung lesen: %v", err)
|
||||||
|
}
|
||||||
|
if assignment.Role != rbac.RoleTenantAdmin {
|
||||||
|
t.Fatalf("erwartet tenant_admin aus sso-admins-mapping, habe %q", assignment.Role)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Replay desselben state schlaegt fehl.
|
||||||
|
if _, err := CompleteOIDCLogin(ctx, verifier, states, users, roles, roleMapping, issuer, "acme", state, idToken); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei wiederverwendetem state (replay)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: keine Privilege-Escalation ueber
|
||||||
|
// manipulierte/unbekannte Rollen-Claims.
|
||||||
|
func TestCompleteOIDCLogin_UnmappedRoleGrantsNothing(t *testing.T) {
|
||||||
|
pool, cleanup := setupLoginTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
states := NewStateStore(pool)
|
||||||
|
users := user.NewTenantUserStore(pool)
|
||||||
|
roles := rbac.NewStore(pool)
|
||||||
|
roleMapping := ldapsync.NewRoleMappingStore(pool)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
state, nonce, err := states.Generate(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate state: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
email := fmt.Sprintf("oidc-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
claims := Claims{
|
||||||
|
Email: email,
|
||||||
|
Nonce: nonce,
|
||||||
|
// Versuch, sich ueber einen manipulierten Rollen-Claim
|
||||||
|
// hochzustufen — diese Gruppen wurden NIE gemappt.
|
||||||
|
Roles: []string{"tenant_admin", "superadmin"},
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
idToken := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
if _, err := CompleteOIDCLogin(ctx, verifier, states, users, roles, roleMapping, issuer, "acme", state, idToken); err != nil {
|
||||||
|
t.Fatalf("complete oidc login: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
userID := mustGetUserID(t, ctx, users, email)
|
||||||
|
if _, err := roles.Get(ctx, userID); err == nil {
|
||||||
|
t.Fatal("erwartet KEINE rollenzuweisung fuer nicht gemappte claims (privilege-escalation-versuch)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mustGetUserID(t *testing.T, ctx context.Context, users *user.TenantUserStore, email string) string {
|
||||||
|
t.Helper()
|
||||||
|
creds, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get user by email: %v", err)
|
||||||
|
}
|
||||||
|
return creds.User.ID
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrStateInvalid = errors.New("oidc: state ungueltig, bereits verwendet oder abgelaufen")
|
||||||
|
|
||||||
|
// DefaultStateTTL begrenzt, wie lange ein ausgestellter State/Nonce fuer den
|
||||||
|
// Redirect-Umweg zum Identity-Provider gueltig bleibt.
|
||||||
|
const DefaultStateTTL = 10 * time.Minute
|
||||||
|
|
||||||
|
type StateStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStateStore(pool *pgxpool.Pool) *StateStore {
|
||||||
|
return &StateStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate stellt state+nonce fuer einen neuen Login-Redirect aus. state
|
||||||
|
// wird als OAuth2-"state"-Parameter mitgeschickt (CSRF-Schutz), nonce
|
||||||
|
// erscheint spaeter im ID-Token und muss exakt uebereinstimmen (Replay-Schutz).
|
||||||
|
func (s *StateStore) Generate(ctx context.Context) (state, nonce string, err error) {
|
||||||
|
state, err = randomValue()
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
nonce, err = randomValue()
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO oidc_states (state, nonce, expires_at) VALUES ($1, $2, $3)
|
||||||
|
`, state, nonce, time.Now().Add(DefaultStateTTL))
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("state speichern: %w", err)
|
||||||
|
}
|
||||||
|
return state, nonce, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume loest einen State EINMALIG ein (Akzeptanzkriterium/Pruefung 3:
|
||||||
|
// Replay-Schutz) — atomar ueber WHERE used_at IS NULL, analog IAM-03/IAM-09.
|
||||||
|
// Ein zweiter Callback mit demselben state (z.B. durch einen Angreifer, der
|
||||||
|
// die Redirect-URL abgefangen hat) schlaegt fehl.
|
||||||
|
func (s *StateStore) Consume(ctx context.Context, state string) (nonce string, err error) {
|
||||||
|
err = s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE oidc_states SET used_at = now()
|
||||||
|
WHERE state = $1 AND used_at IS NULL AND expires_at > now()
|
||||||
|
RETURNING nonce
|
||||||
|
`, state).Scan(&nonce)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return "", ErrStateInvalid
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("state einloesen: %w", err)
|
||||||
|
}
|
||||||
|
return nonce, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func randomValue() (string, error) {
|
||||||
|
buf := make([]byte, 32)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(buf), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupStateTest(t *testing.T) (*StateStore, 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, `
|
||||||
|
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: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewStateStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium/Pruefung 3: State/Nonce-Handling gegen CSRF und Replay.
|
||||||
|
func TestStateStore_ConsumeIsSingleUse(t *testing.T) {
|
||||||
|
store, cleanup := setupStateTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
state, nonce, err := store.Generate(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
gotNonce, err := store.Consume(ctx, state)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("consume (erste einloesung): %v", err)
|
||||||
|
}
|
||||||
|
if gotNonce != nonce {
|
||||||
|
t.Fatalf("nonce = %q, want %q", gotNonce, nonce)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Consume(ctx, state); !errors.Is(err, ErrStateInvalid) {
|
||||||
|
t.Fatalf("erwartet ErrStateInvalid bei erneutem einloesen (replay), habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStateStore_RejectsUnknownState(t *testing.T) {
|
||||||
|
store, cleanup := setupStateTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.Consume(ctx, "niemals-ausgestellter-state"); !errors.Is(err, ErrStateInvalid) {
|
||||||
|
t.Fatalf("erwartet ErrStateInvalid, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rsa"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrInvalidToken = errors.New("oidc: id-token ungueltig, abgelaufen oder falscher aussteller")
|
||||||
|
|
||||||
|
// Claims sind die fuer NEXARCH relevanten OIDC-ID-Token-Claims.
|
||||||
|
type Claims struct {
|
||||||
|
Subject string `json:"sub"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Nonce string `json:"nonce"`
|
||||||
|
Roles []string `json:"roles"` // providerabhaengiger Claim-Name, hier vereinfacht fest "roles"
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verifier prueft ID-Tokens gegen den JWKS-Schluesselsatz eines konfigurierten
|
||||||
|
// Providers (Akzeptanzkriterium 3: fehlerhafte/abgelaufene Tokens werden
|
||||||
|
// abgewiesen).
|
||||||
|
type Verifier struct {
|
||||||
|
keys map[string]*rsa.PublicKey
|
||||||
|
issuer string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewVerifier(keys map[string]*rsa.PublicKey, issuer string) *Verifier {
|
||||||
|
return &Verifier{keys: keys, issuer: issuer}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft Signatur (gegen JWKS), Ablauf (jwt-Bibliothek lehnt
|
||||||
|
// abgelaufene Tokens automatisch ab) und Aussteller.
|
||||||
|
func (v *Verifier) Verify(idToken string) (*Claims, error) {
|
||||||
|
claims := &Claims{}
|
||||||
|
token, err := jwt.ParseWithClaims(idToken, claims, func(t *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := t.Method.(*jwt.SigningMethodRSA); !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
kid, _ := t.Header["kid"].(string)
|
||||||
|
key, ok := v.keys[kid]
|
||||||
|
if !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return key, nil
|
||||||
|
})
|
||||||
|
if err != nil || !token.Valid {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
if claims.Issuer != v.issuer {
|
||||||
|
return nil, fmt.Errorf("%w: unerwarteter aussteller %q", ErrInvalidToken, claims.Issuer)
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// VerifyWithNonce prueft zusaetzlich, dass der nonce-Claim im Token exakt
|
||||||
|
// dem bei der Anfrage ausgestellten Nonce entspricht — verhindert Replay
|
||||||
|
// eines fremden, gueltigen ID-Tokens (Akzeptanzkriterium/Pruefung 3).
|
||||||
|
func (v *Verifier) VerifyWithNonce(idToken, expectedNonce string) (*Claims, error) {
|
||||||
|
claims, err := v.Verify(idToken)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if claims.Nonce == "" || claims.Nonce != expectedNonce {
|
||||||
|
return nil, fmt.Errorf("%w: nonce stimmt nicht ueberein", ErrInvalidToken)
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/rsa"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
func generateTestKey(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 signTestToken(t *testing.T, key *rsa.PrivateKey, kid string, claims Claims) string {
|
||||||
|
t.Helper()
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims)
|
||||||
|
token.Header["kid"] = kid
|
||||||
|
s, err := token.SignedString(key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("sign token: %v", err)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_AcceptsValidToken(t *testing.T) {
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "user-123",
|
||||||
|
Email: "person@example.com",
|
||||||
|
Nonce: "erwarteter-nonce",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
got, err := verifier.Verify(tok)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if got.Email != "person@example.com" {
|
||||||
|
t.Fatalf("email = %q", got.Email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Token-Signatur- und Ablaufpruefung.
|
||||||
|
func TestVerify_RejectsExpiredToken(t *testing.T) {
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "user-123",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(-time.Hour)), // abgelaufen
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(tok); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei abgelaufenem token")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsWrongSigningKey(t *testing.T) {
|
||||||
|
realKey := generateTestKey(t)
|
||||||
|
attackerKey := generateTestKey(t)
|
||||||
|
// Verifier kennt NUR den echten oeffentlichen Schluessel.
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &realKey.PublicKey}, "https://idp.example.com")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "user-123",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
// Mit dem Angreifer-Schluessel signiert, aber unter demselben kid wie der echte.
|
||||||
|
tok := signTestToken(t, attackerKey, "kid-1", claims)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(tok); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei fremd signiertem token")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsWrongIssuer(t *testing.T) {
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "user-123",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://ganz-anderer-idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(tok); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei unerwartetem aussteller")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium/Pruefung 3: Nonce-Handling gegen Replay.
|
||||||
|
func TestVerifyWithNonce_RejectsMismatch(t *testing.T) {
|
||||||
|
key := generateTestKey(t)
|
||||||
|
verifier := NewVerifier(map[string]*rsa.PublicKey{"kid-1": &key.PublicKey}, "https://idp.example.com")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
Subject: "user-123",
|
||||||
|
Nonce: "nonce-a",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com",
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := signTestToken(t, key, "kid-1", claims)
|
||||||
|
|
||||||
|
if _, err := verifier.VerifyWithNonce(tok, "nonce-b"); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei nonce-mismatch (moeglicher replay eines fremden tokens)")
|
||||||
|
}
|
||||||
|
if _, err := verifier.VerifyWithNonce(tok, "nonce-a"); err != nil {
|
||||||
|
t.Fatalf("erwartet erfolg bei passendem nonce: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseJWKS_RoundTrip(t *testing.T) {
|
||||||
|
key := generateTestKey(t)
|
||||||
|
|
||||||
|
nBytes := key.PublicKey.N.Bytes()
|
||||||
|
eBuf := make([]byte, 8)
|
||||||
|
binary.BigEndian.PutUint64(eBuf, uint64(key.PublicKey.E))
|
||||||
|
// Fuehrende Nullbytes des Exponenten abschneiden (ueblich bei JWK-Kodierung).
|
||||||
|
eStart := 0
|
||||||
|
for eStart < len(eBuf)-1 && eBuf[eStart] == 0 {
|
||||||
|
eStart++
|
||||||
|
}
|
||||||
|
|
||||||
|
set := jwkSet{Keys: []jwk{{
|
||||||
|
Kid: "kid-1",
|
||||||
|
Kty: "RSA",
|
||||||
|
N: base64.RawURLEncoding.EncodeToString(nBytes),
|
||||||
|
E: base64.RawURLEncoding.EncodeToString(eBuf[eStart:]),
|
||||||
|
}}}
|
||||||
|
data, err := json.Marshal(set)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed, err := ParseJWKS(data)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse jwks: %v", err)
|
||||||
|
}
|
||||||
|
got, ok := parsed["kid-1"]
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("erwartet kid-1 im ergebnis")
|
||||||
|
}
|
||||||
|
if got.E != key.PublicKey.E || got.N.Cmp(key.PublicKey.N) != 0 {
|
||||||
|
t.Fatalf("erwartet identischen oeffentlichen schluessel nach roundtrip")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Der wiederhergestellte Schluessel muss ein damit signiertes Token auch tatsaechlich verifizieren.
|
||||||
|
verifier := NewVerifier(parsed, "https://idp.example.com")
|
||||||
|
claims := Claims{Subject: "x", RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: "https://idp.example.com", ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
|
||||||
|
}}
|
||||||
|
tok := signTestToken(t, key, "kid-1", claims)
|
||||||
|
if _, err := verifier.Verify(tok); err != nil {
|
||||||
|
t.Fatalf("verify mit aus jwks wiederhergestelltem schluessel: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
// Package rbac implementiert Core RBAC-01: das Rollenmodell mit
|
||||||
|
// Grundrollen/-rechten, Hierarchie und Zuweisung. Die eigentliche
|
||||||
|
// Durchsetzung (erlaubt/verboten je Request) ist RBAC-02, dieses Paket
|
||||||
|
// liefert nur Modell + Zuweisung (Casbin-Prinzip: Policy-Modell getrennt
|
||||||
|
// von der Entscheidungsfunktion).
|
||||||
|
package rbac
|
||||||
|
|
||||||
|
// Role ist eine der drei Grundrollen. Superadmin lebt mandantenuebergreifend
|
||||||
|
// (siehe internal/user.SuperadminStore aus IAM-01) und wird deshalb NICHT
|
||||||
|
// ueber Store (tenant-gescoped) zugewiesen — die Existenz eines Superadmin-
|
||||||
|
// Kontos IST die Rollenzuweisung.
|
||||||
|
type Role string
|
||||||
|
|
||||||
|
const (
|
||||||
|
RoleSuperadmin Role = "superadmin"
|
||||||
|
RoleTenantAdmin Role = "tenant_admin"
|
||||||
|
RoleUser Role = "user"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Permission string
|
||||||
|
|
||||||
|
const (
|
||||||
|
PermSelfRead Permission = "self.read"
|
||||||
|
PermSelfUpdate Permission = "self.update"
|
||||||
|
PermManageUsers Permission = "tenant.manage_users"
|
||||||
|
PermManageSettings Permission = "tenant.manage_settings"
|
||||||
|
PermManageTenants Permission = "platform.manage_tenants"
|
||||||
|
)
|
||||||
|
|
||||||
|
// parent bildet die Rollenhierarchie ab (Akzeptanzkriterium 2): eine Rolle
|
||||||
|
// erbt alle Rechte ihrer Elternrolle. tenant_admin erbt von user,
|
||||||
|
// superadmin erbt von tenant_admin.
|
||||||
|
var parent = map[Role]Role{
|
||||||
|
RoleTenantAdmin: RoleUser,
|
||||||
|
RoleSuperadmin: RoleTenantAdmin,
|
||||||
|
}
|
||||||
|
|
||||||
|
// direct sind die einer Rolle direkt (ohne Vererbung) zugeordneten Rechte.
|
||||||
|
var direct = map[Role][]Permission{
|
||||||
|
RoleUser: {PermSelfRead, PermSelfUpdate},
|
||||||
|
RoleTenantAdmin: {PermManageUsers, PermManageSettings},
|
||||||
|
RoleSuperadmin: {PermManageTenants},
|
||||||
|
}
|
||||||
|
|
||||||
|
// EffectivePermissions liefert die vollstaendige, ueber die Hierarchie
|
||||||
|
// aufgeloeste Rechtemenge einer Rolle (Akzeptanzkriterium 2 / Pruefung 2).
|
||||||
|
func EffectivePermissions(role Role) []Permission {
|
||||||
|
seen := make(map[Permission]bool)
|
||||||
|
var out []Permission
|
||||||
|
|
||||||
|
for r, ok := role, true; ok; r, ok = parent[r] {
|
||||||
|
for _, p := range direct[r] {
|
||||||
|
if !seen[p] {
|
||||||
|
seen[p] = true
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasPermission prueft, ob eine Rolle (inklusive geerbter Rechte) ein
|
||||||
|
// bestimmtes Recht besitzt.
|
||||||
|
func HasPermission(role Role, perm Permission) bool {
|
||||||
|
for _, p := range EffectivePermissions(role) {
|
||||||
|
if p == perm {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package rbac
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// ErrRoleNotAssignableInTenantScope wird geliefert, wenn versucht wird,
|
||||||
|
// eine mandantenuebergreifende Rolle (superadmin) ueber den tenant-
|
||||||
|
// gescopten Store zu vergeben — die erlaubte Matrix laesst hier nur
|
||||||
|
// user/tenant_admin zu (Akzeptanzkriterium 1 / Pruefung 1).
|
||||||
|
ErrRoleNotAssignableInTenantScope = errors.New("rbac: rolle ist in diesem geltungsbereich nicht zuweisbar")
|
||||||
|
ErrNotFound = errors.New("rbac: keine rollenzuweisung gefunden")
|
||||||
|
)
|
||||||
|
|
||||||
|
// assignableRoles ist die erlaubte Matrix fuer Store (tenant-gescoped).
|
||||||
|
var assignableRoles = map[Role]bool{
|
||||||
|
RoleUser: true,
|
||||||
|
RoleTenantAdmin: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
type Assignment struct {
|
||||||
|
UserID string
|
||||||
|
Role Role
|
||||||
|
GrantedBy string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store verwaltet Rollenzuweisungen innerhalb GENAU EINER Tenant-Datenbank —
|
||||||
|
// analog zu internal/user.TenantUserStore (Modell C: der Pool bestimmt den
|
||||||
|
// Tenant, keine tenant_id-Spalte noetig).
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign vergibt eine Rolle an einen Benutzer. grantedBy identifiziert den
|
||||||
|
// Akteur, der die Zuweisung vorgenommen hat (Akzeptanzkriterium 3). Jede
|
||||||
|
// Zuweisung wird zusaetzlich in role_assignment_history festgehalten, auch
|
||||||
|
// wenn sie eine vorherige Rolle ersetzt.
|
||||||
|
func (s *Store) Assign(ctx context.Context, userID string, role Role, grantedBy string) (Assignment, error) {
|
||||||
|
if !assignableRoles[role] {
|
||||||
|
return Assignment{}, ErrRoleNotAssignableInTenantScope
|
||||||
|
}
|
||||||
|
if grantedBy == "" {
|
||||||
|
return Assignment{}, errors.New("rbac: grantedBy darf nicht leer sein")
|
||||||
|
}
|
||||||
|
|
||||||
|
tx, err := s.pool.Begin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Assignment{}, fmt.Errorf("transaktion starten: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = tx.Rollback(ctx) }()
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO role_assignments (user_id, role, granted_by, granted_at)
|
||||||
|
VALUES ($1, $2, $3, now())
|
||||||
|
ON CONFLICT (user_id) DO UPDATE SET role = $2, granted_by = $3, granted_at = now()
|
||||||
|
`, userID, string(role), grantedBy); err != nil {
|
||||||
|
return Assignment{}, fmt.Errorf("rolle zuweisen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO role_assignment_history (user_id, role, granted_by, granted_at)
|
||||||
|
VALUES ($1, $2, $3, now())
|
||||||
|
`, userID, string(role), grantedBy); err != nil {
|
||||||
|
return Assignment{}, fmt.Errorf("historie schreiben: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return Assignment{}, fmt.Errorf("transaktion committen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return Assignment{UserID: userID, Role: role, GrantedBy: grantedBy}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) Get(ctx context.Context, userID string) (Assignment, error) {
|
||||||
|
var a Assignment
|
||||||
|
var role string
|
||||||
|
a.UserID = userID
|
||||||
|
if err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT role, granted_by FROM role_assignments WHERE user_id = $1
|
||||||
|
`, userID).Scan(&role, &a.GrantedBy); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Assignment{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return Assignment{}, fmt.Errorf("rollenzuweisung lesen: %w", err)
|
||||||
|
}
|
||||||
|
a.Role = Role(role)
|
||||||
|
return a, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// History liefert jede Rollenzuweisung eines Benutzers in chronologischer
|
||||||
|
// Reihenfolge — die Grundlage fuer "wer hat wann welche Rolle vergeben"
|
||||||
|
// (Akzeptanzkriterium 3).
|
||||||
|
func (s *Store) History(ctx context.Context, userID string) ([]Assignment, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT role, granted_by FROM role_assignment_history
|
||||||
|
WHERE user_id = $1 ORDER BY granted_at
|
||||||
|
`, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("historie abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Assignment
|
||||||
|
for rows.Next() {
|
||||||
|
var role string
|
||||||
|
a := Assignment{UserID: userID}
|
||||||
|
if err := rows.Scan(&role, &a.GrantedBy); err != nil {
|
||||||
|
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
||||||
|
}
|
||||||
|
a.Role = Role(role)
|
||||||
|
out = append(out, a)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
@@ -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,66 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt die CRUD-API fuer Benutzerkonten bereit (IAM-01-Auftrag).
|
||||||
|
// Auth/Sessions (IAM-02) und Rollen (RBAC-01) sind ausdruecklich nicht Teil
|
||||||
|
// dieser Kachel und daher hier noch nicht angebunden.
|
||||||
|
type Handler struct {
|
||||||
|
users *TenantUserStore
|
||||||
|
superadmins *SuperadminStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(users *TenantUserStore, superadmins *SuperadminStore) *Handler {
|
||||||
|
return &Handler{users: users, superadmins: superadmins}
|
||||||
|
}
|
||||||
|
|
||||||
|
type createUserRequest struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) CreateUser(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req createUserRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := h.users.Create(r.Context(), req.Email, req.Name)
|
||||||
|
writeUserResult(w, u, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateSuperadmin legt ein mandantenuebergreifendes Superadmin-Konto an —
|
||||||
|
// bewusst ein eigener Endpunkt statt eines Tenant-Parameters mit Null-Wert.
|
||||||
|
func (h *Handler) CreateSuperadmin(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req createUserRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := h.superadmins.Create(r.Context(), req.Email, req.Name)
|
||||||
|
writeUserResult(w, u, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeUserResult(w http.ResponseWriter, u User, err error) {
|
||||||
|
if err != nil {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, ErrInvalidEmail), errors.Is(err, ErrEmailTaken):
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
case errors.Is(err, ErrNotFound):
|
||||||
|
http.Error(w, err.Error(), http.StatusNotFound)
|
||||||
|
default:
|
||||||
|
http.Error(w, "benutzer konnte nicht verarbeitet werden", http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_ = json.NewEncoder(w).Encode(u)
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// setupTestDB legt eine frische, isolierte Testdatenbank an, wendet die
|
||||||
|
// uebergebene Migration an und liefert einen verbundenen Pool. Wird ohne
|
||||||
|
// TEST_ADMIN_DSN uebersprungen — siehe internal/tenant/provisioner_test.go
|
||||||
|
// fuer dasselbe Muster.
|
||||||
|
func setupTestDB(t *testing.T, dbName, schemaSQL string) *pgxpool.Pool {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
adminPool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin pool: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
if _, err := adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
|
t.Fatalf("testdatenbank anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dsn := strings.Replace(adminDSN, "/postgres?", "/"+dbName+"?", 1)
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("connect testdatenbank: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := pool.Exec(ctx, schemaSQL); err != nil {
|
||||||
|
t.Fatalf("schema anwenden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
pool.Close()
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
adminPool.Close()
|
||||||
|
})
|
||||||
|
|
||||||
|
return pool
|
||||||
|
}
|
||||||
|
|
||||||
|
const usersSchema = `
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
CREATE TABLE users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);`
|
||||||
|
|
||||||
|
const superadminsSchema = `
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
CREATE TABLE superadmins (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);`
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + 3, Pruefung 1 (inkl. Negativfall doppelte E-Mail).
|
||||||
|
func TestTenantUserStore_CRUD(t *testing.T) {
|
||||||
|
pool := setupTestDB(t, "test_iam01_users", usersSchema)
|
||||||
|
store := NewTenantUserStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
created, err := store.Create(ctx, "alice@example.com", "Alice")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
if created.Status != StatusActive {
|
||||||
|
t.Fatalf("erwartet status active, hat %q", created.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := store.Get(ctx, created.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get: %v", err)
|
||||||
|
}
|
||||||
|
if got.Email != "alice@example.com" {
|
||||||
|
t.Fatalf("get email = %q", got.Email)
|
||||||
|
}
|
||||||
|
|
||||||
|
updated, err := store.Update(ctx, created.ID, "", "Alice A.")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("update: %v", err)
|
||||||
|
}
|
||||||
|
if updated.Name != "Alice A." || updated.Email != "alice@example.com" {
|
||||||
|
t.Fatalf("update ergebnis unerwartet: %+v", updated)
|
||||||
|
}
|
||||||
|
|
||||||
|
list, err := store.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list: %v", err)
|
||||||
|
}
|
||||||
|
if len(list) != 1 {
|
||||||
|
t.Fatalf("erwartet 1 benutzer, habe %d", len(list))
|
||||||
|
}
|
||||||
|
|
||||||
|
deactivated, err := store.Deactivate(ctx, created.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("deactivate: %v", err)
|
||||||
|
}
|
||||||
|
if deactivated.Status != StatusInactive {
|
||||||
|
t.Fatalf("erwartet status inactive, hat %q", deactivated.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negativfall: doppelte E-Mail-Adresse.
|
||||||
|
if _, err := store.Create(ctx, "second@example.com", "Bob"); err != nil {
|
||||||
|
t.Fatalf("create second: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.Create(ctx, "second@example.com", "Bob Zwei"); !errors.Is(err, ErrEmailTaken) {
|
||||||
|
t.Fatalf("erwartet ErrEmailTaken, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negativfall: fehlender Benutzer.
|
||||||
|
if _, err := store.Get(ctx, created.ID+"-nicht-vorhanden"); err == nil {
|
||||||
|
t.Fatalf("erwartet fehler bei unbekannter/ungueltiger id")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: Superadmin-Anlage ohne Tenant-Kontext.
|
||||||
|
// SuperadminStore.Create hat keinen Tenant-Parameter — es gibt syntaktisch
|
||||||
|
// keine Moeglichkeit, hier versehentlich einen Tenant-Sonderfall zu vergessen.
|
||||||
|
func TestSuperadminStore_CreateWithoutTenantContext(t *testing.T) {
|
||||||
|
pool := setupTestDB(t, "test_iam01_superadmins", superadminsSchema)
|
||||||
|
store := NewSuperadminStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
created, err := store.Create(ctx, "root@nexarch.internal", "Root")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create superadmin: %v", err)
|
||||||
|
}
|
||||||
|
if created.Status != StatusActive {
|
||||||
|
t.Fatalf("erwartet status active, hat %q", created.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := store.Get(ctx, created.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get: %v", err)
|
||||||
|
}
|
||||||
|
if got.Email != "root@nexarch.internal" {
|
||||||
|
t.Fatalf("get email = %q", got.Email)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Create(ctx, "root@nexarch.internal", "Root Zwei"); !errors.Is(err, ErrEmailTaken) {
|
||||||
|
t.Fatalf("erwartet ErrEmailTaken (globale eindeutigkeit), habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
deactivated, err := store.Deactivate(ctx, created.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("deactivate: %v", err)
|
||||||
|
}
|
||||||
|
if deactivated.Status != StatusInactive {
|
||||||
|
t.Fatalf("erwartet status inactive, hat %q", deactivated.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SuperadminStore verwaltet mandantenuebergreifende Superadmin-Konten in der
|
||||||
|
// Control-Plane-Registry (siehe internal/tenant.Registry). Superadmin-ohne-
|
||||||
|
// Tenant ist dadurch ein eigener Typ statt eines Sonderfalls von User/
|
||||||
|
// TenantUserStore — es gibt keinen Tenant-Parameter, den man weglassen
|
||||||
|
// koennte (IAM-01, "ohne Sonderbehandlung im Code").
|
||||||
|
type SuperadminStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSuperadminStore(pool *pgxpool.Pool) *SuperadminStore {
|
||||||
|
return &SuperadminStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SuperadminStore) Create(ctx context.Context, email, name string) (User, error) {
|
||||||
|
if err := ValidateEmail(email); err != nil {
|
||||||
|
return User{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var u User
|
||||||
|
u.Email, u.Name, u.Status = email, name, StatusActive
|
||||||
|
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO superadmins (email, name, status)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
RETURNING id, created_at, updated_at
|
||||||
|
`, u.Email, u.Name, u.Status)
|
||||||
|
|
||||||
|
if err := row.Scan(&u.ID, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
return User{}, mapWriteErr(err)
|
||||||
|
}
|
||||||
|
return u, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SuperadminStore) Get(ctx context.Context, id string) (User, error) {
|
||||||
|
return scanUser(s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at
|
||||||
|
FROM superadmins WHERE id = $1
|
||||||
|
`, id))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SuperadminStore) List(ctx context.Context) ([]User, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at
|
||||||
|
FROM superadmins ORDER BY created_at
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("superadmins auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []User
|
||||||
|
for rows.Next() {
|
||||||
|
var u User
|
||||||
|
if err := rows.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
return nil, fmt.Errorf("superadmin lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, u)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SuperadminStore) Deactivate(ctx context.Context, id string) (User, error) {
|
||||||
|
return scanUser(s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE superadmins SET status = $2, updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
RETURNING id, email, name, status, created_at, updated_at
|
||||||
|
`, id, StatusInactive))
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgconn"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TenantUserStore verwaltet Benutzer innerhalb GENAU EINER Tenant-Datenbank.
|
||||||
|
// Welcher Mandant gemeint ist, ergibt sich ausschliesslich aus dem
|
||||||
|
// uebergebenen Pool — es gibt keine tenant_id-Spalte (siehe migrations/tenant/0001_users.up.sql).
|
||||||
|
type TenantUserStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTenantUserStore(pool *pgxpool.Pool) *TenantUserStore {
|
||||||
|
return &TenantUserStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *TenantUserStore) Create(ctx context.Context, email, name string) (User, error) {
|
||||||
|
if err := ValidateEmail(email); err != nil {
|
||||||
|
return User{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var u User
|
||||||
|
u.Email, u.Name, u.Status = email, name, StatusActive
|
||||||
|
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO users (email, name, status)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
RETURNING id, created_at, updated_at
|
||||||
|
`, u.Email, u.Name, u.Status)
|
||||||
|
|
||||||
|
if err := row.Scan(&u.ID, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
return User{}, mapWriteErr(err)
|
||||||
|
}
|
||||||
|
return u, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *TenantUserStore) Get(ctx context.Context, id string) (User, error) {
|
||||||
|
return scanUser(s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at
|
||||||
|
FROM users WHERE id = $1
|
||||||
|
`, id))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *TenantUserStore) List(ctx context.Context) ([]User, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at
|
||||||
|
FROM users ORDER BY created_at
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("benutzer auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []User
|
||||||
|
for rows.Next() {
|
||||||
|
var u User
|
||||||
|
if err := rows.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
return nil, fmt.Errorf("benutzer lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, u)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update aendert Name und E-Mail. Eine leere email/name laesst das jeweilige
|
||||||
|
// Feld unveraendert.
|
||||||
|
func (s *TenantUserStore) Update(ctx context.Context, id, email, name string) (User, error) {
|
||||||
|
if email != "" {
|
||||||
|
if err := ValidateEmail(email); err != nil {
|
||||||
|
return User{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE users
|
||||||
|
SET email = COALESCE(NULLIF($2, ''), email),
|
||||||
|
name = COALESCE(NULLIF($3, ''), name),
|
||||||
|
updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
RETURNING id, email, name, status, created_at, updated_at
|
||||||
|
`, id, email, name)
|
||||||
|
|
||||||
|
u, err := scanUser(row)
|
||||||
|
if err != nil {
|
||||||
|
return User{}, mapWriteErr(err)
|
||||||
|
}
|
||||||
|
return u, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deactivate setzt den Benutzer auf inaktiv statt ihn zu loeschen.
|
||||||
|
func (s *TenantUserStore) Deactivate(ctx context.Context, id string) (User, error) {
|
||||||
|
return scanUser(s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE users SET status = $2, updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
RETURNING id, email, name, status, created_at, updated_at
|
||||||
|
`, id, StatusInactive))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPasswordHash schreibt einen bereits berechneten bcrypt-Hash (siehe
|
||||||
|
// internal/auth, IAM-02). Der Store selbst kennt kein Klartext-Passwort.
|
||||||
|
func (s *TenantUserStore) SetPasswordHash(ctx context.Context, id, hash string) error {
|
||||||
|
tag, err := s.pool.Exec(ctx, `
|
||||||
|
UPDATE users SET password_hash = $2, updated_at = now() WHERE id = $1
|
||||||
|
`, id, hash)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("passwort setzen: %w", err)
|
||||||
|
}
|
||||||
|
if tag.RowsAffected() == 0 {
|
||||||
|
return ErrNotFound
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AuthCredentials wird ausschliesslich fuer den Login-Pfad (internal/auth)
|
||||||
|
// verwendet und traegt bewusst den password_hash, damit er nicht ueber den
|
||||||
|
// regulaeren User-Typ/JSON-Serialisierungspfad nach aussen dringen kann.
|
||||||
|
type AuthCredentials struct {
|
||||||
|
User User
|
||||||
|
PasswordHash string
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetByEmailForAuth liefert Benutzer + Passwort-Hash zu einer E-Mail-Adresse
|
||||||
|
// aus GENAU DIESER Tenant-Datenbank — der Tenant-Scope ergibt sich damit
|
||||||
|
// zwingend aus dem verwendeten Pool, es gibt keine Moeglichkeit, versehentlich
|
||||||
|
// ueber Tenant-Grenzen hinweg zu suchen (bekannter archivmail-Fehler, siehe
|
||||||
|
// IAM-02 "Bekannte Fehler vermeiden").
|
||||||
|
func (s *TenantUserStore) GetByEmailForAuth(ctx context.Context, email string) (AuthCredentials, error) {
|
||||||
|
var c AuthCredentials
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at, password_hash
|
||||||
|
FROM users WHERE email = $1
|
||||||
|
`, email)
|
||||||
|
|
||||||
|
if err := row.Scan(&c.User.ID, &c.User.Email, &c.User.Name, &c.User.Status,
|
||||||
|
&c.User.CreatedAt, &c.User.UpdatedAt, &c.PasswordHash); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return AuthCredentials{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return AuthCredentials{}, fmt.Errorf("anmeldedaten lesen: %w", err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func scanUser(row pgx.Row) (User, error) {
|
||||||
|
var u User
|
||||||
|
if err := row.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return User{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return User{}, fmt.Errorf("benutzer lesen: %w", err)
|
||||||
|
}
|
||||||
|
return u, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// mapWriteErr uebersetzt den Unique-Constraint-Verstoss der E-Mail-Spalte in
|
||||||
|
// einen sprechenden Fehler statt der rohen Postgres-Fehlermeldung.
|
||||||
|
func mapWriteErr(err error) error {
|
||||||
|
var pgErr *pgconn.PgError
|
||||||
|
if errors.As(err, &pgErr) && pgErr.Code == "23505" {
|
||||||
|
return ErrEmailTaken
|
||||||
|
}
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return ErrNotFound
|
||||||
|
}
|
||||||
|
return fmt.Errorf("benutzer schreiben: %w", err)
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
// Package user implementiert Core IAM-01: das Benutzer-Datenmodell und die
|
||||||
|
// CRUD-Operationen. Tenant-Zugehoerigkeit ist ueber die Zieldatenbank
|
||||||
|
// gegeben (Modell C, siehe internal/tenant) — Superadmin-Konten leben
|
||||||
|
// dagegen mandantenuebergreifend in der Registry und sind ueber
|
||||||
|
// SuperadminStore als eigener, First-Class-Typ modelliert, nicht als
|
||||||
|
// tenant_id-NULL-Sonderfall in User.
|
||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"regexp"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Status string
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusActive Status = "active"
|
||||||
|
StatusInactive Status = "inactive"
|
||||||
|
)
|
||||||
|
|
||||||
|
type User struct {
|
||||||
|
ID string
|
||||||
|
Email string
|
||||||
|
Name string
|
||||||
|
Status Status
|
||||||
|
CreatedAt time.Time
|
||||||
|
UpdatedAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
var emailPattern = regexp.MustCompile(`^[^\s@]+@[^\s@]+\.[^\s@]+$`)
|
||||||
|
|
||||||
|
var ErrInvalidEmail = errors.New("user: ungueltige E-Mail-Adresse")
|
||||||
|
var ErrEmailTaken = errors.New("user: E-Mail-Adresse bereits vergeben")
|
||||||
|
var ErrNotFound = errors.New("user: nicht gefunden")
|
||||||
|
|
||||||
|
func ValidateEmail(email string) error {
|
||||||
|
if !emailPattern.MatchString(email) {
|
||||||
|
return ErrInvalidEmail
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestValidateEmail(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
email string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{"a@b.de", false},
|
||||||
|
{"a.b+c@sub.example.com", false},
|
||||||
|
{"", true},
|
||||||
|
{"keine-email", true},
|
||||||
|
{"a@b", true},
|
||||||
|
{"@b.de", true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range cases {
|
||||||
|
err := ValidateEmail(c.email)
|
||||||
|
if (err != nil) != c.wantErr {
|
||||||
|
t.Errorf("ValidateEmail(%q) error = %v, wantErr %v", c.email, err, c.wantErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS superadmins;
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- Superadmin-Konten arbeiten mandantenuebergreifend und leben deshalb in der
|
||||||
|
-- Control-Plane-Registry (siehe TEN-01), nicht in einer Tenant-Datenbank.
|
||||||
|
-- Das bildet "Superadmin ohne Tenant" strukturell als First-Class-Zustand ab,
|
||||||
|
-- statt ihn als Sonderfall in der Tenant-users-Tabelle zu behandeln
|
||||||
|
-- (IAM-01, siehe core-kanban/tickets/IAM-01.md — bekannte Fehler vermeiden).
|
||||||
|
-- E-Mail-Eindeutigkeit ist hier global, da die Registry-DB einmalig existiert.
|
||||||
|
CREATE TABLE superadmins (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS config_value_history;
|
|
||||||
DROP TABLE IF EXISTS config_values;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
-- Zentraler Konfigurationsdienst (CFG-01, siehe core-kanban/tickets/CFG-01.md).
|
|
||||||
-- scope = 'global' fuer globale Defaults, sonst der Tenant-Slug. config_values
|
|
||||||
-- haelt den AKTUELLEN Stand je (key, scope); config_value_history haelt JEDE
|
|
||||||
-- Aenderung fest (Akzeptanzkriterium 2: versioniert nachvollziehbar).
|
|
||||||
CREATE TABLE config_values (
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL CHECK (scope <> ''),
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (key, scope)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE config_value_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL,
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX config_value_history_key_scope_idx ON config_value_history (key, scope, version);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS notification_jobs;
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
-- Benachrichtigungs-Dispatcher-Warteschlange (CFG-02, siehe
|
|
||||||
-- core-kanban/tickets/CFG-02.md). Postgres-basiert statt Redis/AMQP
|
|
||||||
-- (Projekt-Konvention, siehe nexarch-state.json techstack.job_queue) —
|
|
||||||
-- Zeilen ueberleben einen Neustart des Dispatcher-Prozesses unveraendert
|
|
||||||
-- (Akzeptanzkriterium 3).
|
|
||||||
CREATE TABLE notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0,
|
|
||||||
max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX notification_jobs_due_idx ON notification_jobs (status, next_attempt_at);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS in_app_notifications;
|
|
||||||
DROP TABLE IF EXISTS notification_templates;
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
-- Benachrichtigungs-Kanaele: Vorlagen (E-Mail) + In-App-Nachrichten
|
|
||||||
-- (CFG-03, siehe core-kanban/tickets/CFG-03.md). Beide leben in der
|
|
||||||
-- Registry-DB, analog zu feature_flags/config_values — modulübergreifende
|
|
||||||
-- Konfiguration/UI-Zustand, keine Mandanten-Geschaeftsdaten.
|
|
||||||
|
|
||||||
-- tenant_slug = 'global' ist der Fallback-Wert, wenn ein Tenant keine
|
|
||||||
-- eigene Vorlage gesetzt hat (Akzeptanzkriterium 3: Vorlagen pro Tenant
|
|
||||||
-- anpassbar, mit sinnvollem Default).
|
|
||||||
CREATE TABLE notification_templates (
|
|
||||||
tenant_slug TEXT NOT NULL,
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
subject TEXT NOT NULL,
|
|
||||||
body TEXT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (tenant_slug, key)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE in_app_notifications (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
tenant_slug TEXT NOT NULL,
|
|
||||||
user_id TEXT NOT NULL,
|
|
||||||
title TEXT NOT NULL,
|
|
||||||
body TEXT NOT NULL,
|
|
||||||
read_at TIMESTAMPTZ,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX in_app_notifications_user_idx ON in_app_notifications (tenant_slug, user_id, created_at);
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS users;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- Benutzer-Datenmodell (IAM-01, siehe core-kanban/tickets/IAM-01.md).
|
||||||
|
-- Diese Migration laeuft in der DB EINES Mandanten (Modell C, siehe TEN-01) —
|
||||||
|
-- die Tenant-Zugehoerigkeit ist implizit durch die Datenbankverbindung
|
||||||
|
-- gegeben, es gibt daher bewusst KEINE tenant_id-Spalte.
|
||||||
|
-- E-Mail-Eindeutigkeit ist hier tenant-scoped: der UNIQUE-Constraint gilt
|
||||||
|
-- nur innerhalb dieser einen Tenant-Datenbank.
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
|
||||||
|
CREATE TABLE users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS role_assignment_history;
|
||||||
|
DROP TABLE IF EXISTS role_assignments;
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
-- Rollenzuweisung pro Benutzer (RBAC-01, siehe core-kanban/tickets/RBAC-01.md).
|
||||||
|
-- Nur 'user' und 'tenant_admin' sind hier zuweisbar — 'superadmin' lebt
|
||||||
|
-- mandantenuebergreifend in der Registry (IAM-01 SuperadminStore) und hat
|
||||||
|
-- daher bewusst KEINE Zeile in dieser tenant-lokalen Tabelle (Akzeptanz-
|
||||||
|
-- kriterium 1: nur Zuweisungen innerhalb der erlaubten Matrix).
|
||||||
|
CREATE TABLE 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()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Vollstaendige Historie jeder Rollenaenderung (Akzeptanzkriterium 3: wer
|
||||||
|
-- hat wann welche Rolle vergeben).
|
||||||
|
CREATE TABLE 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 INDEX role_assignment_history_user_idx ON role_assignment_history (user_id, granted_at);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE users DROP COLUMN password_hash;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- Passwort-Hash-Spalte fuer Login (IAM-02, siehe core-kanban/tickets/IAM-02.md).
|
||||||
|
-- Enthaelt AUSSCHLIESSLICH den bcrypt-Hash, niemals das Klartext-Passwort.
|
||||||
|
ALTER TABLE users ADD COLUMN password_hash TEXT NOT NULL DEFAULT '';
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS ldap_group_role_mapping;
|
||||||
|
DROP TABLE IF EXISTS ldap_config;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
-- LDAP/Active-Directory-Anbindung (IAM-05, siehe core-kanban/tickets/IAM-05.md).
|
||||||
|
-- Bind-Credentials liegen NIE in dieser Tabelle im Klartext — bind_password_env
|
||||||
|
-- nennt nur den Namen einer Umgebungsvariable, aus der das Passwort zur
|
||||||
|
-- Laufzeit gelesen wird (Projekt-Konvention: Secrets nur ueber Env-Vars).
|
||||||
|
CREATE TABLE ldap_config (
|
||||||
|
id BOOLEAN PRIMARY KEY DEFAULT true CHECK (id),
|
||||||
|
url TEXT NOT NULL,
|
||||||
|
bind_dn TEXT NOT NULL,
|
||||||
|
bind_password_env TEXT NOT NULL,
|
||||||
|
base_dn TEXT NOT NULL,
|
||||||
|
user_filter TEXT NOT NULL DEFAULT '(objectClass=person)',
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Erlaubnis-Matrix LDAP-Gruppe -> NEXARCH-Rolle (Akzeptanzkriterium 3).
|
||||||
|
-- Eine LDAP-Gruppe OHNE Eintrag hier vergibt KEINE Rolle — kein impliziter
|
||||||
|
-- Zugriff durch Gruppennamen-Zufall (Privilege-Escalation-Schutz, siehe
|
||||||
|
-- "Bekannte Fehler vermeiden" im Ticket).
|
||||||
|
CREATE TABLE ldap_group_role_mapping (
|
||||||
|
ldap_group TEXT PRIMARY KEY,
|
||||||
|
role TEXT NOT NULL CHECK (role IN ('user', 'tenant_admin'))
|
||||||
|
);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS oidc_states;
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
-- CSRF-/Replay-Schutz fuer OIDC-Login (IAM-06, siehe
|
||||||
|
-- core-kanban/tickets/IAM-06.md). Einmal-Verwendung erzwungen ueber
|
||||||
|
-- used_at IS NULL in der Consume-Abfrage, analog IAM-03/IAM-09.
|
||||||
|
CREATE TABLE 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()
|
||||||
|
);
|
||||||
@@ -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