Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14516b4adf | ||
|
|
3ea2489f45 | ||
|
|
f7863fd4d2 |
@@ -0,0 +1,20 @@
|
|||||||
|
package apiserver
|
||||||
|
|
||||||
|
import "context"
|
||||||
|
|
||||||
|
type contextKey int
|
||||||
|
|
||||||
|
const requestContextKey contextKey = iota
|
||||||
|
|
||||||
|
// RequestContext ist der Tenant-/Benutzerkontext, den die Middleware-Kette
|
||||||
|
// fuer nachgelagerte Handler bereitstellt (Akzeptanzkriterium 3).
|
||||||
|
type RequestContext struct {
|
||||||
|
UserID string
|
||||||
|
TenantSlug string
|
||||||
|
}
|
||||||
|
|
||||||
|
// FromContext liest den von der Middleware gesetzten Kontext.
|
||||||
|
func FromContext(ctx context.Context) (RequestContext, bool) {
|
||||||
|
rc, ok := ctx.Value(requestContextKey).(RequestContext)
|
||||||
|
return rc, ok
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
// Package apiserver implementiert Core API-01: das REST-Grundgerüst mit
|
||||||
|
// URL-Versionierung, einheitlichem Fehlerformat und Middleware-Kette
|
||||||
|
// (Auth, Tenant-/Benutzerkontext, Logging).
|
||||||
|
package apiserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// errorBody ist das EINE Fehlerschema fuer alle Endpunkte unter /api/{version}/
|
||||||
|
// (Akzeptanzkriterium 2).
|
||||||
|
type errorBody struct {
|
||||||
|
Error struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
} `json:"error"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteError schreibt einen Fehler im einheitlichen Schema. code ist ein
|
||||||
|
// stabiler, maschinenlesbarer Bezeichner (z.B. "unauthenticated"), message
|
||||||
|
// ein fuer Menschen lesbarer deutscher Text.
|
||||||
|
func WriteError(w http.ResponseWriter, status int, code, message string) {
|
||||||
|
var body errorBody
|
||||||
|
body.Error.Code = code
|
||||||
|
body.Error.Message = message
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
_ = json.NewEncoder(w).Encode(body)
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package apiserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
// authAndTenantContext prueft die Session (wiederverwendet auth.TokenIssuer.Verify
|
||||||
|
// aus IAM-02 — keine zweite JWT-Implementierung) und setzt bei Erfolg
|
||||||
|
// RequestContext fuer nachgelagerte Handler (Akzeptanzkriterium 3). Anders
|
||||||
|
// als auth.RequireAuth (Klartext-Fehler) antwortet diese Middleware im
|
||||||
|
// einheitlichen API-01-Fehlerschema (Akzeptanzkriterium 2), damit ALLE
|
||||||
|
// Endpunkte unter /api/{version}/ dasselbe Format liefern, auch bei
|
||||||
|
// Auth-Fehlern.
|
||||||
|
func authAndTenantContext(issuer *auth.TokenIssuer, next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
cookie, err := r.Cookie(auth.CookieName)
|
||||||
|
if err != nil {
|
||||||
|
WriteError(w, http.StatusUnauthorized, "unauthenticated", "nicht angemeldet")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := issuer.Verify(cookie.Value)
|
||||||
|
if err != nil {
|
||||||
|
WriteError(w, http.StatusUnauthorized, "unauthenticated", "nicht angemeldet")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rc := RequestContext{UserID: claims.UserID, TenantSlug: claims.TenantSlug}
|
||||||
|
next(w, r.WithContext(context.WithValue(r.Context(), requestContextKey, rc)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type statusRecorder struct {
|
||||||
|
http.ResponseWriter
|
||||||
|
status int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *statusRecorder) WriteHeader(code int) {
|
||||||
|
s.status = code
|
||||||
|
s.ResponseWriter.WriteHeader(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// loggingMiddleware protokolliert jede Anfrage strukturiert.
|
||||||
|
func loggingMiddleware(next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
rec := &statusRecorder{ResponseWriter: w, status: http.StatusOK}
|
||||||
|
start := time.Now()
|
||||||
|
next(rec, r)
|
||||||
|
slog.Info("api-anfrage", "method", r.Method, "path", r.URL.Path, "status", rec.status, "dauer", time.Since(start))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package apiserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Server registriert versionierte API-Routen (Akzeptanzkriterium 1: unter
|
||||||
|
// /api/{version}/...) und verdrahtet fuer jede Route dieselbe Middleware-
|
||||||
|
// Kette (Logging -> Auth+Tenantkontext -> Handler).
|
||||||
|
type Server struct {
|
||||||
|
mux *http.ServeMux
|
||||||
|
issuer *auth.TokenIssuer
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewServer(issuer *auth.TokenIssuer) *Server {
|
||||||
|
return &Server{mux: http.NewServeMux(), issuer: issuer}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle registriert pattern unter der angegebenen Version, z.B.
|
||||||
|
// Handle("v1", "/things", h) -> erreichbar unter /api/v1/things. Verschiedene
|
||||||
|
// Versionen sind unabhaengige Pfade — eine neue Version beeintraechtigt
|
||||||
|
// bestehende nicht (Akzeptanzkriterium 1 / Pruefung 3).
|
||||||
|
func (s *Server) Handle(version, pattern string, h http.HandlerFunc) {
|
||||||
|
full := "/api/" + version + pattern
|
||||||
|
s.mux.HandleFunc(full, loggingMiddleware(authAndTenantContext(s.issuer, h)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleV1 ist die Kurzform fuer die aktuelle Hauptversion.
|
||||||
|
func (s *Server) HandleV1(pattern string, h http.HandlerFunc) {
|
||||||
|
s.Handle("v1", pattern, h)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) Handler() http.Handler {
|
||||||
|
return s.mux
|
||||||
|
}
|
||||||
@@ -0,0 +1,149 @@
|
|||||||
|
package apiserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newTestServer() (*Server, *auth.TokenIssuer) {
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
return NewServer(issuer), issuer
|
||||||
|
}
|
||||||
|
|
||||||
|
func withAuthCookie(req *http.Request, token string) *http.Request {
|
||||||
|
req.AddCookie(&http.Cookie{Name: auth.CookieName, Value: token})
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: API unter versioniertem Pfad erreichbar.
|
||||||
|
func TestHandleV1_RegistersUnderVersionedPath(t *testing.T) {
|
||||||
|
srv, issuer := newTestServer()
|
||||||
|
srv.HandleV1("/things", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req := withAuthCookie(httptest.NewRequest(http.MethodGet, "/api/v1/things", nil), token)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1 (Stichprobe): mehrere Endpunkte liefern
|
||||||
|
// bei fehlerhafter Anfrage dasselbe Fehlerschema.
|
||||||
|
func TestErrorFormat_ConsistentAcrossEndpoints(t *testing.T) {
|
||||||
|
srv, _ := newTestServer()
|
||||||
|
srv.HandleV1("/endpunkt-a", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
srv.HandleV1("/endpunkt-b", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
for _, path := range []string{"/api/v1/endpunkt-a", "/api/v1/endpunkt-b"} {
|
||||||
|
req := httptest.NewRequest(http.MethodGet, path, nil) // ohne cookie -> 401
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("%s: status = %d, want 401", path, rec.Code)
|
||||||
|
}
|
||||||
|
var body errorBody
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil {
|
||||||
|
t.Fatalf("%s: fehlerantwort nicht im erwarteten json-schema: %v (body: %s)", path, err, rec.Body.String())
|
||||||
|
}
|
||||||
|
if body.Error.Code == "" || body.Error.Message == "" {
|
||||||
|
t.Fatalf("%s: erwartet nicht-leeren code/message, habe %+v", path, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Middleware-Kette setzt Tenant-/
|
||||||
|
// Benutzerkontext zuverlaessig, nachweislich fuer mehrere Endpunkte.
|
||||||
|
func TestMiddleware_SetsRequestContextForEveryEndpoint(t *testing.T) {
|
||||||
|
srv, issuer := newTestServer()
|
||||||
|
|
||||||
|
var gotA, gotB RequestContext
|
||||||
|
srv.HandleV1("/kontext-a", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
gotA, _ = FromContext(r.Context())
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
srv.HandleV1("/kontext-b", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
gotB, _ = FromContext(r.Context())
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-42", "tenant-x")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for path, got := range map[string]*RequestContext{"/api/v1/kontext-a": &gotA, "/api/v1/kontext-b": &gotB} {
|
||||||
|
req := withAuthCookie(httptest.NewRequest(http.MethodGet, path, nil), token)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("%s: status = %d, want 200", path, rec.Code)
|
||||||
|
}
|
||||||
|
if got.UserID != "user-42" || got.TenantSlug != "tenant-x" {
|
||||||
|
t.Fatalf("%s: request-context unerwartet: %+v", path, *got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 3: eine neue v2-Route laesst sich anlegen,
|
||||||
|
// ohne v1 zu beeintraechtigen.
|
||||||
|
func TestVersioning_V2DoesNotAffectV1(t *testing.T) {
|
||||||
|
srv, issuer := newTestServer()
|
||||||
|
srv.HandleV1("/things", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Write([]byte("v1-antwort"))
|
||||||
|
})
|
||||||
|
srv.Handle("v2", "/things", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Write([]byte("v2-antwort"))
|
||||||
|
})
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
reqV1 := withAuthCookie(httptest.NewRequest(http.MethodGet, "/api/v1/things", nil), token)
|
||||||
|
recV1 := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(recV1, reqV1)
|
||||||
|
if recV1.Body.String() != "v1-antwort" {
|
||||||
|
t.Fatalf("v1 antwort = %q, want v1-antwort", recV1.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
reqV2 := withAuthCookie(httptest.NewRequest(http.MethodGet, "/api/v2/things", nil), token)
|
||||||
|
recV2 := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(recV2, reqV2)
|
||||||
|
if recV2.Body.String() != "v2-antwort" {
|
||||||
|
t.Fatalf("v2 antwort = %q, want v2-antwort", recV2.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// v1 nach dem Anlegen von v2 erneut pruefen — unveraendert.
|
||||||
|
reqV1Again := withAuthCookie(httptest.NewRequest(http.MethodGet, "/api/v1/things", nil), token)
|
||||||
|
recV1Again := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(recV1Again, reqV1Again)
|
||||||
|
if recV1Again.Body.String() != "v1-antwort" {
|
||||||
|
t.Fatalf("v1 antwort nach v2-anlage = %q, want weiterhin v1-antwort", recV1Again.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuthAndTenantContext_RejectsInvalidToken(t *testing.T) {
|
||||||
|
srv, _ := newTestServer()
|
||||||
|
srv.HandleV1("/geschuetzt", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
req := withAuthCookie(httptest.NewRequest(http.MethodGet, "/api/v1/geschuetzt", nil), "kaputtes.token.hier")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
// 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)
|
|
||||||
}
|
|
||||||
@@ -1,204 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,257 @@
|
|||||||
|
// Package loadtest implementiert Core QA-08: Last- und Leistungstests fuer
|
||||||
|
// die drei Mechanismen, die unter realistischer Mehrmodul-Last (sechs
|
||||||
|
// gleichzeitig zugreifende Fachmodule: DMS/Mail/Archive/Workflow/AI/Connect)
|
||||||
|
// am ehesten unter Druck geraten — JWT-Verifikationspfad (API-05),
|
||||||
|
// Tenant-Connection-Pooling (TEN-06) und Rate-Limiting (API-03). Jeder Test
|
||||||
|
// dokumentiert einen Zielwert UND das tatsaechlich gemessene Ergebnis
|
||||||
|
// (Ticket-Vorgabe: "Pruefen heisst messen. Behauptungen ohne Messprotokoll
|
||||||
|
// gelten nicht als erledigt.").
|
||||||
|
package loadtest
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/moduletrust"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/ratelimit"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
||||||
|
)
|
||||||
|
|
||||||
|
const simulatedModuleCount = 6 // DMS, Mail, Archive, Workflow, AI, Connect
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: definierte Ziel-Latenz fuer
|
||||||
|
// JWT-Verifikation unter Last aus sechs gleichzeitig zugreifenden Modulen.
|
||||||
|
//
|
||||||
|
// Zielwert: p95 < 10ms je Verify()-Aufruf. Begruendung des Zielwerts:
|
||||||
|
// Verify() ist eine rein lokale Operation gegen einen bereits im Speicher
|
||||||
|
// zwischengespeicherten Schluesselsatz (StaleCache, siehe API-05) — es
|
||||||
|
// findet kein Netzwerk-Roundtrip zu Core statt, daher ist ein niedriger
|
||||||
|
// Millisekunden-Zielwert realistisch, nicht willkuerlich hoch angesetzt.
|
||||||
|
func TestLoad_JWTVerificationLatencyUnderSixModuleLoad(t *testing.T) {
|
||||||
|
km, err := moduletrust.NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("keymanager: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := km.Rotate(); err != nil {
|
||||||
|
t.Fatalf("rotate: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
verifier := moduletrust.NewVerifier(time.Minute, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
const requestsPerModule = 200
|
||||||
|
totalRequests := simulatedModuleCount * requestsPerModule
|
||||||
|
|
||||||
|
tokens := make([]string, totalRequests)
|
||||||
|
for i := 0; i < totalRequests; i++ {
|
||||||
|
tok, err := km.Issue("user-1", fmt.Sprintf("tenant-%d", i%50), 5*time.Minute)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
tokens[i] = tok
|
||||||
|
}
|
||||||
|
|
||||||
|
latencies := make([]time.Duration, totalRequests)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for module := 0; module < simulatedModuleCount; module++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(moduleIdx int) {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < requestsPerModule; i++ {
|
||||||
|
idx := moduleIdx*requestsPerModule + i
|
||||||
|
start := time.Now()
|
||||||
|
if _, err := verifier.Verify(context.Background(), tokens[idx]); err != nil {
|
||||||
|
t.Errorf("verify: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
latencies[idx] = time.Since(start)
|
||||||
|
}
|
||||||
|
}(module)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
sort.Slice(latencies, func(i, j int) bool { return latencies[i] < latencies[j] })
|
||||||
|
p95 := latencies[int(float64(len(latencies))*0.95)]
|
||||||
|
max := latencies[len(latencies)-1]
|
||||||
|
|
||||||
|
t.Logf("JWT-Verifikation unter Last: %d module x %d anfragen = %d gesamt. p95=%s, max=%s, ziel=p95<10ms",
|
||||||
|
simulatedModuleCount, requestsPerModule, totalRequests, p95, max)
|
||||||
|
|
||||||
|
if p95 >= 10*time.Millisecond {
|
||||||
|
t.Fatalf("p95-latenz = %s, ziel war unter 10ms", p95)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: Connection-Pooling bleibt unter der
|
||||||
|
// Postgres-Verbindungsobergrenze bei simulierter Vielzahl an Mandanten.
|
||||||
|
//
|
||||||
|
// Zielwert: bei 200 simulierten Mandanten, auf die sechs Module gleichzeitig
|
||||||
|
// zugreifen, bleiben NIE mehr als maxOpen=20 Pools gleichzeitig offen (LRU-
|
||||||
|
// Verdraengung greift) — weit unter einer typischen Postgres
|
||||||
|
// max_connections-Grenze (Default 100).
|
||||||
|
func TestLoad_ConnectionPoolingStaysUnderLimitWithManySimulatedTenants(t *testing.T) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS tenants (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), slug TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
||||||
|
db_name TEXT NOT NULL UNIQUE, db_dsn TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
registry := tenant.NewRegistry(pool)
|
||||||
|
const simulatedTenants = 200
|
||||||
|
const maxOpen = 20
|
||||||
|
|
||||||
|
prefix := fmt.Sprintf("qa08_%d", time.Now().UnixNano())
|
||||||
|
slugs := make([]string, simulatedTenants)
|
||||||
|
for i := 0; i < simulatedTenants; i++ {
|
||||||
|
slug := fmt.Sprintf("%s_%d", prefix, i)
|
||||||
|
slugs[i] = slug
|
||||||
|
// DSN muss nur SYNTAKTISCH gueltig sein — pgxpool.New verbindet
|
||||||
|
// erst lazy bei tatsaechlicher Nutzung, fuer diesen Lasttest zaehlt
|
||||||
|
// ausschliesslich die Zahl offener *Pool-Objekte*, nicht ob die
|
||||||
|
// referenzierte Datenbank real existiert.
|
||||||
|
dsn := fmt.Sprintf("postgresql://nexarch_test:unused@localhost:5432/%s?sslmode=disable", slug)
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
INSERT INTO tenants (slug, name, db_name, db_dsn) VALUES ($1, $1, $1, $2)
|
||||||
|
`, slug, dsn); err != nil {
|
||||||
|
t.Fatalf("tenant %s anlegen: %v", slug, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Cleanup(func() {
|
||||||
|
_, _ = pool.Exec(context.Background(), `DELETE FROM tenants WHERE slug LIKE $1`, prefix+"%")
|
||||||
|
})
|
||||||
|
|
||||||
|
router := tenant.NewRouter(registry, maxOpen)
|
||||||
|
defer router.Close()
|
||||||
|
|
||||||
|
var maxObservedOpen int64
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for module := 0; module < simulatedModuleCount; module++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(moduleIdx int) {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < simulatedTenants; i++ {
|
||||||
|
slug := slugs[(i+moduleIdx*37)%simulatedTenants] // module-uebergreifend gemischter zugriff
|
||||||
|
if _, err := router.Resolve(context.Background(), slug); err != nil {
|
||||||
|
t.Errorf("resolve %s: %v", slug, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if current := int64(router.OpenCount()); current > atomic.LoadInt64(&maxObservedOpen) {
|
||||||
|
atomic.StoreInt64(&maxObservedOpen, current)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(module)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
t.Logf("connection-pooling unter last: %d simulierte mandanten, %d module, max. gleichzeitig beobachtete offene pools = %d (ziel: <= %d)",
|
||||||
|
simulatedTenants, simulatedModuleCount, maxObservedOpen, maxOpen)
|
||||||
|
|
||||||
|
if maxObservedOpen > int64(maxOpen) {
|
||||||
|
t.Fatalf("max. beobachtete offene pools = %d, ziel war <= %d", maxObservedOpen, maxOpen)
|
||||||
|
}
|
||||||
|
if router.OpenCount() > maxOpen {
|
||||||
|
t.Fatalf("finale offene pools = %d, ziel war <= %d", router.OpenCount(), maxOpen)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Rate-Limiting funktioniert korrekt
|
||||||
|
// unter Mehrinstanz-Last (mehrere "Core-Instanzen" mit geteiltem Postgres-
|
||||||
|
// Zustand) aus sechs gleichzeitig zugreifenden Modulen, nicht nur im
|
||||||
|
// Einzelinstanz-Test (der bereits in API-03 abgedeckt ist).
|
||||||
|
//
|
||||||
|
// Zielwert: bei konfiguriertem Limit=500 und insgesamt 1200 Anfragen ueber
|
||||||
|
// DREI simulierte Core-Instanzen (separate Pools/Store-Objekte) hinweg
|
||||||
|
// werden EXAKT 500 Anfragen erlaubt — kein Overcounting durch fehlende
|
||||||
|
// Koordination zwischen den Instanzen, kein Undercounting durch verlorene
|
||||||
|
// Updates.
|
||||||
|
func TestLoad_RateLimitingCorrectAcrossMultipleInstancesUnderSixModuleLoad(t *testing.T) {
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
const instanceCount = 3
|
||||||
|
pools := make([]*pgxpool.Pool, instanceCount)
|
||||||
|
stores := make([]*ratelimit.Store, instanceCount)
|
||||||
|
for i := 0; i < instanceCount; i++ {
|
||||||
|
p, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool %d: %v", i, err)
|
||||||
|
}
|
||||||
|
defer p.Close()
|
||||||
|
if i == 0 {
|
||||||
|
if _, err := p.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS rate_limit_configs (
|
||||||
|
key TEXT PRIMARY KEY, limit_value INT NOT NULL, window_seconds INT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS rate_limit_counters (
|
||||||
|
key TEXT NOT NULL, window_start TIMESTAMPTZ NOT NULL, count INT NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (key, window_start)
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pools[i] = p
|
||||||
|
stores[i] = ratelimit.NewStore(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
key := fmt.Sprintf("qa08-key-%d", time.Now().UnixNano())
|
||||||
|
const limit = 500
|
||||||
|
if err := stores[0].SetLimit(ctx, key, limit, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
const totalRequests = 1200 // simulierte last aus sechs modulen ueber drei instanzen, deutlich ueber dem limit von 500
|
||||||
|
var allowedCount int64
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < totalRequests; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
instance := stores[i%instanceCount] // request "kommt" reihum von einer der drei core-instanzen
|
||||||
|
go func(s *ratelimit.Store) {
|
||||||
|
defer wg.Done()
|
||||||
|
res, err := s.Allow(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("allow: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if res.Allowed {
|
||||||
|
atomic.AddInt64(&allowedCount, 1)
|
||||||
|
}
|
||||||
|
}(instance)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
t.Logf("rate-limiting unter mehrinstanz-last: %d anfragen ueber %d instanzen, limit=%d, tatsaechlich erlaubt=%d",
|
||||||
|
totalRequests, instanceCount, limit, allowedCount)
|
||||||
|
|
||||||
|
if allowedCount != limit {
|
||||||
|
t.Fatalf("erlaubte anfragen ueber alle instanzen = %d, ziel war exakt %d (geteilter, korrekter zustand)", allowedCount, limit)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// StaleCache ist der generische Rechte-/Feature-Flag-Cache-Kontrakt
|
||||||
|
// (Akzeptanzkriterium 2): TTL-basiert, mit explizitem, benanntem Verhalten
|
||||||
|
// bei abgelaufenem Cache waehrend Core nicht erreichbar ist.
|
||||||
|
//
|
||||||
|
// - Get: FAIL-OPEN fuer Lesevorgaenge. Schlaegt der Refresh fehl, aber es
|
||||||
|
// gibt bereits einen (wenn auch abgelaufenen) Stand, wird dieser mit
|
||||||
|
// stale=true zurueckgegeben — Begruendung: ein bereits authentifiziertes
|
||||||
|
// Modul soll mit dem letztbekannten Stand weiterarbeiten koennen statt
|
||||||
|
// hart zu blockieren (siehe "Bekannte Fehler vermeiden" im Ticket).
|
||||||
|
// Existiert noch nie ein Stand, gibt es keinen sinnvollen Fallback —
|
||||||
|
// dann liefert auch Get einen Fehler.
|
||||||
|
// - RequireFresh: FAIL-CLOSED fuer sicherheitskritische Aktionen (z.B.
|
||||||
|
// ein komplett NEUER Login). Nutzt NIEMALS einen zwischengespeicherten
|
||||||
|
// Stand, ruft immer frisch ab — Begruendung: eine neue Vertrauens-
|
||||||
|
// entscheidung darf nicht auf veralteten Daten beruhen, auch wenn das
|
||||||
|
// bedeutet, dass die Aktion bei Core-Ausfall sichtbar fehlschlaegt statt
|
||||||
|
// unsicher "irgendwie" durchgelassen zu werden.
|
||||||
|
//
|
||||||
|
// LIC-02 (internal/flag.Service) implementiert bereits denselben Kontrakt
|
||||||
|
// fuer Feature-Flags — StaleCache verallgemeinert dasselbe Muster fuer
|
||||||
|
// JWT-Signaturschluessel, damit beide Faelle derselben dokumentierten
|
||||||
|
// Policy folgen.
|
||||||
|
type StaleCache[T any] struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
value T
|
||||||
|
hasValue bool
|
||||||
|
fetchedAt time.Time
|
||||||
|
ttl time.Duration
|
||||||
|
fetch func(ctx context.Context) (T, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStaleCache[T any](ttl time.Duration, fetch func(ctx context.Context) (T, error)) *StaleCache[T] {
|
||||||
|
return &StaleCache[T]{ttl: ttl, fetch: fetch}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get liefert den Cache-Wert. FAIL-OPEN: bei Refresh-Fehler wird ein
|
||||||
|
// vorhandener, ggf. abgelaufener Stand zurueckgegeben (stale=true).
|
||||||
|
func (c *StaleCache[T]) Get(ctx context.Context) (value T, stale bool, err error) {
|
||||||
|
c.mu.RLock()
|
||||||
|
fresh := c.hasValue && time.Since(c.fetchedAt) < c.ttl
|
||||||
|
if fresh {
|
||||||
|
v := c.value
|
||||||
|
c.mu.RUnlock()
|
||||||
|
return v, false, nil
|
||||||
|
}
|
||||||
|
c.mu.RUnlock()
|
||||||
|
|
||||||
|
newVal, fetchErr := c.fetch(ctx)
|
||||||
|
if fetchErr == nil {
|
||||||
|
c.mu.Lock()
|
||||||
|
c.value, c.hasValue, c.fetchedAt = newVal, true, time.Now()
|
||||||
|
c.mu.Unlock()
|
||||||
|
return newVal, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
if c.hasValue {
|
||||||
|
return c.value, true, nil
|
||||||
|
}
|
||||||
|
var zero T
|
||||||
|
return zero, false, fmt.Errorf("cache leer und refresh fehlgeschlagen: %w", fetchErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireFresh ruft IMMER frisch ab (FAIL-CLOSED) — fuer sicherheitskritische
|
||||||
|
// Aktionen, die niemals auf einem zwischengespeicherten Stand basieren duerfen.
|
||||||
|
func (c *StaleCache[T]) RequireFresh(ctx context.Context) (T, error) {
|
||||||
|
v, err := c.fetch(ctx)
|
||||||
|
if err != nil {
|
||||||
|
var zero T
|
||||||
|
return zero, fmt.Errorf("core nicht erreichbar, sicherheitskritische aktion abgelehnt: %w", err)
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
c.value, c.hasValue, c.fetchedAt = v, true, time.Now()
|
||||||
|
c.mu.Unlock()
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Claims struct {
|
||||||
|
Subject string `json:"sub"`
|
||||||
|
TenantSlug string `json:"tenant"`
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue signiert ein Token mit dem aktuellen Signierschluessel und traegt
|
||||||
|
// dessen KID im JWT-Header ein — der Verifier auf Modulseite waehlt darueber
|
||||||
|
// den passenden oeffentlichen Schluessel aus PublicKeySet() aus.
|
||||||
|
func (m *KeyManager) Issue(subject, tenantSlug string, ttl time.Duration) (string, error) {
|
||||||
|
key, err := m.SigningKey()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
now := time.Now()
|
||||||
|
claims := Claims{
|
||||||
|
Subject: subject,
|
||||||
|
TenantSlug: tenantSlug,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(now.Add(ttl)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodEdDSA, claims)
|
||||||
|
token.Header["kid"] = key.KID
|
||||||
|
return token.SignedString(key.Private)
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwksResponse struct {
|
||||||
|
Keys []jwksKey `json:"keys"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwksKey struct {
|
||||||
|
Kid string `json:"kid"`
|
||||||
|
PublicKey string `json:"public_key"` // base64 (raw Ed25519, 32 Byte)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServeJWKS liefert alle bekannten oeffentlichen Schluessel als JSON —
|
||||||
|
// Module fragen dies periodisch ab (nicht pro Request), siehe Verifier.
|
||||||
|
func (m *KeyManager) ServeJWKS(w http.ResponseWriter, r *http.Request) {
|
||||||
|
set := m.PublicKeySet()
|
||||||
|
resp := jwksResponse{Keys: make([]jwksKey, 0, len(set))}
|
||||||
|
for kid, pub := range set {
|
||||||
|
resp.Keys = append(resp.Keys, jwksKey{Kid: kid, PublicKey: base64.StdEncoding.EncodeToString(pub)})
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseJWKS dekodiert die JSON-Antwort von ServeJWKS zurueck in kid->PublicKey
|
||||||
|
// — Hilfsfunktion fuer Module, die JWKS per HTTP abrufen.
|
||||||
|
func ParseJWKS(data []byte) (map[string][]byte, error) {
|
||||||
|
var resp jwksResponse
|
||||||
|
if err := json.Unmarshal(data, &resp); err != nil {
|
||||||
|
return nil, fmt.Errorf("jwks parsen: %w", err)
|
||||||
|
}
|
||||||
|
out := make(map[string][]byte, len(resp.Keys))
|
||||||
|
for _, k := range resp.Keys {
|
||||||
|
raw, err := base64.StdEncoding.DecodeString(k.PublicKey)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("oeffentlichen schluessel %q dekodieren: %w", k.Kid, err)
|
||||||
|
}
|
||||||
|
out[k.Kid] = raw
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
// Package moduletrust implementiert Core API-05: asymmetrische JWT-Signatur
|
||||||
|
// mit Schluesselverteilung (JWKS), damit DMS/Mail/Archive/Workflow JWTs
|
||||||
|
// LOKAL verifizieren koennen, ohne pro Aufruf einen synchronen Request an
|
||||||
|
// Core zu stellen — Core darf Fundament sein, ohne zum Flaschenhals zu
|
||||||
|
// werden (siehe Entscheidungsverlauf "Vertrauensstellung Core<->Module" in
|
||||||
|
// nexarch-state.json). IAM-02s HS256-Session-Cookie (Browser-Login) bleibt
|
||||||
|
// unangetastet — dies ist ein zusaetzlicher, getrennter Vertrauensmechanismus
|
||||||
|
// fuer Modul-zu-Modul/Modul-zu-Core-Aufrufe.
|
||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ed25519"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type KeyPair struct {
|
||||||
|
KID string
|
||||||
|
Private ed25519.PrivateKey
|
||||||
|
Public ed25519.PublicKey
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyManager haelt ALLE noch gueltigen Schluesselpaare — nicht nur das
|
||||||
|
// aktuell signierende. Rotate erzeugt ein neues Paar und behaelt die alten
|
||||||
|
// fuer die Verifikation bereits ausgestellter Tokens (Akzeptanzkriterium 3:
|
||||||
|
// Rotation ohne Ausfallzeit fuer andere Module).
|
||||||
|
type KeyManager struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
keys []KeyPair // aeltestes zuerst, neuestes zuletzt
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewKeyManager() (*KeyManager, error) {
|
||||||
|
m := &KeyManager{}
|
||||||
|
if _, err := m.Rotate(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rotate erzeugt ein neues Ed25519-Schluesselpaar mit eigener KID und macht
|
||||||
|
// es zum aktuellen Signierschluessel. Aeltere Schluessel bleiben in
|
||||||
|
// PublicKeySet() erhalten, damit bereits ausgestellte Tokens weiterhin
|
||||||
|
// verifizierbar sind.
|
||||||
|
func (m *KeyManager) Rotate() (KeyPair, error) {
|
||||||
|
pub, priv, err := ed25519.GenerateKey(nil)
|
||||||
|
if err != nil {
|
||||||
|
return KeyPair{}, fmt.Errorf("schluesselpaar erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
kidBytes := make([]byte, 8)
|
||||||
|
if _, err := rand.Read(kidBytes); err != nil {
|
||||||
|
return KeyPair{}, fmt.Errorf("kid erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
kp := KeyPair{KID: hex.EncodeToString(kidBytes), Private: priv, Public: pub}
|
||||||
|
|
||||||
|
m.mu.Lock()
|
||||||
|
m.keys = append(m.keys, kp)
|
||||||
|
m.mu.Unlock()
|
||||||
|
return kp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SigningKey liefert den aktuellen (neuesten) Schluessel zum Signieren neuer Tokens.
|
||||||
|
func (m *KeyManager) SigningKey() (KeyPair, error) {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
if len(m.keys) == 0 {
|
||||||
|
return KeyPair{}, fmt.Errorf("moduletrust: kein schluessel vorhanden")
|
||||||
|
}
|
||||||
|
return m.keys[len(m.keys)-1], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublicKeySet liefert ALLE bekannten oeffentlichen Schluessel (kid ->
|
||||||
|
// public key) — die Grundlage fuer den JWKS-Endpunkt.
|
||||||
|
func (m *KeyManager) PublicKeySet() map[string]ed25519.PublicKey {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
out := make(map[string]ed25519.PublicKey, len(m.keys))
|
||||||
|
for _, k := range m.keys {
|
||||||
|
out[k.KID] = k.Public
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIssueAndVerify_RoundTrip(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
claims, err := v.Verify(context.Background(), token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.Subject != "user-1" || claims.TenantSlug != "acme" {
|
||||||
|
t.Fatalf("claims unerwartet: %+v", claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Verifikation lokal, kein Request pro Aufruf.
|
||||||
|
func TestVerify_DoesNotFetchPerCall(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
fetchCalls := 0
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
mu.Lock()
|
||||||
|
fetchCalls++
|
||||||
|
mu.Unlock()
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
if fetchCalls != 1 {
|
||||||
|
t.Fatalf("erwartet genau 1 fetch fuer 10 Verify-Aufrufe innerhalb der TTL, habe %d", fetchCalls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Core simuliert nicht erreichbar,
|
||||||
|
// bereits authentifizierte Nutzer bleiben funktionsfaehig (Fail-Open mit
|
||||||
|
// letztbekanntem Schluesselstand).
|
||||||
|
func TestVerify_FailsOpenWhenCoreUnreachableButStaleKeysExist(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown := false
|
||||||
|
v := NewVerifier(30*time.Millisecond, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
if coreDown {
|
||||||
|
return nil, errors.New("core nicht erreichbar (simuliert)")
|
||||||
|
}
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Cache vorwaermen, waehrend Core noch erreichbar ist.
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify (warm): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// "Core abschalten" und TTL ablaufen lassen.
|
||||||
|
coreDown = true
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify sollte trotz core-ausfall mit letztbekanntem stand funktionieren: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: neue sicherheitskritische Aktionen
|
||||||
|
// (z.B. neuer Login) schlagen bei Core-Ausfall klar fehl statt unsicher
|
||||||
|
// durchgelassen zu werden — auch wenn ein (aelterer) Cache-Stand existiert.
|
||||||
|
func TestRequireFreshKeys_FailsClosedWhenCoreUnreachable(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown := false
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
if coreDown {
|
||||||
|
return nil, errors.New("core nicht erreichbar (simuliert)")
|
||||||
|
}
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Cache vorwaermen (existiert jetzt ein "veralteter" gueltiger Stand).
|
||||||
|
if _, _, err := v.cache.Get(context.Background()); err != nil {
|
||||||
|
t.Fatalf("warm cache: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown = true
|
||||||
|
if err := v.RequireFreshKeys(context.Background()); err == nil {
|
||||||
|
t.Fatal("erwartet fehler (fail-closed) bei core-ausfall, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Schluesselrotation ohne Ausfallzeit —
|
||||||
|
// ein bereits ausgestelltes Token bleibt nach Rotation weiterhin
|
||||||
|
// verifizierbar, ein zweites (simuliertes) Modul bekommt beide Schluessel.
|
||||||
|
func TestRotate_NoDowntimeForAlreadyIssuedTokens(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
oldToken, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue (alt): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := km.Rotate(); err != nil {
|
||||||
|
t.Fatalf("rotate: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
newToken, err := km.Issue("user-2", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue (neu): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simuliertes zweites Modul: fragt den vollstaendigen Schluesselsatz ab.
|
||||||
|
moduleB := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
if _, err := moduleB.Verify(context.Background(), oldToken); err != nil {
|
||||||
|
t.Fatalf("altes token sollte nach rotation weiterhin gueltig sein: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := moduleB.Verify(context.Background(), newToken); err != nil {
|
||||||
|
t.Fatalf("neues token sollte gueltig sein: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsUnknownKid(t *testing.T) {
|
||||||
|
km1, _ := NewKeyManager()
|
||||||
|
km2, _ := NewKeyManager() // komplett anderer, unbekannter schluessel
|
||||||
|
|
||||||
|
token, err := km1.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km2.PublicKeySet(), nil // kennt km1s schluessel nicht
|
||||||
|
})
|
||||||
|
if _, err := v.Verify(context.Background(), token); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJWKSRoundTrip(t *testing.T) {
|
||||||
|
km, _ := NewKeyManager()
|
||||||
|
km.Rotate()
|
||||||
|
|
||||||
|
var buf []byte
|
||||||
|
rec := &captureWriter{}
|
||||||
|
km.ServeJWKS(rec, nil)
|
||||||
|
buf = rec.body
|
||||||
|
|
||||||
|
parsed, err := ParseJWKS(buf)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse jwks: %v", err)
|
||||||
|
}
|
||||||
|
if len(parsed) != len(km.PublicKeySet()) {
|
||||||
|
t.Fatalf("erwartet %d schluessel, habe %d", len(km.PublicKeySet()), len(parsed))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type captureWriter struct {
|
||||||
|
body []byte
|
||||||
|
header http.Header
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *captureWriter) Header() http.Header {
|
||||||
|
if w.header == nil {
|
||||||
|
w.header = http.Header{}
|
||||||
|
}
|
||||||
|
return w.header
|
||||||
|
}
|
||||||
|
func (w *captureWriter) Write(p []byte) (int, error) { w.body = append(w.body, p...); return len(p), nil }
|
||||||
|
func (w *captureWriter) WriteHeader(statusCode int) {}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrInvalidToken = errors.New("moduletrust: ungueltiges token")
|
||||||
|
|
||||||
|
// KeyFetchFunc holt den aktuellen Schluesselsatz von Core (z.B. per HTTP-GET
|
||||||
|
// auf ServeJWKS + ParseJWKS). Wird vom Verifier nur bei abgelaufener TTL
|
||||||
|
// aufgerufen — NICHT bei jeder Verify()-Anfrage (Akzeptanzkriterium 1).
|
||||||
|
type KeyFetchFunc func(ctx context.Context) (map[string]ed25519.PublicKey, error)
|
||||||
|
|
||||||
|
// Verifier ist die Modulseite von API-05: verifiziert JWTs LOKAL gegen einen
|
||||||
|
// per StaleCache zwischengespeicherten Schluesselsatz, ohne pro Aufruf einen
|
||||||
|
// synchronen Request an Core zu stellen.
|
||||||
|
type Verifier struct {
|
||||||
|
cache *StaleCache[map[string]ed25519.PublicKey]
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewVerifier(ttl time.Duration, fetch KeyFetchFunc) *Verifier {
|
||||||
|
return &Verifier{cache: NewStaleCache(ttl, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return fetch(ctx)
|
||||||
|
})}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft die Signatur LOKAL gegen den (ggf. abgelaufenen, aber
|
||||||
|
// vorhandenen) Schluesselsatz — FAIL-OPEN fuer bereits ausgestellte Tokens
|
||||||
|
// (Akzeptanzkriterium 2): ist Core nicht erreichbar, aber ein alter
|
||||||
|
// Schluesselsatz bekannt, wird damit weiter verifiziert.
|
||||||
|
func (v *Verifier) Verify(ctx context.Context, tokenString string) (*Claims, error) {
|
||||||
|
keys, _, err := v.cache.Get(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
claims := &Claims{}
|
||||||
|
token, err := jwt.ParseWithClaims(tokenString, claims, func(t *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := t.Method.(*jwt.SigningMethodEd25519); !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
kid, _ := t.Header["kid"].(string)
|
||||||
|
pub, ok := keys[kid]
|
||||||
|
if !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return pub, nil
|
||||||
|
})
|
||||||
|
if err != nil || !token.Valid {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireFreshKeys ruft IMMER frisch von Core ab (FAIL-CLOSED) — fuer
|
||||||
|
// sicherheitskritische Aktionen wie einen komplett neuen Login
|
||||||
|
// (Akzeptanzkriterium 2): schlaegt klar fehl, wenn Core nicht erreichbar
|
||||||
|
// ist, statt auf einem veralteten Schluesselsatz zu vertrauen.
|
||||||
|
func (v *Verifier) RequireFreshKeys(ctx context.Context) error {
|
||||||
|
_, err := v.cache.RequireFresh(ctx)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
// 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
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
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,64 @@
|
|||||||
|
package ratelimit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/apiserver"
|
||||||
|
)
|
||||||
|
|
||||||
|
// KeyFunc bestimmt den Rate-Limit-Schluessel fuer eine Anfrage — typischerweise
|
||||||
|
// der Tenant-Slug aus apiserver.RequestContext, siehe KeyByTenant. Als
|
||||||
|
// eigenstaendiger Typ austauschbar (z.B. spaeter API-Token-basiert), ohne
|
||||||
|
// internal/apiserver aendern zu muessen (Kein Umbau angrenzender Bereiche).
|
||||||
|
type KeyFunc func(r *http.Request) (string, bool)
|
||||||
|
|
||||||
|
// KeyByTenant liest den Tenant aus dem von internal/apiserver.authAndTenantContext
|
||||||
|
// gesetzten RequestContext (IAM-02/API-01) — dieselbe Middleware-Kette,
|
||||||
|
// keine zweite Authentifizierung.
|
||||||
|
func KeyByTenant(r *http.Request) (string, bool) {
|
||||||
|
rc, ok := apiserver.FromContext(r.Context())
|
||||||
|
if !ok || rc.TenantSlug == "" {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return rc.TenantSlug, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Middleware setzt sich VOR den eigentlichen Handler (nach Auth+Tenant-
|
||||||
|
// Kontext, siehe KeyByTenant) und lehnt Anfragen ueber dem konfigurierten
|
||||||
|
// Limit mit 429 + Retry-After ab (Akzeptanzkriterium 3).
|
||||||
|
func Middleware(store *Store, keyFn KeyFunc, next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
key, ok := keyFn(r)
|
||||||
|
if !ok {
|
||||||
|
// Kein Schluessel ermittelbar (z.B. kein Tenant-Kontext) — die
|
||||||
|
// Auth-Pruefung selbst ist Sache von authAndTenantContext, hier
|
||||||
|
// wird nur nicht limitiert, wenn schon kein Kontext vorliegt.
|
||||||
|
next(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := store.Allow(r.Context(), key)
|
||||||
|
if err != nil {
|
||||||
|
apiserver.WriteError(w, http.StatusInternalServerError, "rate_limit_error", "rate-limit-pruefung fehlgeschlagen")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("X-RateLimit-Limit", fmt.Sprintf("%d", result.Limit))
|
||||||
|
w.Header().Set("X-RateLimit-Remaining", fmt.Sprintf("%d", result.Remaining))
|
||||||
|
|
||||||
|
if !result.Allowed {
|
||||||
|
retryAfterSeconds := int(math.Ceil(result.RetryAfter.Seconds()))
|
||||||
|
if retryAfterSeconds < 1 {
|
||||||
|
retryAfterSeconds = 1
|
||||||
|
}
|
||||||
|
w.Header().Set("Retry-After", fmt.Sprintf("%d", retryAfterSeconds))
|
||||||
|
apiserver.WriteError(w, http.StatusTooManyRequests, "rate_limit_exceeded",
|
||||||
|
"zu viele anfragen, bitte spaeter erneut versuchen")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
next(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
package ratelimit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/apiserver"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupMiddlewareTest(t *testing.T) (*apiserver.Server, *auth.TokenIssuer, *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 rate_limit_configs (
|
||||||
|
key TEXT PRIMARY KEY, limit_value INT NOT NULL, window_seconds INT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS rate_limit_counters (
|
||||||
|
key TEXT NOT NULL, window_start TIMESTAMPTZ NOT NULL, count INT NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (key, window_start)
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
srv := apiserver.NewServer(issuer)
|
||||||
|
store := NewStore(pool)
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return srv, issuer, store, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Ueberschreitung liefert 429 mit
|
||||||
|
// Retry-After-Header, ueber die vollstaendige Middleware-Kette (Auth ->
|
||||||
|
// Tenant-Kontext -> Rate-Limit -> Handler) hinweg.
|
||||||
|
func TestMiddleware_Returns429WithRetryAfterOnExceeded(t *testing.T) {
|
||||||
|
srv, issuer, store, cleanup := setupMiddlewareTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
tenantSlug := newTestKey()
|
||||||
|
if err := store.SetLimit(ctx, tenantSlug, 1, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
called := 0
|
||||||
|
srv.HandleV1("/limited", Middleware(store, KeyByTenant, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
called++
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", tenantSlug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req1 := httptest.NewRequest(http.MethodGet, "/api/v1/limited", nil)
|
||||||
|
req1.AddCookie(&http.Cookie{Name: auth.CookieName, Value: token})
|
||||||
|
rec1 := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec1, req1)
|
||||||
|
if rec1.Code != http.StatusOK {
|
||||||
|
t.Fatalf("1. anfrage: status = %d, want 200", rec1.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
req2 := httptest.NewRequest(http.MethodGet, "/api/v1/limited", nil)
|
||||||
|
req2.AddCookie(&http.Cookie{Name: auth.CookieName, Value: token})
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(rec2, req2)
|
||||||
|
if rec2.Code != http.StatusTooManyRequests {
|
||||||
|
t.Fatalf("2. anfrage: status = %d, want 429", rec2.Code)
|
||||||
|
}
|
||||||
|
if rec2.Header().Get("Retry-After") == "" {
|
||||||
|
t.Fatal("erwartet gesetzten Retry-After-Header bei 429")
|
||||||
|
}
|
||||||
|
if called != 1 {
|
||||||
|
t.Fatalf("handler wurde %d mal aufgerufen, want genau 1 (2. anfrage haette nicht durchgereicht werden duerfen)", called)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: das Limit ist pro Tenant konfigurierbar — ein
|
||||||
|
// anderer Tenant (anderer Key) bleibt von der Ausschoepfung unberuehrt.
|
||||||
|
func TestMiddleware_DifferentTenantsHaveIndependentLimits(t *testing.T) {
|
||||||
|
srv, issuer, store, cleanup := setupMiddlewareTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
tenantA := newTestKey()
|
||||||
|
tenantB := newTestKey()
|
||||||
|
if err := store.SetLimit(ctx, tenantA, 1, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit a: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.SetLimit(ctx, tenantB, 1, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit b: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
srv.HandleV1("/limited2", Middleware(store, KeyByTenant, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
tokenA, _ := issuer.Issue("user-a", tenantA)
|
||||||
|
tokenB, _ := issuer.Issue("user-b", tenantB)
|
||||||
|
|
||||||
|
// Tenant A schoepft sein Limit aus.
|
||||||
|
reqA := httptest.NewRequest(http.MethodGet, "/api/v1/limited2", nil)
|
||||||
|
reqA.AddCookie(&http.Cookie{Name: auth.CookieName, Value: tokenA})
|
||||||
|
recA := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(recA, reqA)
|
||||||
|
if recA.Code != http.StatusOK {
|
||||||
|
t.Fatalf("tenant a, 1. anfrage: status = %d, want 200", recA.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tenant B ist von der Ausschoepfung bei A unberuehrt.
|
||||||
|
reqB := httptest.NewRequest(http.MethodGet, "/api/v1/limited2", nil)
|
||||||
|
reqB.AddCookie(&http.Cookie{Name: auth.CookieName, Value: tokenB})
|
||||||
|
recB := httptest.NewRecorder()
|
||||||
|
srv.Handler().ServeHTTP(recB, reqB)
|
||||||
|
if recB.Code != http.StatusOK {
|
||||||
|
t.Fatalf("tenant b haette trotz ausgeschoepftem limit von tenant a erlaubt sein muessen, status = %d", recB.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
// Package ratelimit implementiert Core API-03: eine zentrale Rate-Limiting-
|
||||||
|
// Schicht fuer die gesamte Core-API mit GETEILTEM, EXTERNEM Zustand in
|
||||||
|
// Postgres — kein In-Process-Zaehler (siehe "Bekannte Fehler vermeiden" im
|
||||||
|
// Ticket: dasselbe Risiko wie bei IAM-07s In-Memory-Lockout). Fixed-Window-
|
||||||
|
// Algorithmus: einfach, korrekt unter nebenlaeufigem Zugriff (atomares
|
||||||
|
// UPSERT wie internal/usage.Store.Increment), und fuer ein API-Gateway
|
||||||
|
// ausreichend praezise — kein Sliding-Window-Overhead noetig.
|
||||||
|
package ratelimit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefaultLimit/DefaultWindow gelten fuer jeden Schluessel (Tenant oder
|
||||||
|
// API-Token), fuer den keine eigene Konfiguration existiert
|
||||||
|
// (Akzeptanzkriterium 1: "konfigurierbar", nicht "verpflichtend konfiguriert").
|
||||||
|
const (
|
||||||
|
DefaultLimit = 100
|
||||||
|
DefaultWindow = time.Minute
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config ist das je Schluessel konfigurierbare Limit.
|
||||||
|
type Config struct {
|
||||||
|
Limit int
|
||||||
|
Window time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store haelt Konfiguration UND Zaehlerstand in Postgres — beides ueber
|
||||||
|
// dieselbe Verbindung erreichbar, damit mehrere Dienstinstanzen denselben
|
||||||
|
// Zustand sehen (Akzeptanzkriterium 2).
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetLimit setzt die Konfiguration fuer EINEN Schluessel (z.B. einen
|
||||||
|
// Tenant-Slug oder eine API-Token-ID) — wirkt sich nicht auf andere
|
||||||
|
// Schluessel aus (Akzeptanzkriterium 1 / Pruefung 3).
|
||||||
|
func (s *Store) SetLimit(ctx context.Context, key string, limit int, window time.Duration) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO rate_limit_configs (key, limit_value, window_seconds)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
ON CONFLICT (key) DO UPDATE SET limit_value = $2, window_seconds = $3
|
||||||
|
`, key, limit, int(window.Seconds()))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("rate-limit-konfiguration speichern: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) getConfig(ctx context.Context, key string) (Config, error) {
|
||||||
|
var limit, windowSeconds int
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT limit_value, window_seconds FROM rate_limit_configs WHERE key = $1
|
||||||
|
`, key).Scan(&limit, &windowSeconds)
|
||||||
|
if err != nil {
|
||||||
|
if err == pgx.ErrNoRows {
|
||||||
|
return Config{Limit: DefaultLimit, Window: DefaultWindow}, nil
|
||||||
|
}
|
||||||
|
return Config{}, fmt.Errorf("rate-limit-konfiguration lesen: %w", err)
|
||||||
|
}
|
||||||
|
return Config{Limit: limit, Window: time.Duration(windowSeconds) * time.Second}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Result ist der Ausgang einer Allow-Pruefung (Akzeptanzkriterium 3).
|
||||||
|
type Result struct {
|
||||||
|
Allowed bool
|
||||||
|
Limit int
|
||||||
|
Remaining int
|
||||||
|
RetryAfter time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allow erhoeht den Zaehler fuer (key, aktuelles Zeitfenster) ATOMAR ueber
|
||||||
|
// ein einziges UPSERT (dasselbe Muster wie internal/usage.Store.Increment)
|
||||||
|
// und vergleicht das Ergebnis gegen die konfigurierte Grenze — kein
|
||||||
|
// Lesen-Erhoehen-Schreiben in Go, damit zwei Dienstinstanzen, die
|
||||||
|
// gleichzeitig gegen dieselbe Datenbank inkrementieren, sich niemals
|
||||||
|
// gegenseitig ueberschreiben (Akzeptanzkriterium 2 / Pruefung 1).
|
||||||
|
func (s *Store) Allow(ctx context.Context, key string) (Result, error) {
|
||||||
|
cfg, err := s.getConfig(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
windowSeconds := int64(cfg.Window.Seconds())
|
||||||
|
if windowSeconds <= 0 {
|
||||||
|
windowSeconds = int64(DefaultWindow.Seconds())
|
||||||
|
}
|
||||||
|
now := time.Now().UTC()
|
||||||
|
windowStart := time.Unix((now.Unix()/windowSeconds)*windowSeconds, 0).UTC()
|
||||||
|
windowEnd := windowStart.Add(time.Duration(windowSeconds) * time.Second)
|
||||||
|
|
||||||
|
var count int
|
||||||
|
err = s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO rate_limit_counters (key, window_start, count)
|
||||||
|
VALUES ($1, $2, 1)
|
||||||
|
ON CONFLICT (key, window_start) DO UPDATE
|
||||||
|
SET count = rate_limit_counters.count + 1
|
||||||
|
RETURNING count
|
||||||
|
`, key, windowStart).Scan(&count)
|
||||||
|
if err != nil {
|
||||||
|
return Result{}, fmt.Errorf("rate-limit-zaehler erhoehen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
remaining := cfg.Limit - count
|
||||||
|
if remaining < 0 {
|
||||||
|
remaining = 0
|
||||||
|
}
|
||||||
|
if count > cfg.Limit {
|
||||||
|
return Result{
|
||||||
|
Allowed: false,
|
||||||
|
Limit: cfg.Limit,
|
||||||
|
Remaining: 0,
|
||||||
|
RetryAfter: windowEnd.Sub(now),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
return Result{Allowed: true, Limit: cfg.Limit, Remaining: remaining}, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
package ratelimit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"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 rate_limit_configs (
|
||||||
|
key TEXT PRIMARY KEY, limit_value INT NOT NULL, window_seconds INT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS rate_limit_counters (
|
||||||
|
key TEXT NOT NULL, window_start TIMESTAMPTZ NOT NULL, count INT NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (key, window_start)
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestKey() string {
|
||||||
|
return fmt.Sprintf("test-key-%d", time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Ueberschreitung des Limits wird
|
||||||
|
// nachweislich erkannt.
|
||||||
|
func TestAllow_RejectsAfterLimitExceeded(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
store := NewStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
key := newTestKey()
|
||||||
|
|
||||||
|
if err := store.SetLimit(ctx, key, 3, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
res, err := store.Allow(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("allow %d: %v", i, err)
|
||||||
|
}
|
||||||
|
if !res.Allowed {
|
||||||
|
t.Fatalf("anfrage %d haette erlaubt sein muessen, limit=3", i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
res, err := store.Allow(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("allow (4.): %v", err)
|
||||||
|
}
|
||||||
|
if res.Allowed {
|
||||||
|
t.Fatal("4. anfrage haette abgelehnt werden muessen (limit=3)")
|
||||||
|
}
|
||||||
|
if res.RetryAfter <= 0 {
|
||||||
|
t.Fatalf("erwartet positive retry-after-dauer, habe %v", res.RetryAfter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 / Pruefung 3: Konfigurationsaenderung wirkt sich
|
||||||
|
// NICHT auf andere Schluessel (Tenants) aus.
|
||||||
|
func TestSetLimit_DoesNotAffectOtherKeys(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
store := NewStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
keyA := newTestKey()
|
||||||
|
keyB := newTestKey()
|
||||||
|
|
||||||
|
if err := store.SetLimit(ctx, keyA, 1, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit a: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
resA1, _ := store.Allow(ctx, keyA)
|
||||||
|
resA2, _ := store.Allow(ctx, keyA)
|
||||||
|
if !resA1.Allowed || resA2.Allowed {
|
||||||
|
t.Fatalf("key a: erwartet erlaubt,abgelehnt, habe %v,%v", resA1.Allowed, resA2.Allowed)
|
||||||
|
}
|
||||||
|
|
||||||
|
// keyB hat keine eigene Konfiguration -> DefaultLimit, unbeeinflusst von keyA.
|
||||||
|
resB, err := store.Allow(ctx, keyB)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("allow b: %v", err)
|
||||||
|
}
|
||||||
|
if !resB.Allowed {
|
||||||
|
t.Fatal("key b haette trotz limit-ueberschreitung bei key a erlaubt sein muessen")
|
||||||
|
}
|
||||||
|
if resB.Limit != DefaultLimit {
|
||||||
|
t.Fatalf("key b limit = %d, want default %d", resB.Limit, DefaultLimit)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: zwei "Dienstinstanzen" (zwei
|
||||||
|
// unabhaengige Pools/Store-Objekte) gegen dieselbe Datenbank setzen
|
||||||
|
// dasselbe Limit korrekt durch — kein In-Process-Zustand kann das leisten.
|
||||||
|
func TestAllow_TwoInstancesShareStateCorrectly(t *testing.T) {
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pool2, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("zweiter pool (simuliert zweite instanz): %v", err)
|
||||||
|
}
|
||||||
|
defer pool2.Close()
|
||||||
|
|
||||||
|
storeInstance1 := NewStore(pool)
|
||||||
|
storeInstance2 := NewStore(pool2)
|
||||||
|
|
||||||
|
key := newTestKey()
|
||||||
|
const limit = 20
|
||||||
|
if err := storeInstance1.SetLimit(ctx, key, limit, time.Minute); err != nil {
|
||||||
|
t.Fatalf("setlimit: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
const totalRequests = 50
|
||||||
|
var allowedCount int64
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < totalRequests; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
store := storeInstance1
|
||||||
|
if i%2 == 0 {
|
||||||
|
store = storeInstance2 // Haelfte der Anfragen "kommt" von der zweiten Instanz
|
||||||
|
}
|
||||||
|
go func(s *Store) {
|
||||||
|
defer wg.Done()
|
||||||
|
res, err := s.Allow(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("allow: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if res.Allowed {
|
||||||
|
atomic.AddInt64(&allowedCount, 1)
|
||||||
|
}
|
||||||
|
}(store)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
if allowedCount != limit {
|
||||||
|
t.Fatalf("erlaubte anfragen ueber beide instanzen = %d, want exakt %d (geteilter zustand)", allowedCount, limit)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
// 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
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
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,136 @@
|
|||||||
|
package tenant
|
||||||
|
|
||||||
|
import (
|
||||||
|
"container/list"
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrMissingTenantContext wird geliefert, wenn keine Tenant-Kennung
|
||||||
|
// uebergeben wurde — es gibt bewusst keinen impliziten Default-Tenant
|
||||||
|
// (TEN-06 Akzeptanzkriterium 3).
|
||||||
|
var ErrMissingTenantContext = errors.New("tenant: kein tenant-kontext angegeben")
|
||||||
|
|
||||||
|
// ErrUnknownTenant wird geliefert, wenn die Tenant-Kennung in der Registry
|
||||||
|
// nicht existiert.
|
||||||
|
var ErrUnknownTenant = errors.New("tenant: unbekannter tenant")
|
||||||
|
|
||||||
|
// Router loest den Tenant-Kontext (Slug, aus dem JWT-Claim von API-05) in
|
||||||
|
// eine wiederverwendbare Verbindung zur richtigen Tenant-Datenbank auf.
|
||||||
|
// Ein LRU-verwalteter Cache begrenzt die Zahl gleichzeitig offener
|
||||||
|
// pgxpool.Pool-Instanzen, damit die Zahl offener Postgres-Verbindungen NICHT
|
||||||
|
// linear mit der Mandantenzahl waechst (Akzeptanzkriterium 2).
|
||||||
|
type Router struct {
|
||||||
|
registry *Registry
|
||||||
|
maxOpen int
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
order *list.List // vorne = zuletzt benutzt
|
||||||
|
items map[string]*list.Element // slug -> element mit *routerEntry
|
||||||
|
}
|
||||||
|
|
||||||
|
type routerEntry struct {
|
||||||
|
slug string
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRouter(registry *Registry, maxOpen int) *Router {
|
||||||
|
if maxOpen < 1 {
|
||||||
|
maxOpen = 1
|
||||||
|
}
|
||||||
|
return &Router{
|
||||||
|
registry: registry,
|
||||||
|
maxOpen: maxOpen,
|
||||||
|
order: list.New(),
|
||||||
|
items: make(map[string]*list.Element),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve liefert einen wiederverwendeten Pool fuer den angegebenen Tenant.
|
||||||
|
// Ist der Tenant bereits im Cache, wird KEINE neue Verbindung aufgebaut
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 3).
|
||||||
|
func (r *Router) Resolve(ctx context.Context, tenantSlug string) (*pgxpool.Pool, error) {
|
||||||
|
if tenantSlug == "" {
|
||||||
|
return nil, ErrMissingTenantContext
|
||||||
|
}
|
||||||
|
|
||||||
|
r.mu.Lock()
|
||||||
|
if el, ok := r.items[tenantSlug]; ok {
|
||||||
|
r.order.MoveToFront(el)
|
||||||
|
pool := el.Value.(*routerEntry).pool
|
||||||
|
r.mu.Unlock()
|
||||||
|
return pool, nil
|
||||||
|
}
|
||||||
|
r.mu.Unlock()
|
||||||
|
|
||||||
|
// Registry-Lookup und Verbindungsaufbau bewusst ausserhalb des Locks,
|
||||||
|
// damit ein langsamer Verbindungsaufbau nicht alle anderen Tenants blockiert.
|
||||||
|
t, err := r.registry.GetBySlug(ctx, tenantSlug)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("%w: %s", ErrUnknownTenant, tenantSlug)
|
||||||
|
}
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, t.DBDSN)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("verbindung zu tenant %q aufbauen: %w", tenantSlug, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
|
||||||
|
// Zwischen Unlock oben und hier koennte ein paralleler Aufruf denselben
|
||||||
|
// Tenant bereits eingefuegt haben — dann die eigene, ueberzaehlige
|
||||||
|
// Verbindung wieder schliessen und die vorhandene verwenden.
|
||||||
|
if el, ok := r.items[tenantSlug]; ok {
|
||||||
|
r.order.MoveToFront(el)
|
||||||
|
existing := el.Value.(*routerEntry).pool
|
||||||
|
pool.Close()
|
||||||
|
return existing, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
el := r.order.PushFront(&routerEntry{slug: tenantSlug, pool: pool})
|
||||||
|
r.items[tenantSlug] = el
|
||||||
|
|
||||||
|
if r.order.Len() > r.maxOpen {
|
||||||
|
r.evictOldest()
|
||||||
|
}
|
||||||
|
|
||||||
|
return pool, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// evictOldest schliesst den am laengsten nicht genutzten Pool. Muss mit
|
||||||
|
// gehaltenem r.mu aufgerufen werden.
|
||||||
|
func (r *Router) evictOldest() {
|
||||||
|
oldest := r.order.Back()
|
||||||
|
if oldest == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
entry := oldest.Value.(*routerEntry)
|
||||||
|
r.order.Remove(oldest)
|
||||||
|
delete(r.items, entry.slug)
|
||||||
|
entry.pool.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// OpenCount liefert die aktuelle Zahl offen gehaltener Tenant-Pools —
|
||||||
|
// dient Tests/Monitoring, um AC2 nachzuweisen.
|
||||||
|
func (r *Router) OpenCount() int {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
return r.order.Len()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close schliesst alle offen gehaltenen Tenant-Pools, z.B. beim
|
||||||
|
// Herunterfahren des Core-Prozesses.
|
||||||
|
func (r *Router) Close() {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
for el := r.order.Front(); el != nil; el = el.Next() {
|
||||||
|
el.Value.(*routerEntry).pool.Close()
|
||||||
|
}
|
||||||
|
r.order.Init()
|
||||||
|
r.items = make(map[string]*list.Element)
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
package tenant
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newTestRouterSetup(t *testing.T, tenantCount int) (*Router, []Tenant, func()) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
registryPool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("registry pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := registryPool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS tenants (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
slug TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
db_name TEXT NOT NULL UNIQUE,
|
||||||
|
db_dsn TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatalf("registry-schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
registry := NewRegistry(registryPool)
|
||||||
|
dsnTemplate := strings.Replace(adminDSN, "/postgres?", "/%s?", 1)
|
||||||
|
provisioner := NewProvisioner(adminPool, registry, dsnTemplate)
|
||||||
|
|
||||||
|
var tenants []Tenant
|
||||||
|
var slugs []string
|
||||||
|
for i := 0; i < tenantCount; i++ {
|
||||||
|
slug := fmt.Sprintf("router_t%d", i)
|
||||||
|
slugs = append(slugs, slug)
|
||||||
|
tn, err := provisioner.Provision(ctx, slug, slug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("provision %s: %v", slug, err)
|
||||||
|
}
|
||||||
|
tenants = append(tenants, tn)
|
||||||
|
}
|
||||||
|
|
||||||
|
router := NewRouter(registry, 2) // klein gewaehlt, um Eviction im Test zu erzwingen
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
router.Close()
|
||||||
|
for _, slug := range slugs {
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbNameForSlug(slug)))
|
||||||
|
}
|
||||||
|
_, _ = registryPool.Exec(ctx, `DELETE FROM tenants WHERE slug = ANY($1)`, slugs)
|
||||||
|
registryPool.Close()
|
||||||
|
adminPool.Close()
|
||||||
|
}
|
||||||
|
return router, tenants, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Verbindung wird zuverlaessig anhand des Tenant-Kontexts aufgeloest.
|
||||||
|
func TestRouter_ResolvesCorrectTenantDatabase(t *testing.T) {
|
||||||
|
router, tenants, cleanup := newTestRouterSetup(t, 2)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := router.Resolve(ctx, tenants[0].Slug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve: %v", err)
|
||||||
|
}
|
||||||
|
var dbName string
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT current_database()`).Scan(&dbName); err != nil {
|
||||||
|
t.Fatalf("current_database: %v", err)
|
||||||
|
}
|
||||||
|
if dbName != tenants[0].DBName {
|
||||||
|
t.Fatalf("current_database() = %q, want %q", dbName, tenants[0].DBName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: fehlender/unbekannter Tenant-Kontext
|
||||||
|
// wird explizit abgewiesen statt irgendeine Verbindung zu liefern.
|
||||||
|
func TestRouter_RejectsMissingOrUnknownTenant(t *testing.T) {
|
||||||
|
router, _, cleanup := newTestRouterSetup(t, 1)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := router.Resolve(ctx, ""); !errors.Is(err, ErrMissingTenantContext) {
|
||||||
|
t.Fatalf("erwartet ErrMissingTenantContext, habe %v", err)
|
||||||
|
}
|
||||||
|
if _, err := router.Resolve(ctx, "nie-registrierter-slug"); !errors.Is(err, ErrUnknownTenant) {
|
||||||
|
t.Fatalf("erwartet ErrUnknownTenant, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 3: Verbindungswiederverwendung nachweislich
|
||||||
|
// gemessen — zweiter Resolve-Aufruf liefert exakt denselben Pool, kein
|
||||||
|
// erneuter Verbindungsaufbau.
|
||||||
|
func TestRouter_ReusesConnectionForSameTenant(t *testing.T) {
|
||||||
|
router, tenants, cleanup := newTestRouterSetup(t, 1)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
first, err := router.Resolve(ctx, tenants[0].Slug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve 1: %v", err)
|
||||||
|
}
|
||||||
|
second, err := router.Resolve(ctx, tenants[0].Slug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve 2: %v", err)
|
||||||
|
}
|
||||||
|
if first != second {
|
||||||
|
t.Fatal("erwartet identische pool-instanz bei wiederholtem resolve, habe unterschiedliche")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Lasttest mit mehr simulierten Mandanten
|
||||||
|
// als maxOpen — die Zahl gleichzeitig offener Tenant-Pools bleibt begrenzt
|
||||||
|
// (LRU-Eviction), waechst also NICHT linear mit der Mandantenzahl.
|
||||||
|
func TestRouter_BoundsOpenConnectionsUnderLoad(t *testing.T) {
|
||||||
|
const tenantCount = 6
|
||||||
|
router, tenants, cleanup := newTestRouterSetup(t, tenantCount)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
for _, tn := range tenants {
|
||||||
|
if _, err := router.Resolve(ctx, tn.Slug); err != nil {
|
||||||
|
t.Fatalf("resolve %s: %v", tn.Slug, err)
|
||||||
|
}
|
||||||
|
if router.OpenCount() > 2 {
|
||||||
|
t.Fatalf("OpenCount() = %d, erwartet <= maxOpen (2) nach jedem Resolve", router.OpenCount())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if router.OpenCount() != 2 {
|
||||||
|
t.Fatalf("erwartet genau maxOpen=2 offene pools nach %d tenants, habe %d", tenantCount, router.OpenCount())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evictete Tenants sind wieder ganz normal ueber die Registry aufloesbar
|
||||||
|
// (Cache-Miss fuehrt zu neuem, funktionierendem Pool, kein Fehlerzustand).
|
||||||
|
pool, err := router.Resolve(ctx, tenants[0].Slug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve nach eviction: %v", err)
|
||||||
|
}
|
||||||
|
var one int
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT 1`).Scan(&one); err != nil {
|
||||||
|
t.Fatalf("query nach re-resolve: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS role_assignment_history;
|
|
||||||
DROP TABLE IF EXISTS role_assignments;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
-- 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);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS ldap_group_role_mapping;
|
|
||||||
DROP TABLE IF EXISTS ldap_config;
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
-- 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'))
|
|
||||||
);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS oidc_states;
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
-- 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()
|
|
||||||
);
|
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
||||||
ROLE="nexarch_test"
|
ROLE="nexarch_test"
|
||||||
|
|
||||||
export PGPASSWORD="$PASS"
|
export PGPASSWORD="$PASS"
|
||||||
|
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
||||||
|
|
||||||
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
||||||
for db in $dbs; do
|
for db in $dbs; do
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
||||||
|
|||||||
@@ -1,12 +1,18 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
||||||
cd "$(dirname "$0")/.."
|
cd "$(dirname "$0")/.."
|
||||||
|
|
||||||
NEXARCH_TEST_DB_PASSWORD="$PASS" bash scripts/reset-test-env.sh
|
NEXARCH_TEST_DB_PASSWORD="$PASS" bash scripts/reset-test-env.sh
|
||||||
|
|
||||||
export TEST_ADMIN_DSN="postgresql://nexarch_test:${PASS}@localhost:5432/postgres?sslmode=disable"
|
export TEST_ADMIN_DSN="postgresql://nexarch_test:${PASS}@localhost:5432/postgres?sslmode=disable"
|
||||||
|
|
||||||
echo "== go build =="
|
echo "== go build =="
|
||||||
go build ./...
|
go build ./...
|
||||||
|
|
||||||
echo "== go vet =="
|
echo "== go vet =="
|
||||||
go vet ./...
|
go vet ./...
|
||||||
|
|
||||||
echo "== go test (-p 1) =="
|
echo "== go test (-p 1) =="
|
||||||
go test ./... -p 1 -count=1
|
go test ./... -p 1 -count=1
|
||||||
|
|||||||
Reference in New Issue
Block a user