Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 sysopsandClaude Sonnet 5
|
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)
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
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,12 +1,18 @@
|
||||
#!/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