Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5915a4e7b1 |
@@ -129,3 +129,26 @@ Keine Commits in dieser Session.
|
|||||||
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
||||||
|
|
||||||
---
|
---
|
||||||
|
## 2026-08-27 17:53 – 17:57 (4m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** code
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
- e479330 IAM-01: benutzer-datenmodell-crud
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- cmd/core/main.go | 11 ++++++++++-
|
||||||
|
- go.mod | 9 +++++++++
|
||||||
|
- go.sum | 28 ++++++++++++++++++++++++++++
|
||||||
|
- internal/user/handler.go | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/store_test.go | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/superadmin_store.go | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/tenant_store.go | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/user.go | 42 ++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/user_test.go | 24 ++++++++++++++++++++++++
|
||||||
|
- migrations/0002_superadmins.down.sql | 1 +
|
||||||
|
- migrations/0002_superadmins.up.sql | 14 ++++++++++++++
|
||||||
|
- migrations/tenant/0001_users.down.sql | 1 +
|
||||||
|
- migrations/tenant/0001_users.up.sql | 16 ++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ func main() {
|
|||||||
registry := tenant.NewRegistry(registryPool)
|
registry := tenant.NewRegistry(registryPool)
|
||||||
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
||||||
tenantHandler := tenant.NewHandler(provisioner)
|
tenantHandler := tenant.NewHandler(provisioner)
|
||||||
|
onboardingService := tenant.NewOnboardingService(provisioner, cfg.TenantSchemaPath)
|
||||||
|
onboardingHandler := tenant.NewOnboardingHandler(onboardingService)
|
||||||
|
|
||||||
// Superadmin-Konten leben mandantenuebergreifend in der Registry-DB.
|
// Superadmin-Konten leben mandantenuebergreifend in der Registry-DB.
|
||||||
// Tenant-User-CRUD (user.TenantUserStore) braucht Connection-Routing pro
|
// Tenant-User-CRUD (user.TenantUserStore) braucht Connection-Routing pro
|
||||||
@@ -48,6 +50,7 @@ func main() {
|
|||||||
})
|
})
|
||||||
// Vorlaeufige Pfade ohne Versionierung/Auth — werden mit API-01/IAM-02 abgeloest.
|
// Vorlaeufige Pfade ohne Versionierung/Auth — werden mit API-01/IAM-02 abgeloest.
|
||||||
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
||||||
|
mux.HandleFunc("/internal/tenants/onboard", onboardingHandler.Onboard)
|
||||||
mux.HandleFunc("/internal/superadmins", userHandler.CreateSuperadmin)
|
mux.HandleFunc("/internal/superadmins", userHandler.CreateSuperadmin)
|
||||||
|
|
||||||
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
||||||
|
|||||||
@@ -2,16 +2,13 @@ module gitea.perlbach24.de/scripte/nexarch
|
|||||||
|
|
||||||
go 1.22
|
go 1.22
|
||||||
|
|
||||||
require (
|
require github.com/jackc/pgx/v5 v5.6.0
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1
|
|
||||||
github.com/jackc/pgx/v5 v5.6.0
|
|
||||||
golang.org/x/crypto v0.17.0
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
||||||
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
||||||
|
golang.org/x/crypto v0.17.0 // indirect
|
||||||
golang.org/x/sync v0.1.0 // indirect
|
golang.org/x/sync v0.1.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.14.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
|
||||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
// 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)
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
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))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
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,67 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Handler stellt Login/Logout als HTTP-Endpunkte bereit. Registrierung,
|
|
||||||
// Passwort-Reset, 2FA, SSO/LDAP und Rate-Limiting sind ausdruecklich nicht
|
|
||||||
// Teil dieser Kachel (siehe IAM-03..07).
|
|
||||||
type Handler struct {
|
|
||||||
login *LoginService
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewHandler(login *LoginService) *Handler {
|
|
||||||
return &Handler{login: login}
|
|
||||||
}
|
|
||||||
|
|
||||||
type loginRequest struct {
|
|
||||||
Email string `json:"email"`
|
|
||||||
Password string `json:"password"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req loginRequest
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := h.login.Login(r.Context(), req.Email, req.Password)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, ErrInvalidCredentials.Error(), http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
http.SetCookie(w, &http.Cookie{
|
|
||||||
Name: CookieName,
|
|
||||||
Value: token,
|
|
||||||
Path: "/",
|
|
||||||
HttpOnly: true,
|
|
||||||
Secure: true,
|
|
||||||
SameSite: http.SameSiteStrictMode,
|
|
||||||
MaxAge: int(AccessTokenTTL.Seconds()),
|
|
||||||
})
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Logout loescht das Session-Cookie. Da JWT hier bewusst zustandslos bleibt
|
|
||||||
// (kein serverseitiger Blocklist-Speicher — das waere ueber "Grundgerüst"
|
|
||||||
// hinaus und widerspraeche der projektweiten zustandslosen-JWT-Entscheidung),
|
|
||||||
// bleibt ein bereits ausgestelltes Token bis zu seinem Ablauf technisch
|
|
||||||
// gueltig, wenn es separat vom Cookie extrahiert und wiederverwendet wird.
|
|
||||||
func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
|
|
||||||
http.SetCookie(w, &http.Cookie{
|
|
||||||
Name: CookieName,
|
|
||||||
Value: "",
|
|
||||||
Path: "/",
|
|
||||||
HttpOnly: true,
|
|
||||||
Secure: true,
|
|
||||||
SameSite: http.SameSiteStrictMode,
|
|
||||||
MaxAge: -1,
|
|
||||||
Expires: time.Unix(0, 0),
|
|
||||||
})
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
var ErrInvalidCredentials = errors.New("auth: E-Mail oder Passwort falsch")
|
|
||||||
|
|
||||||
// LoginService arbeitet gegen GENAU EINE Tenant-Datenbank (uebergeben ueber
|
|
||||||
// den TenantUserStore-Pool) — das Login ist damit strukturell auf den
|
|
||||||
// richtigen Tenant gescopt, siehe user.TenantUserStore.GetByEmailForAuth.
|
|
||||||
type LoginService struct {
|
|
||||||
users *user.TenantUserStore
|
|
||||||
issuer *TokenIssuer
|
|
||||||
// tenantSlug identifiziert im ausgestellten Token, gegen welchen Mandanten
|
|
||||||
// eingeloggt wurde (fuer nachgelagerte Pruefungen, z.B. Middleware-Logs).
|
|
||||||
tenantSlug string
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLoginService(users *user.TenantUserStore, issuer *TokenIssuer, tenantSlug string) *LoginService {
|
|
||||||
return &LoginService{users: users, issuer: issuer, tenantSlug: tenantSlug}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Login liefert bei falscher E-Mail UND bei falschem Passwort denselben
|
|
||||||
// Fehler (ErrInvalidCredentials), um keine Rueckschluesse auf die Existenz
|
|
||||||
// eines Kontos zuzulassen (User-Enumeration-Schutz).
|
|
||||||
func (s *LoginService) Login(ctx context.Context, email, password string) (string, error) {
|
|
||||||
creds, err := s.users.GetByEmailForAuth(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
// Trotzdem einen bcrypt-Vergleich gegen einen Dummy-Hash ausfuehren,
|
|
||||||
// damit die Antwortzeit bei unbekannter E-Mail nicht messbar kuerzer
|
|
||||||
// ist als bei falschem Passwort (Timing-Seitenkanal).
|
|
||||||
VerifyPassword(dummyHash, password)
|
|
||||||
return "", ErrInvalidCredentials
|
|
||||||
}
|
|
||||||
|
|
||||||
if creds.User.Status != user.StatusActive {
|
|
||||||
return "", ErrInvalidCredentials
|
|
||||||
}
|
|
||||||
|
|
||||||
if !VerifyPassword(creds.PasswordHash, password) {
|
|
||||||
return "", ErrInvalidCredentials
|
|
||||||
}
|
|
||||||
|
|
||||||
return s.issuer.Issue(creds.User.ID, s.tenantSlug)
|
|
||||||
}
|
|
||||||
|
|
||||||
// dummyHash ist ein echter bcrypt-Hash (Kostenfaktor BcryptCost) eines
|
|
||||||
// beliebigen Platzhalter-Klartexts — bewusst KEIN kaputtes Format, da
|
|
||||||
// bcrypt.CompareHashAndPassword bei ungueltigem Hash sofort ohne den
|
|
||||||
// eigentlichen Kostenfaktor-Vergleich zurueckkehrt und die
|
|
||||||
// Timing-Angleichung damit wirkungslos waere.
|
|
||||||
const dummyHash = "$2a$12$cmwiETrG9DK5/uTM2fg4uetngYUspKjME5P8fNpk0QYTaO64N0r3C"
|
|
||||||
@@ -1,177 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
const usersSchema = `
|
|
||||||
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
|
||||||
CREATE TABLE users (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
email TEXT NOT NULL UNIQUE,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
password_hash TEXT NOT NULL DEFAULT '',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);`
|
|
||||||
|
|
||||||
func setupTenantDB(t *testing.T, dbName string) *pgxpool.Pool {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
adminPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("admin pool: %v", err)
|
|
||||||
}
|
|
||||||
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
|
||||||
if _, err := adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
|
||||||
t.Fatalf("testdatenbank anlegen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
dsn := strings.Replace(adminDSN, "/postgres?", "/"+dbName+"?", 1)
|
|
||||||
pool, err := pgxpool.New(ctx, dsn)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("connect testdatenbank: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, usersSchema); err != nil {
|
|
||||||
t.Fatalf("schema anwenden: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Cleanup(func() {
|
|
||||||
pool.Close()
|
|
||||||
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
|
||||||
adminPool.Close()
|
|
||||||
})
|
|
||||||
return pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func createUserWithPassword(t *testing.T, store *user.TenantUserStore, email, password string) user.User {
|
|
||||||
t.Helper()
|
|
||||||
ctx := context.Background()
|
|
||||||
u, err := store.Create(ctx, email, "Test User")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create user: %v", err)
|
|
||||||
}
|
|
||||||
hash, err := HashPassword(password)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("hash password: %v", err)
|
|
||||||
}
|
|
||||||
if err := store.SetPasswordHash(ctx, u.ID, hash); err != nil {
|
|
||||||
t.Fatalf("set password: %v", err)
|
|
||||||
}
|
|
||||||
return u
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoginService_SuccessAndWrongPassword(t *testing.T) {
|
|
||||||
pool := setupTenantDB(t, "test_iam02_login")
|
|
||||||
store := user.NewTenantUserStore(pool)
|
|
||||||
createUserWithPassword(t, store, "alice@example.com", "korrektes-passwort")
|
|
||||||
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
login := NewLoginService(store, issuer, "acme")
|
|
||||||
|
|
||||||
token, err := login.Login(context.Background(), "alice@example.com", "korrektes-passwort")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("login: %v", err)
|
|
||||||
}
|
|
||||||
if token == "" {
|
|
||||||
t.Fatal("erwartet nicht-leeres token")
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := login.Login(context.Background(), "alice@example.com", "falsches-passwort"); !errors.Is(err, ErrInvalidCredentials) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidCredentials, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := login.Login(context.Background(), "unbekannt@example.com", "irgendwas"); !errors.Is(err, ErrInvalidCredentials) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidCredentials bei unbekannter email, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pruefung 1: kein Cross-Tenant-Login moeglich, obwohl dieselbe E-Mail in
|
|
||||||
// zwei unterschiedlichen Tenant-Datenbanken mit unterschiedlichen Passwoertern
|
|
||||||
// existiert.
|
|
||||||
func TestLoginService_NoCrossTenantLogin(t *testing.T) {
|
|
||||||
poolA := setupTenantDB(t, "test_iam02_tenant_a")
|
|
||||||
poolB := setupTenantDB(t, "test_iam02_tenant_b")
|
|
||||||
|
|
||||||
storeA := user.NewTenantUserStore(poolA)
|
|
||||||
storeB := user.NewTenantUserStore(poolB)
|
|
||||||
createUserWithPassword(t, storeA, "shared@example.com", "passwort-tenant-a")
|
|
||||||
createUserWithPassword(t, storeB, "shared@example.com", "passwort-tenant-b")
|
|
||||||
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
loginA := NewLoginService(storeA, issuer, "tenant-a")
|
|
||||||
|
|
||||||
// Login gegen Tenant A mit dem Passwort von Tenant B darf nicht klappen,
|
|
||||||
// obwohl die E-Mail-Adresse identisch ist — die Store-Instanz kennt
|
|
||||||
// strukturell nur die Zeilen ihrer eigenen Datenbank.
|
|
||||||
if _, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-b"); !errors.Is(err, ErrInvalidCredentials) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidCredentials fuer fremdes tenant-passwort, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-a")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("login gegen eigenen tenant sollte klappen: %v", err)
|
|
||||||
}
|
|
||||||
claims, err := issuer.Verify(token)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("verify: %v", err)
|
|
||||||
}
|
|
||||||
if claims.TenantSlug != "tenant-a" {
|
|
||||||
t.Fatalf("token tenant = %q, want tenant-a", claims.TenantSlug)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: geschuetzte Route ohne gueltige Session nicht erreichbar.
|
|
||||||
func TestRequireAuth_BlocksWithoutValidCookie(t *testing.T) {
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
protected := RequireAuth(issuer, func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Kein Cookie.
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
protected(rec, req)
|
|
||||||
if rec.Code != http.StatusUnauthorized {
|
|
||||||
t.Fatalf("ohne cookie: status = %d, want 401", rec.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Manipuliertes Cookie.
|
|
||||||
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
|
||||||
req.AddCookie(&http.Cookie{Name: CookieName, Value: "kaputt.token.hier"})
|
|
||||||
rec = httptest.NewRecorder()
|
|
||||||
protected(rec, req)
|
|
||||||
if rec.Code != http.StatusUnauthorized {
|
|
||||||
t.Fatalf("mit kaputtem cookie: status = %d, want 401", rec.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gueltiges Token.
|
|
||||||
token, err := issuer.Issue("user-1", "acme")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("issue: %v", err)
|
|
||||||
}
|
|
||||||
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
|
||||||
req.AddCookie(&http.Cookie{Name: CookieName, Value: token})
|
|
||||||
rec = httptest.NewRecorder()
|
|
||||||
protected(rec, req)
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("mit gueltigem cookie: status = %d, want 200", rec.Code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"net/http"
|
|
||||||
)
|
|
||||||
|
|
||||||
const CookieName = "nexarch_session"
|
|
||||||
|
|
||||||
type contextKey int
|
|
||||||
|
|
||||||
const claimsContextKey contextKey = iota
|
|
||||||
|
|
||||||
// RequireAuth schuetzt eine Route: ohne gueltiges, nicht abgelaufenes Token
|
|
||||||
// im Session-Cookie wird 401 zurueckgegeben und der Handler nicht aufgerufen
|
|
||||||
// (IAM-02 Akzeptanzkriterium 3).
|
|
||||||
func RequireAuth(issuer *TokenIssuer, next http.HandlerFunc) http.HandlerFunc {
|
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
cookie, err := r.Cookie(CookieName)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
claims, err := issuer.Verify(cookie.Value)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.WithValue(r.Context(), claimsContextKey, claims)
|
|
||||||
next(w, r.WithContext(ctx))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ClaimsFromContext liest die Claims, die RequireAuth in den Request-Context
|
|
||||||
// gelegt hat.
|
|
||||||
func ClaimsFromContext(ctx context.Context) (*Claims, bool) {
|
|
||||||
c, ok := ctx.Value(claimsContextKey).(*Claims)
|
|
||||||
return c, ok
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
// Package auth implementiert Core IAM-02: Login/Logout, Passwort-Hashing und
|
|
||||||
// die Middleware zum Schutz von Routen. Autorisierung (was ein Benutzer darf)
|
|
||||||
// ist ausdruecklich NICHT Teil dieses Pakets, siehe RBAC-01 — auth prueft nur
|
|
||||||
// "wer bin ich" (Casbin-Architekturprinzip, siehe IAM-02-Ticket).
|
|
||||||
package auth
|
|
||||||
|
|
||||||
import "golang.org/x/crypto/bcrypt"
|
|
||||||
|
|
||||||
// BcryptCost ist bewusst explizit festgelegt statt bcrypt.DefaultCost (10)
|
|
||||||
// unreflektiert zu uebernehmen (IAM-02 Akzeptanzkriterium 4). Kostenfaktor 12
|
|
||||||
// wurde gegen die Ziel-Login-Latenz benchmarkt, siehe password_bench_test.go
|
|
||||||
// und den Pruefungs-Eintrag in der Commit-Nachricht.
|
|
||||||
const BcryptCost = 12
|
|
||||||
|
|
||||||
func HashPassword(plain string) (string, error) {
|
|
||||||
hash, err := bcrypt.GenerateFromPassword([]byte(plain), BcryptCost)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return string(hash), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// VerifyPassword ist timing-safe: bcrypt.CompareHashAndPassword vergleicht
|
|
||||||
// konstant in der Zeit bzgl. des Hash-Inhalts (Referenzimplementierung fuer
|
|
||||||
// die projektweite Timing-safe-Vergleich-Konvention aus IAM-02).
|
|
||||||
func VerifyPassword(hash, plain string) bool {
|
|
||||||
return bcrypt.CompareHashAndPassword([]byte(hash), []byte(plain)) == nil
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TargetLoginLatency ist der Zielwert aus IAM-02 Akzeptanzkriterium 4: der
|
|
||||||
// bcrypt-Vergleich allein darf die Login-Latenz nicht dominieren. 400ms ist
|
|
||||||
// grosszuegig genug, um auf unterschiedlicher Hardware stabil zu sein, aber
|
|
||||||
// eng genug, um eine versehentliche Kostenfaktor-Explosion (z.B. 16 statt 12)
|
|
||||||
// zuverlaessig aufzudecken.
|
|
||||||
const TargetLoginLatency = 400 * time.Millisecond
|
|
||||||
|
|
||||||
// TestBcryptCostAgainstLatencyTarget misst die tatsaechliche Dauer eines
|
|
||||||
// Passwort-Vergleichs mit dem festgelegten BcryptCost und dokumentiert das
|
|
||||||
// Ergebnis (IAM-02 Pruefung 4).
|
|
||||||
func TestBcryptCostAgainstLatencyTarget(t *testing.T) {
|
|
||||||
hash, err := HashPassword("benchmark-passwort")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("hash: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
start := time.Now()
|
|
||||||
if !VerifyPassword(hash, "benchmark-passwort") {
|
|
||||||
t.Fatal("verifikation haette erfolgreich sein muessen")
|
|
||||||
}
|
|
||||||
elapsed := time.Since(start)
|
|
||||||
|
|
||||||
t.Logf("bcrypt-vergleich mit cost=%d dauerte %s (ziel: unter %s)", BcryptCost, elapsed, TargetLoginLatency)
|
|
||||||
if elapsed > TargetLoginLatency {
|
|
||||||
t.Fatalf("bcrypt-vergleich zu langsam: %s > ziel %s", elapsed, TargetLoginLatency)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkVerifyPassword(b *testing.B) {
|
|
||||||
hash, _ := HashPassword("benchmark-passwort")
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
VerifyPassword(hash, "benchmark-passwort")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestHashAndVerifyPassword(t *testing.T) {
|
|
||||||
hash, err := HashPassword("s3hr-geheim!")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("hash: %v", err)
|
|
||||||
}
|
|
||||||
if hash == "s3hr-geheim!" {
|
|
||||||
t.Fatal("passwort wurde nicht gehasht")
|
|
||||||
}
|
|
||||||
if !VerifyPassword(hash, "s3hr-geheim!") {
|
|
||||||
t.Fatal("erwartet erfolgreiche verifikation")
|
|
||||||
}
|
|
||||||
if VerifyPassword(hash, "falsches-passwort") {
|
|
||||||
t.Fatal("erwartet fehlgeschlagene verifikation")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDummyHashIsValidBcryptHash(t *testing.T) {
|
|
||||||
// Stellt sicher, dass der Timing-Angleichs-Hash in login.go tatsaechlich
|
|
||||||
// ein gueltiges bcrypt-Format hat und den vollen Kostenfaktor durchlaeuft
|
|
||||||
// (siehe Kommentar dort) statt sofort mit einem Format-Fehler abzubrechen.
|
|
||||||
if VerifyPassword(dummyHash, "irgendein-text") {
|
|
||||||
t.Fatal("dummyHash sollte fuer beliebigen text nicht passen")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AccessTokenTTL ist bewusst kurz gehalten (Session-Ablauf statt langlebiger
|
|
||||||
// Tokens), passend zur "so vertrauenswuerdig wie noetig"-Produkt-DNA.
|
|
||||||
const AccessTokenTTL = 30 * time.Minute
|
|
||||||
|
|
||||||
var ErrInvalidToken = errors.New("auth: ungueltiges oder abgelaufenes token")
|
|
||||||
|
|
||||||
type Claims struct {
|
|
||||||
UserID string `json:"uid"`
|
|
||||||
TenantSlug string `json:"tenant"`
|
|
||||||
jwt.RegisteredClaims
|
|
||||||
}
|
|
||||||
|
|
||||||
// TokenIssuer signiert/verifiziert JWTs mit einem HMAC-Secret. Das
|
|
||||||
// asymmetrische Core-weite Signaturschema (API-05, kid-Rotation) ist
|
|
||||||
// ausdruecklich nicht Teil dieser Kachel — hier geht es nur um das
|
|
||||||
// Login-Grundgerüst innerhalb eines einzelnen Core-Prozesses.
|
|
||||||
type TokenIssuer struct {
|
|
||||||
secret []byte
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTokenIssuer(secret string) *TokenIssuer {
|
|
||||||
return &TokenIssuer{secret: []byte(secret)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *TokenIssuer) Issue(userID, tenantSlug string) (string, error) {
|
|
||||||
now := time.Now()
|
|
||||||
claims := Claims{
|
|
||||||
UserID: userID,
|
|
||||||
TenantSlug: tenantSlug,
|
|
||||||
RegisteredClaims: jwt.RegisteredClaims{
|
|
||||||
IssuedAt: jwt.NewNumericDate(now),
|
|
||||||
ExpiresAt: jwt.NewNumericDate(now.Add(AccessTokenTTL)),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
|
||||||
return token.SignedString(i.secret)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify prueft Signatur UND Ablauf (jwt.ParseWithClaims lehnt abgelaufene
|
|
||||||
// Tokens automatisch ab) — der Signaturvergleich in golang-jwt ist
|
|
||||||
// timing-safe (hmac.Equal).
|
|
||||||
func (i *TokenIssuer) Verify(tokenString string) (*Claims, error) {
|
|
||||||
claims := &Claims{}
|
|
||||||
token, err := jwt.ParseWithClaims(tokenString, claims, func(t *jwt.Token) (interface{}, error) {
|
|
||||||
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
|
||||||
return nil, ErrInvalidToken
|
|
||||||
}
|
|
||||||
return i.secret, nil
|
|
||||||
})
|
|
||||||
if err != nil || !token.Valid {
|
|
||||||
return nil, ErrInvalidToken
|
|
||||||
}
|
|
||||||
return claims, nil
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestTokenIssueAndVerify(t *testing.T) {
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
|
|
||||||
token, err := issuer.Issue("user-1", "acme")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("issue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
claims, err := issuer.Verify(token)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("verify: %v", err)
|
|
||||||
}
|
|
||||||
if claims.UserID != "user-1" || claims.TenantSlug != "acme" {
|
|
||||||
t.Fatalf("claims unerwartet: %+v", claims)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pruefung 2: Token-Manipulationstest.
|
|
||||||
func TestTokenVerify_RejectsManipulatedPayload(t *testing.T) {
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
token, err := issuer.Issue("user-1", "acme")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("issue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
parts := strings.Split(token, ".")
|
|
||||||
if len(parts) != 3 {
|
|
||||||
t.Fatalf("unerwartetes token-format: %d teile", len(parts))
|
|
||||||
}
|
|
||||||
// Payload-Segment leicht veraendern (Signatur passt danach nicht mehr).
|
|
||||||
tampered := parts[0] + "." + parts[1] + "x" + "." + parts[2]
|
|
||||||
|
|
||||||
if _, err := issuer.Verify(tampered); err == nil {
|
|
||||||
t.Fatal("erwartet fehler bei manipuliertem token, habe nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestTokenVerify_RejectsWrongSecret(t *testing.T) {
|
|
||||||
issuer := NewTokenIssuer("secret-a")
|
|
||||||
other := NewTokenIssuer("secret-b")
|
|
||||||
|
|
||||||
token, err := issuer.Issue("user-1", "acme")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("issue: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := other.Verify(token); err == nil {
|
|
||||||
t.Fatal("erwartet fehler bei falschem secret, habe nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pruefung 3: abgelaufenes Token erzwingt Neuanmeldung.
|
|
||||||
func TestTokenVerify_RejectsExpiredToken(t *testing.T) {
|
|
||||||
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
|
|
||||||
claims := Claims{
|
|
||||||
UserID: "user-1",
|
|
||||||
TenantSlug: "acme",
|
|
||||||
RegisteredClaims: jwt.RegisteredClaims{
|
|
||||||
IssuedAt: jwt.NewNumericDate(time.Now().Add(-2 * AccessTokenTTL)),
|
|
||||||
ExpiresAt: jwt.NewNumericDate(time.Now().Add(-time.Minute)),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
|
||||||
expired, err := tok.SignedString([]byte("test-secret-nur-fuer-tests"))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("signieren: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := issuer.Verify(expired); err == nil {
|
|
||||||
t.Fatal("erwartet fehler bei abgelaufenem token, habe nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -19,6 +19,9 @@ type Config struct {
|
|||||||
// TenantDSNTemplate enthaelt genau ein "%s" als Platzhalter fuer den
|
// TenantDSNTemplate enthaelt genau ein "%s" als Platzhalter fuer den
|
||||||
// Datenbanknamen einer neu provisionierten Tenant-Datenbank.
|
// Datenbanknamen einer neu provisionierten Tenant-Datenbank.
|
||||||
TenantDSNTemplate string
|
TenantDSNTemplate string
|
||||||
|
// TenantSchemaPath zeigt auf migrations/tenant/0001_users.up.sql, mit der
|
||||||
|
// TEN-02 eine frisch provisionierte Tenant-Datenbank initialisiert.
|
||||||
|
TenantSchemaPath string
|
||||||
}
|
}
|
||||||
|
|
||||||
func Load() (Config, error) {
|
func Load() (Config, error) {
|
||||||
@@ -37,6 +40,11 @@ func Load() (Config, error) {
|
|||||||
return Config{}, fmt.Errorf("NEXARCH_TENANT_DSN_TEMPLATE not set")
|
return Config{}, fmt.Errorf("NEXARCH_TENANT_DSN_TEMPLATE not set")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
schemaPath := os.Getenv("NEXARCH_TENANT_SCHEMA_PATH")
|
||||||
|
if schemaPath == "" {
|
||||||
|
return Config{}, fmt.Errorf("NEXARCH_TENANT_SCHEMA_PATH not set")
|
||||||
|
}
|
||||||
|
|
||||||
addr := os.Getenv("NEXARCH_LISTEN_ADDR")
|
addr := os.Getenv("NEXARCH_LISTEN_ADDR")
|
||||||
if addr == "" {
|
if addr == "" {
|
||||||
addr = ":8080"
|
addr = ":8080"
|
||||||
@@ -47,5 +55,6 @@ func Load() (Config, error) {
|
|||||||
RegistryDSN: dsn,
|
RegistryDSN: dsn,
|
||||||
AdminDSN: adminDSN,
|
AdminDSN: adminDSN,
|
||||||
TenantDSNTemplate: dsnTemplate,
|
TenantDSNTemplate: dsnTemplate,
|
||||||
|
TenantSchemaPath: schemaPath,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,64 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
// 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
|
|
||||||
}
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,10 @@ package tenant
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Handler ist eine schlanke Vorbereitung der Schnittstelle fuer API-01
|
// Handler ist eine schlanke Vorbereitung der Schnittstelle fuer API-01
|
||||||
@@ -43,3 +46,49 @@ func (h *Handler) CreateTenant(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.WriteHeader(http.StatusCreated)
|
w.WriteHeader(http.StatusCreated)
|
||||||
_ = json.NewEncoder(w).Encode(t)
|
_ = json.NewEncoder(w).Encode(t)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OnboardingHandler stellt den Self-Service-Endpunkt aus TEN-02 bereit —
|
||||||
|
// eigener Handler statt Erweiterung von Handler.CreateTenant, damit die
|
||||||
|
// TEN-01-Schnittstelle (reines Provisioning ohne Admin-Konto) unveraendert
|
||||||
|
// bleibt.
|
||||||
|
type OnboardingHandler struct {
|
||||||
|
service *OnboardingService
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewOnboardingHandler(s *OnboardingService) *OnboardingHandler {
|
||||||
|
return &OnboardingHandler{service: s}
|
||||||
|
}
|
||||||
|
|
||||||
|
type onboardRequest struct {
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
AdminEmail string `json:"admin_email"`
|
||||||
|
AdminName string `json:"admin_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *OnboardingHandler) Onboard(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req onboardRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := h.service.Onboard(r.Context(), req.Slug, req.Name, req.AdminEmail, req.AdminName)
|
||||||
|
if err != nil {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, ErrInvalidSlug),
|
||||||
|
errors.Is(err, ErrMissingField),
|
||||||
|
errors.Is(err, user.ErrInvalidEmail):
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
case errors.Is(err, ErrTenantExists):
|
||||||
|
http.Error(w, err.Error(), http.StatusConflict)
|
||||||
|
default:
|
||||||
|
http.Error(w, "mandant konnte nicht angelegt werden", http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_ = json.NewEncoder(w).Encode(result)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package tenant
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrMissingField = errors.New("tenant: pflichtfeld fehlt")
|
||||||
|
|
||||||
|
// OnboardingService implementiert TEN-02: Self-Service-Anlage eines neuen
|
||||||
|
// Mandanten inklusive Ersteinrichtung des Administrator-Kontos in einem
|
||||||
|
// Vorgang. Schlaegt die Admin-Anlage fehl, wird der bereits provisionierte
|
||||||
|
// Tenant per Deprovision wieder vollstaendig entfernt (Saga-Kompensation,
|
||||||
|
// da CREATE DATABASE keine echte cross-database Transaktion erlaubt).
|
||||||
|
type OnboardingService struct {
|
||||||
|
provisioner *Provisioner
|
||||||
|
// tenantSchemaPath zeigt auf migrations/tenant/0001_users.up.sql, mit der
|
||||||
|
// die frisch angelegte Tenant-Datenbank initialisiert wird, bevor der
|
||||||
|
// erste Administrator angelegt werden kann.
|
||||||
|
tenantSchemaPath string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewOnboardingService(provisioner *Provisioner, tenantSchemaPath string) *OnboardingService {
|
||||||
|
return &OnboardingService{provisioner: provisioner, tenantSchemaPath: tenantSchemaPath}
|
||||||
|
}
|
||||||
|
|
||||||
|
type OnboardResult struct {
|
||||||
|
Tenant Tenant
|
||||||
|
Admin user.User
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *OnboardingService) Onboard(ctx context.Context, slug, tenantName, adminEmail, adminName string) (OnboardResult, error) {
|
||||||
|
if tenantName == "" {
|
||||||
|
return OnboardResult{}, fmt.Errorf("%w: name", ErrMissingField)
|
||||||
|
}
|
||||||
|
if adminName == "" {
|
||||||
|
return OnboardResult{}, fmt.Errorf("%w: admin-name", ErrMissingField)
|
||||||
|
}
|
||||||
|
if err := ValidateSlug(slug); err != nil {
|
||||||
|
return OnboardResult{}, err
|
||||||
|
}
|
||||||
|
if err := user.ValidateEmail(adminEmail); err != nil {
|
||||||
|
return OnboardResult{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
t, err := s.provisioner.Provision(ctx, slug, tenantName)
|
||||||
|
if err != nil {
|
||||||
|
return OnboardResult{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
admin, err := s.setupAdmin(ctx, t, adminEmail, adminName)
|
||||||
|
if err != nil {
|
||||||
|
_ = s.provisioner.Deprovision(ctx, t)
|
||||||
|
return OnboardResult{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return OnboardResult{Tenant: t, Admin: admin}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *OnboardingService) setupAdmin(ctx context.Context, t Tenant, adminEmail, adminName string) (user.User, error) {
|
||||||
|
pool, err := pgxpool.New(ctx, t.DBDSN)
|
||||||
|
if err != nil {
|
||||||
|
return user.User{}, fmt.Errorf("verbindung zur neuen tenant-datenbank: %w", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
schema, err := os.ReadFile(s.tenantSchemaPath)
|
||||||
|
if err != nil {
|
||||||
|
return user.User{}, fmt.Errorf("tenant-schema lesen: %w", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, string(schema)); err != nil {
|
||||||
|
return user.User{}, fmt.Errorf("tenant-schema anwenden: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
return store.Create(ctx, adminEmail, adminName)
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
package tenant
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// schemaPathForTest liefert den Pfad zur echten Migration, damit Tests exakt
|
||||||
|
// dasselbe Schema anwenden wie die Produktion (keine Zweitkopie des SQL).
|
||||||
|
const schemaPathForTest = "../../migrations/tenant/0001_users.up.sql"
|
||||||
|
|
||||||
|
func TestOnboarding_ValidationErrors(t *testing.T) {
|
||||||
|
// Reine Eingabevalidierung, braucht keine Datenbank.
|
||||||
|
svc := NewOnboardingService(nil, schemaPathForTest)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
slug string
|
||||||
|
tenantName string
|
||||||
|
email string
|
||||||
|
adminName string
|
||||||
|
wantErr error
|
||||||
|
}{
|
||||||
|
{"leerer name", "acme", "", "a@b.de", "Admin", ErrMissingField},
|
||||||
|
{"leerer admin-name", "acme", "Acme", "a@b.de", "", ErrMissingField},
|
||||||
|
{"ungueltiger slug", "Acme!", "Acme", "a@b.de", "Admin", ErrInvalidSlug},
|
||||||
|
{"ungueltige email", "acme", "Acme", "keine-email", "Admin", user.ErrInvalidEmail},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
_, err := svc.Onboard(ctx, c.slug, c.tenantName, c.email, c.adminName)
|
||||||
|
if !errors.Is(err, c.wantErr) {
|
||||||
|
t.Fatalf("erwartet %v, habe %v", c.wantErr, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestOnboardingService(t *testing.T) (*OnboardingService, 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)
|
||||||
|
svc := NewOnboardingService(provisioner, schemaPathForTest)
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
registryPool.Close()
|
||||||
|
adminPool.Close()
|
||||||
|
}
|
||||||
|
return svc, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterien 1+2: Mandant + Erst-Admin in einem Vorgang.
|
||||||
|
func TestOnboarding_CreatesTenantAndAdmin(t *testing.T) {
|
||||||
|
svc, cleanup := newTestOnboardingService(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
p, _ := pgxpool.New(ctx, adminDSN)
|
||||||
|
defer p.Close()
|
||||||
|
_, _ = p.Exec(ctx, `DELETE FROM tenants WHERE slug = 'onboardtest'`)
|
||||||
|
_, _ = p.Exec(ctx, `DROP DATABASE IF EXISTS tenant_onboardtest`)
|
||||||
|
})
|
||||||
|
|
||||||
|
result, err := svc.Onboard(ctx, "onboardtest", "Onboard Test GmbH", "admin@onboardtest.example", "Erste Admin")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("onboard: %v", err)
|
||||||
|
}
|
||||||
|
if result.Tenant.Slug != "onboardtest" {
|
||||||
|
t.Fatalf("tenant slug = %q", result.Tenant.Slug)
|
||||||
|
}
|
||||||
|
if result.Admin.Email != "admin@onboardtest.example" {
|
||||||
|
t.Fatalf("admin email = %q", result.Admin.Email)
|
||||||
|
}
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, result.Tenant.DBDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("connect tenant db: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
var count int
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT count(*) FROM users WHERE email = $1`, "admin@onboardtest.example").Scan(&count); err != nil {
|
||||||
|
t.Fatalf("admin in tenant-db pruefen: %v", err)
|
||||||
|
}
|
||||||
|
if count != 1 {
|
||||||
|
t.Fatalf("erwartet genau einen admin in der tenant-db, habe %d", count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: doppelte Registrierung wird abgewiesen,
|
||||||
|
// auch bei zwei parallelen Anfragen entsteht kein Doppel-Tenant.
|
||||||
|
func TestOnboarding_RejectsDuplicateSlugConcurrently(t *testing.T) {
|
||||||
|
svc, cleanup := newTestOnboardingService(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
p, _ := pgxpool.New(ctx, adminDSN)
|
||||||
|
defer p.Close()
|
||||||
|
_, _ = p.Exec(ctx, `DELETE FROM tenants WHERE slug = 'dupetest'`)
|
||||||
|
_, _ = p.Exec(ctx, `DROP DATABASE IF EXISTS tenant_dupetest`)
|
||||||
|
})
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
results := make([]error, 2)
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(i int) {
|
||||||
|
defer wg.Done()
|
||||||
|
_, err := svc.Onboard(ctx, "dupetest", "Dupe Test", "admin@dupetest.example", "Admin")
|
||||||
|
results[i] = err
|
||||||
|
}(i)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
successCount := 0
|
||||||
|
for _, err := range results {
|
||||||
|
if err == nil {
|
||||||
|
successCount++
|
||||||
|
} else if !errors.Is(err, ErrTenantExists) {
|
||||||
|
t.Fatalf("unerwarteter fehler: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if successCount != 1 {
|
||||||
|
t.Fatalf("erwartet genau einen erfolgreichen onboarding-vorgang, habe %d", successCount)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,11 +2,17 @@ package tenant
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgconn"
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ErrTenantExists wird zurueckgegeben, wenn Slug oder Datenbankname eines
|
||||||
|
// Mandanten bereits vergeben sind (TEN-02 Akzeptanzkriterium 3).
|
||||||
|
var ErrTenantExists = errors.New("tenant: slug bereits vergeben")
|
||||||
|
|
||||||
// Provisioner legt fuer jeden neuen Mandanten eine vollstaendig isolierte
|
// Provisioner legt fuer jeden neuen Mandanten eine vollstaendig isolierte
|
||||||
// PostgreSQL-Datenbank an und registriert sie transaktional in der Registry
|
// PostgreSQL-Datenbank an und registriert sie transaktional in der Registry
|
||||||
// (Akzeptanzkriterium 2). Zwei Mandanten-Datenbanken sind danach auf
|
// (Akzeptanzkriterium 2). Zwei Mandanten-Datenbanken sind danach auf
|
||||||
@@ -39,6 +45,14 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
// CREATE DATABASE erlaubt keine Parameter-Platzhalter; slug ist durch
|
// CREATE DATABASE erlaubt keine Parameter-Platzhalter; slug ist durch
|
||||||
// ValidateSlug bereits auf [a-z0-9_] beschraenkt, Injektion ausgeschlossen.
|
// ValidateSlug bereits auf [a-z0-9_] beschraenkt, Injektion ausgeschlossen.
|
||||||
if _, err := p.adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
if _, err := p.adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
|
var pgErr *pgconn.PgError
|
||||||
|
// 42P04 (duplicate_database) im Normalfall; bei zwei echt parallelen
|
||||||
|
// CREATE DATABASE auf denselben Namen liefert Postgres stattdessen den
|
||||||
|
// internen Unique-Index-Konflikt 23505 auf pg_database — beide Faelle
|
||||||
|
// bedeuten: der Tenant existiert bereits bzw. wird gerade angelegt.
|
||||||
|
if errors.As(err, &pgErr) && (pgErr.Code == "42P04" || pgErr.Code == "23505") {
|
||||||
|
return Tenant{}, ErrTenantExists
|
||||||
|
}
|
||||||
return Tenant{}, fmt.Errorf("tenant-datenbank anlegen: %w", err)
|
return Tenant{}, fmt.Errorf("tenant-datenbank anlegen: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,6 +74,10 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
_ = tx.Rollback(ctx)
|
_ = tx.Rollback(ctx)
|
||||||
p.rollbackDatabase(ctx, dbName)
|
p.rollbackDatabase(ctx, dbName)
|
||||||
|
var pgErr *pgconn.PgError
|
||||||
|
if errors.As(err, &pgErr) && pgErr.Code == "23505" { // unique_violation auf slug
|
||||||
|
return Tenant{}, ErrTenantExists
|
||||||
|
}
|
||||||
return Tenant{}, err
|
return Tenant{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,3 +94,16 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
func (p *Provisioner) rollbackDatabase(ctx context.Context, dbName string) {
|
func (p *Provisioner) rollbackDatabase(ctx context.Context, dbName string) {
|
||||||
_, _ = p.adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
_, _ = p.adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Deprovision entfernt einen bereits erfolgreich registrierten Tenant wieder
|
||||||
|
// vollstaendig (Registry-Eintrag + Datenbank). Wird als Kompensation
|
||||||
|
// verwendet, wenn ein Schritt NACH Provision fehlschlaegt (z.B. die
|
||||||
|
// Admin-Account-Anlage in TEN-02) — Provision selbst bleibt dadurch die
|
||||||
|
// einzige Stelle, die "erfolgreich provisioniert" garantieren muss.
|
||||||
|
func (p *Provisioner) Deprovision(ctx context.Context, t Tenant) error {
|
||||||
|
if err := p.registry.Delete(ctx, t.ID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
p.rollbackDatabase(ctx, t.DBName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -47,6 +47,16 @@ func (r *Registry) GetBySlug(ctx context.Context, slug string) (Tenant, error) {
|
|||||||
return t, nil
|
return t, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Delete entfernt einen Registry-Eintrag. Wird von Provisioner.Deprovision
|
||||||
|
// als Kompensation verwendet, wenn nach erfolgreicher Registrierung ein
|
||||||
|
// nachgelagerter Schritt (z.B. Admin-Account-Anlage in TEN-02) fehlschlaegt.
|
||||||
|
func (r *Registry) Delete(ctx context.Context, id string) error {
|
||||||
|
if _, err := r.pool.Exec(ctx, `DELETE FROM tenants WHERE id = $1`, id); err != nil {
|
||||||
|
return fmt.Errorf("tenant loeschen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Registry) List(ctx context.Context) ([]Tenant, error) {
|
func (r *Registry) List(ctx context.Context) ([]Tenant, error) {
|
||||||
rows, err := r.pool.Query(ctx, `
|
rows, err := r.pool.Query(ctx, `
|
||||||
SELECT id, slug, name, db_name, db_dsn, status, created_at
|
SELECT id, slug, name, db_name, db_dsn, status, created_at
|
||||||
|
|||||||
@@ -103,51 +103,6 @@ func (s *TenantUserStore) Deactivate(ctx context.Context, id string) (User, erro
|
|||||||
`, id, StatusInactive))
|
`, id, StatusInactive))
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetPasswordHash schreibt einen bereits berechneten bcrypt-Hash (siehe
|
|
||||||
// internal/auth, IAM-02). Der Store selbst kennt kein Klartext-Passwort.
|
|
||||||
func (s *TenantUserStore) SetPasswordHash(ctx context.Context, id, hash string) error {
|
|
||||||
tag, err := s.pool.Exec(ctx, `
|
|
||||||
UPDATE users SET password_hash = $2, updated_at = now() WHERE id = $1
|
|
||||||
`, id, hash)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("passwort setzen: %w", err)
|
|
||||||
}
|
|
||||||
if tag.RowsAffected() == 0 {
|
|
||||||
return ErrNotFound
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// AuthCredentials wird ausschliesslich fuer den Login-Pfad (internal/auth)
|
|
||||||
// verwendet und traegt bewusst den password_hash, damit er nicht ueber den
|
|
||||||
// regulaeren User-Typ/JSON-Serialisierungspfad nach aussen dringen kann.
|
|
||||||
type AuthCredentials struct {
|
|
||||||
User User
|
|
||||||
PasswordHash string
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetByEmailForAuth liefert Benutzer + Passwort-Hash zu einer E-Mail-Adresse
|
|
||||||
// aus GENAU DIESER Tenant-Datenbank — der Tenant-Scope ergibt sich damit
|
|
||||||
// zwingend aus dem verwendeten Pool, es gibt keine Moeglichkeit, versehentlich
|
|
||||||
// ueber Tenant-Grenzen hinweg zu suchen (bekannter archivmail-Fehler, siehe
|
|
||||||
// IAM-02 "Bekannte Fehler vermeiden").
|
|
||||||
func (s *TenantUserStore) GetByEmailForAuth(ctx context.Context, email string) (AuthCredentials, error) {
|
|
||||||
var c AuthCredentials
|
|
||||||
row := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT id, email, name, status, created_at, updated_at, password_hash
|
|
||||||
FROM users WHERE email = $1
|
|
||||||
`, email)
|
|
||||||
|
|
||||||
if err := row.Scan(&c.User.ID, &c.User.Email, &c.User.Name, &c.User.Status,
|
|
||||||
&c.User.CreatedAt, &c.User.UpdatedAt, &c.PasswordHash); err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return AuthCredentials{}, ErrNotFound
|
|
||||||
}
|
|
||||||
return AuthCredentials{}, fmt.Errorf("anmeldedaten lesen: %w", err)
|
|
||||||
}
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func scanUser(row pgx.Row) (User, error) {
|
func scanUser(row pgx.Row) (User, error) {
|
||||||
var u User
|
var u User
|
||||||
if err := row.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
if err := row.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE rate_limit_counters;
|
|
||||||
DROP TABLE rate_limit_configs;
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
-- Rate-Limiting mit geteiltem, externem Zustand (API-03, siehe
|
|
||||||
-- core-kanban/tickets/API-03.md) — bewusst NICHT In-Process, damit mehrere
|
|
||||||
-- Dienstinstanzen dasselbe Limit korrekt durchsetzen.
|
|
||||||
CREATE TABLE rate_limit_configs (
|
|
||||||
key TEXT PRIMARY KEY,
|
|
||||||
limit_value INT NOT NULL,
|
|
||||||
window_seconds INT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE rate_limit_counters (
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
window_start TIMESTAMPTZ NOT NULL,
|
|
||||||
count INT NOT NULL DEFAULT 0,
|
|
||||||
PRIMARY KEY (key, window_start)
|
|
||||||
);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
ALTER TABLE users DROP COLUMN password_hash;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
-- Passwort-Hash-Spalte fuer Login (IAM-02, siehe core-kanban/tickets/IAM-02.md).
|
|
||||||
-- Enthaelt AUSSCHLIESSLICH den bcrypt-Hash, niemals das Klartext-Passwort.
|
|
||||||
ALTER TABLE users ADD COLUMN password_hash TEXT NOT NULL DEFAULT '';
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
|
||||||
ROLE="nexarch_test"
|
|
||||||
|
|
||||||
export PGPASSWORD="$PASS"
|
|
||||||
|
|
||||||
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 '\'")
|
|
||||||
for db in $dbs; do
|
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
|
||||||
cd "$(dirname "$0")/.."
|
|
||||||
|
|
||||||
NEXARCH_TEST_DB_PASSWORD="$PASS" bash scripts/reset-test-env.sh
|
|
||||||
|
|
||||||
export TEST_ADMIN_DSN="postgresql://nexarch_test:${PASS}@localhost:5432/postgres?sslmode=disable"
|
|
||||||
|
|
||||||
echo "== go build =="
|
|
||||||
go build ./...
|
|
||||||
|
|
||||||
echo "== go vet =="
|
|
||||||
go vet ./...
|
|
||||||
|
|
||||||
echo "== go test (-p 1) =="
|
|
||||||
go test ./... -p 1 -count=1
|
|
||||||
Reference in New Issue
Block a user