Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a67adcefa1 | ||
|
|
27f9866264 |
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,19 +0,0 @@
|
|||||||
package webauthn
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CompleteLogin verifiziert die WebAuthn-Signatur und stellt bei Erfolg ein
|
|
||||||
// normales IAM-02-Sitzungs-Token aus — komponiert auth.TokenIssuer, ohne
|
|
||||||
// LoginService/IAM-02 selbst zu veraendern. Passwort+TOTP (IAM-02/IAM-04)
|
|
||||||
// bleiben davon vollstaendig unberuehrt und weiterhin nutzbar
|
|
||||||
// (Akzeptanzkriterium 3).
|
|
||||||
func CompleteLogin(ctx context.Context, store *Store, issuer *auth.TokenIssuer, tenantSlug, userID, challenge, credentialID string, signature []byte) (token string, err error) {
|
|
||||||
if err := store.FinishLogin(ctx, userID, challenge, credentialID, signature); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return issuer.Issue(userID, tenantSlug)
|
|
||||||
}
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
// Package webauthn implementiert Core IAM-10: passwortlose Anmeldung ueber
|
|
||||||
// einen registrierten Authenticator (Plattform-Authenticator wie Windows
|
|
||||||
// Hello/Touch ID oder externer Sicherheitsschluessel).
|
|
||||||
//
|
|
||||||
// WICHTIGER HINWEIS: Dies ist eine vereinfachte, aber kryptographisch echte
|
|
||||||
// Challenge-Response-Zeremonie (Ed25519-Signatur ueber eine einmalige,
|
|
||||||
// zufaellige Challenge) — NICHT das vollstaendige W3C-WebAuthn-Drahtformat
|
|
||||||
// (CBOR-attestationObject/clientDataJSON, COSE-Schluessel), das echte
|
|
||||||
// Browser/Authenticatoren erzeugen. Ohne Browser-Umgebung laesst sich dieses
|
|
||||||
// Drahtformat hier nicht erzeugen oder pruefen (aehnliche Einschraenkung wie
|
|
||||||
// bei IAM-05/LDAP und dem Live-Redirect in IAM-06/OIDC). Diese
|
|
||||||
// Implementierung deckt dieselben Sicherheitseigenschaften ab (Public-Key-
|
|
||||||
// Challenge-Response, Replay-Schutz durch Einmal-Challenge, mehrere
|
|
||||||
// Authenticatoren pro Benutzer) und ist die Grundlage, auf der eine spaetere
|
|
||||||
// Kachel echtes CBOR/COSE-Parsing nachruesten kann, ohne das Datenmodell zu
|
|
||||||
// aendern.
|
|
||||||
package webauthn
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"crypto/ed25519"
|
|
||||||
"crypto/rand"
|
|
||||||
"encoding/hex"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrChallengeInvalid = errors.New("webauthn: challenge ungueltig, verbraucht oder abgelaufen")
|
|
||||||
ErrSignatureInvalid = errors.New("webauthn: signatur ungueltig")
|
|
||||||
ErrNoCredentials = errors.New("webauthn: keine registrierten authenticatoren")
|
|
||||||
)
|
|
||||||
|
|
||||||
// ChallengeTTL begrenzt, wie lange eine ausgestellte Challenge fuer die
|
|
||||||
// Registrierungs-/Anmelde-Ceremonie gueltig bleibt.
|
|
||||||
const ChallengeTTL = 5 * time.Minute
|
|
||||||
|
|
||||||
type Credential struct {
|
|
||||||
ID string
|
|
||||||
UserID string
|
|
||||||
DeviceName string
|
|
||||||
PublicKey ed25519.PublicKey
|
|
||||||
SignCount int
|
|
||||||
}
|
|
||||||
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// BeginRegistration stellt eine Einmal-Challenge fuer die Registrierung
|
|
||||||
// eines neuen Authenticators aus (Akzeptanzkriterium 1).
|
|
||||||
func (s *Store) BeginRegistration(ctx context.Context, userID string) (challenge string, err error) {
|
|
||||||
return s.issueChallenge(ctx, userID, "register")
|
|
||||||
}
|
|
||||||
|
|
||||||
// FinishRegistration verifiziert, dass der Aufrufer im Besitz des privaten
|
|
||||||
// Schluessels zu publicKey ist (Signatur ueber die Challenge), und speichert
|
|
||||||
// den Authenticator. Mehrere Authenticatoren pro Benutzer sind moeglich,
|
|
||||||
// da jede Registrierung eine neue Zeile anlegt (Akzeptanzkriterium 2).
|
|
||||||
func (s *Store) FinishRegistration(ctx context.Context, userID, challenge, deviceName string, publicKey ed25519.PublicKey, signature []byte) (credentialID string, err error) {
|
|
||||||
if err := s.consumeChallenge(ctx, userID, challenge, "register"); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if !ed25519.Verify(publicKey, []byte(challenge), signature) {
|
|
||||||
return "", ErrSignatureInvalid
|
|
||||||
}
|
|
||||||
|
|
||||||
err = s.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO webauthn_credentials (user_id, device_name, public_key)
|
|
||||||
VALUES ($1, $2, $3)
|
|
||||||
RETURNING id
|
|
||||||
`, userID, deviceName, []byte(publicKey)).Scan(&credentialID)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("credential speichern: %w", err)
|
|
||||||
}
|
|
||||||
return credentialID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// BeginLogin stellt eine Einmal-Challenge fuer eine bestehende Anmeldung
|
|
||||||
// aus. Der Benutzer muss mindestens einen registrierten Authenticator haben.
|
|
||||||
func (s *Store) BeginLogin(ctx context.Context, userID string) (challenge string, err error) {
|
|
||||||
var count int
|
|
||||||
if err := s.pool.QueryRow(ctx, `SELECT count(*) FROM webauthn_credentials WHERE user_id = $1`, userID).Scan(&count); err != nil {
|
|
||||||
return "", fmt.Errorf("credentials zaehlen: %w", err)
|
|
||||||
}
|
|
||||||
if count == 0 {
|
|
||||||
return "", ErrNoCredentials
|
|
||||||
}
|
|
||||||
return s.issueChallenge(ctx, userID, "login")
|
|
||||||
}
|
|
||||||
|
|
||||||
// FinishLogin verifiziert die Signatur ueber die Login-Challenge gegen den
|
|
||||||
// gespeicherten oeffentlichen Schluessel des angegebenen Credentials
|
|
||||||
// (Akzeptanzkriterium 1: Anmeldung ohne Passwort).
|
|
||||||
func (s *Store) FinishLogin(ctx context.Context, userID, challenge, credentialID string, signature []byte) error {
|
|
||||||
if err := s.consumeChallenge(ctx, userID, challenge, "login"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var publicKey []byte
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT public_key FROM webauthn_credentials WHERE id = $1 AND user_id = $2
|
|
||||||
`, credentialID, userID).Scan(&publicKey)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return ErrSignatureInvalid
|
|
||||||
}
|
|
||||||
return fmt.Errorf("credential lesen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !ed25519.Verify(ed25519.PublicKey(publicKey), []byte(challenge), signature) {
|
|
||||||
return ErrSignatureInvalid
|
|
||||||
}
|
|
||||||
|
|
||||||
_, _ = s.pool.Exec(ctx, `UPDATE webauthn_credentials SET sign_count = sign_count + 1 WHERE id = $1`, credentialID)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListCredentials liefert alle registrierten Authenticatoren eines
|
|
||||||
// Benutzers (Akzeptanzkriterium 2).
|
|
||||||
func (s *Store) ListCredentials(ctx context.Context, userID string) ([]Credential, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT id, device_name, public_key, sign_count FROM webauthn_credentials WHERE user_id = $1
|
|
||||||
`, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("credentials auflisten: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []Credential
|
|
||||||
for rows.Next() {
|
|
||||||
c := Credential{UserID: userID}
|
|
||||||
var pub []byte
|
|
||||||
if err := rows.Scan(&c.ID, &c.DeviceName, &pub, &c.SignCount); err != nil {
|
|
||||||
return nil, fmt.Errorf("credential lesen: %w", err)
|
|
||||||
}
|
|
||||||
c.PublicKey = pub
|
|
||||||
out = append(out, c)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) issueChallenge(ctx context.Context, userID, purpose string) (string, error) {
|
|
||||||
buf := make([]byte, 32)
|
|
||||||
if _, err := rand.Read(buf); err != nil {
|
|
||||||
return "", fmt.Errorf("challenge erzeugen: %w", err)
|
|
||||||
}
|
|
||||||
challenge := hex.EncodeToString(buf)
|
|
||||||
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO webauthn_challenges (user_id, challenge, purpose, expires_at)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
`, userID, challenge, purpose, time.Now().Add(ChallengeTTL))
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("challenge speichern: %w", err)
|
|
||||||
}
|
|
||||||
return challenge, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// consumeChallenge loest eine Challenge ATOMAR und EINMALIG ein (WHERE
|
|
||||||
// used_at IS NULL, dasselbe Muster wie IAM-03/IAM-06/IAM-09) — verhindert
|
|
||||||
// Replay einer abgefangenen Signatur-Antwort.
|
|
||||||
func (s *Store) consumeChallenge(ctx context.Context, userID, challenge, purpose string) error {
|
|
||||||
tag, err := s.pool.Exec(ctx, `
|
|
||||||
UPDATE webauthn_challenges SET used_at = now()
|
|
||||||
WHERE user_id = $1 AND challenge = $2 AND purpose = $3
|
|
||||||
AND used_at IS NULL AND expires_at > now()
|
|
||||||
`, userID, challenge, purpose)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("challenge einloesen: %w", err)
|
|
||||||
}
|
|
||||||
if tag.RowsAffected() == 0 {
|
|
||||||
return ErrChallengeInvalid
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
package webauthn
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"crypto/ed25519"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*Store, *user.TenantUserStore, string, 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 webauthn_credentials (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL REFERENCES users(id),
|
|
||||||
device_name TEXT NOT NULL, public_key BYTEA NOT NULL, sign_count INT NOT NULL DEFAULT 0,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS webauthn_challenges (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL REFERENCES users(id),
|
|
||||||
challenge TEXT NOT NULL UNIQUE, purpose TEXT NOT NULL CHECK (purpose IN ('register','login')),
|
|
||||||
expires_at TIMESTAMPTZ NOT NULL, used_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
userStore := user.NewTenantUserStore(pool)
|
|
||||||
email := fmt.Sprintf("webauthn-test-%d@example.com", time.Now().UnixNano())
|
|
||||||
u, err := userStore.Create(ctx, email, "WebAuthn Test")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create user: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return NewStore(pool), userStore, u.ID, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// simulateAuthenticator erzeugt ein neues Schluesselpaar und "unterschreibt"
|
|
||||||
// eine Challenge — steht fuer einen echten Hardware-/Plattform-Authenticator
|
|
||||||
// im Test (siehe Paket-Dokumentation zur vereinfachten Zeremonie).
|
|
||||||
func simulateAuthenticator(t *testing.T) (ed25519.PublicKey, ed25519.PrivateKey) {
|
|
||||||
t.Helper()
|
|
||||||
pub, priv, err := ed25519.GenerateKey(nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("schluesselpaar erzeugen: %v", err)
|
|
||||||
}
|
|
||||||
return pub, priv
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Registrierung und Anmeldung mit
|
|
||||||
// simuliertem Authenticator erfolgreich, ganz ohne Passworteingabe.
|
|
||||||
func TestRegisterAndLogin_WithoutPassword(t *testing.T) {
|
|
||||||
store, _, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pub, priv := simulateAuthenticator(t)
|
|
||||||
|
|
||||||
regChallenge, err := store.BeginRegistration(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("begin registration: %v", err)
|
|
||||||
}
|
|
||||||
sig := ed25519.Sign(priv, []byte(regChallenge))
|
|
||||||
credentialID, err := store.FinishRegistration(ctx, userID, regChallenge, "Yubikey 1", pub, sig)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("finish registration: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
loginChallenge, err := store.BeginLogin(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("begin login: %v", err)
|
|
||||||
}
|
|
||||||
loginSig := ed25519.Sign(priv, []byte(loginChallenge))
|
|
||||||
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
token, err := CompleteLogin(ctx, store, issuer, "acme", userID, loginChallenge, credentialID, loginSig)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("complete login: %v", err)
|
|
||||||
}
|
|
||||||
if token == "" {
|
|
||||||
t.Fatal("erwartet nicht-leeres sitzungs-token")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFinishRegistration_RejectsWrongSignature(t *testing.T) {
|
|
||||||
store, _, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pub, _ := simulateAuthenticator(t)
|
|
||||||
_, otherPriv := simulateAuthenticator(t) // falscher privater schluessel
|
|
||||||
|
|
||||||
challenge, err := store.BeginRegistration(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("begin registration: %v", err)
|
|
||||||
}
|
|
||||||
wrongSig := ed25519.Sign(otherPriv, []byte(challenge))
|
|
||||||
|
|
||||||
if _, err := store.FinishRegistration(ctx, userID, challenge, "Faelscher", pub, wrongSig); !errors.Is(err, ErrSignatureInvalid) {
|
|
||||||
t.Fatalf("erwartet ErrSignatureInvalid, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestChallenge_CannotBeReplayed(t *testing.T) {
|
|
||||||
store, _, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pub, priv := simulateAuthenticator(t)
|
|
||||||
challenge, err := store.BeginRegistration(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("begin registration: %v", err)
|
|
||||||
}
|
|
||||||
sig := ed25519.Sign(priv, []byte(challenge))
|
|
||||||
|
|
||||||
if _, err := store.FinishRegistration(ctx, userID, challenge, "Geraet 1", pub, sig); err != nil {
|
|
||||||
t.Fatalf("erste registrierung: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.FinishRegistration(ctx, userID, challenge, "Geraet 2 (replay)", pub, sig); !errors.Is(err, ErrChallengeInvalid) {
|
|
||||||
t.Fatalf("erwartet ErrChallengeInvalid bei wiederverwendeter challenge, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: mehrere Authenticatoren pro Benutzer,
|
|
||||||
// beide funktionsfaehig (Geraetewechsel/-verlust).
|
|
||||||
func TestMultipleCredentials_BothWork(t *testing.T) {
|
|
||||||
store, _, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pub1, priv1 := simulateAuthenticator(t)
|
|
||||||
pub2, priv2 := simulateAuthenticator(t)
|
|
||||||
|
|
||||||
reg1, _ := store.BeginRegistration(ctx, userID)
|
|
||||||
cred1, err := store.FinishRegistration(ctx, userID, reg1, "Laptop", pub1, ed25519.Sign(priv1, []byte(reg1)))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("register cred1: %v", err)
|
|
||||||
}
|
|
||||||
reg2, _ := store.BeginRegistration(ctx, userID)
|
|
||||||
cred2, err := store.FinishRegistration(ctx, userID, reg2, "Handy", pub2, ed25519.Sign(priv2, []byte(reg2)))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("register cred2: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
creds, err := store.ListCredentials(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list: %v", err)
|
|
||||||
}
|
|
||||||
if len(creds) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 credentials, habe %d", len(creds))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Beide Authenticatoren koennen sich unabhaengig voneinander anmelden.
|
|
||||||
login1, _ := store.BeginLogin(ctx, userID)
|
|
||||||
if err := store.FinishLogin(ctx, userID, login1, cred1, ed25519.Sign(priv1, []byte(login1))); err != nil {
|
|
||||||
t.Fatalf("login mit cred1: %v", err)
|
|
||||||
}
|
|
||||||
login2, _ := store.BeginLogin(ctx, userID)
|
|
||||||
if err := store.FinishLogin(ctx, userID, login2, cred2, ed25519.Sign(priv2, []byte(login2))); err != nil {
|
|
||||||
t.Fatalf("login mit cred2: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: Login mit Passwort+TOTP funktioniert
|
|
||||||
// weiterhin unveraendert, kein Zwang auf WebAuthn.
|
|
||||||
func TestPasswordLoginStillWorks_AfterWebAuthnRegistration(t *testing.T) {
|
|
||||||
store, userStore, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
u, err := userStore.Get(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get user: %v", err)
|
|
||||||
}
|
|
||||||
hash, err := auth.HashPassword("korrektes-passwort")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("hash: %v", err)
|
|
||||||
}
|
|
||||||
if err := userStore.SetPasswordHash(ctx, userID, hash); err != nil {
|
|
||||||
t.Fatalf("set password: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// WebAuthn zusaetzlich registrieren.
|
|
||||||
pub, priv := simulateAuthenticator(t)
|
|
||||||
reg, _ := store.BeginRegistration(ctx, userID)
|
|
||||||
if _, err := store.FinishRegistration(ctx, userID, reg, "Geraet", pub, ed25519.Sign(priv, []byte(reg))); err != nil {
|
|
||||||
t.Fatalf("register: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Passwort-Login (IAM-02) bleibt unveraendert funktionsfaehig.
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
loginService := auth.NewLoginService(userStore, issuer, "acme")
|
|
||||||
token, err := loginService.Login(ctx, u.Email, "korrektes-passwort")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("passwort-login sollte trotz registriertem webauthn weiterhin funktionieren: %v", err)
|
|
||||||
}
|
|
||||||
if token == "" {
|
|
||||||
t.Fatal("erwartet gueltiges token")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBeginLogin_RejectsUserWithoutCredentials(t *testing.T) {
|
|
||||||
store, _, userID, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.BeginLogin(ctx, userID); !errors.Is(err, ErrNoCredentials) {
|
|
||||||
t.Fatalf("erwartet ErrNoCredentials, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE rate_limit_counters;
|
||||||
|
DROP TABLE rate_limit_configs;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- 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,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS webauthn_challenges;
|
|
||||||
DROP TABLE IF EXISTS webauthn_credentials;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
-- Passwortlose Anmeldung via WebAuthn/Passkey (IAM-10, siehe
|
|
||||||
-- core-kanban/tickets/IAM-10.md).
|
|
||||||
CREATE TABLE webauthn_credentials (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id),
|
|
||||||
device_name TEXT NOT NULL,
|
|
||||||
public_key BYTEA NOT NULL,
|
|
||||||
sign_count INT NOT NULL DEFAULT 0,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX webauthn_credentials_user_idx ON webauthn_credentials (user_id);
|
|
||||||
|
|
||||||
-- Einmal-Challenges fuer Registrierung/Anmeldung (Replay-Schutz).
|
|
||||||
CREATE TABLE webauthn_challenges (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id),
|
|
||||||
challenge TEXT NOT NULL UNIQUE,
|
|
||||||
purpose TEXT NOT NULL CHECK (purpose IN ('register', 'login')),
|
|
||||||
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