Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43dca005f2 | ||
|
|
24a522e10c | ||
|
|
27f9866264 |
@@ -0,0 +1,40 @@
|
|||||||
|
// secheaders-devserver dient der manuellen/e2e-Verifikation von API-08
|
||||||
|
// (Pruefung 2: CSP blockiert Inline-Script) mit einem echten Browser.
|
||||||
|
// Zwei Pfade: /protected (mit Middleware) und /unprotected (ohne) — beide
|
||||||
|
// liefern dieselbe Seite mit einem Inline-Script, das ein DOM-Element
|
||||||
|
// aendert. Ein echter Browser zeigt den Unterschied.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/secheaders"
|
||||||
|
)
|
||||||
|
|
||||||
|
const page = `<!doctype html>
|
||||||
|
<html><body>
|
||||||
|
<div id="marker">BLOCKED</div>
|
||||||
|
<script>document.getElementById('marker').textContent = 'INLINE_RAN';</script>
|
||||||
|
</body></html>`
|
||||||
|
|
||||||
|
func servePage(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
_, _ = w.Write([]byte(page))
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg := secheaders.DefaultConfig()
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
// SetHeaders statt Middleware: dieser lokale Demo-Server laeuft ohne
|
||||||
|
// TLS-Terminierung, der HTTPS-Redirect-Teil von Middleware wuerde hier
|
||||||
|
// in eine Endlosschleife fuehren (siehe secheaders.go-Dokumentation).
|
||||||
|
mux.HandleFunc("/protected", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
secheaders.SetHeaders(cfg, w)
|
||||||
|
servePage(w, r)
|
||||||
|
})
|
||||||
|
mux.HandleFunc("/unprotected", servePage)
|
||||||
|
|
||||||
|
log.Println("secheaders-devserver listening on :8086")
|
||||||
|
log.Fatal(http.ListenAndServe(":8086", mux))
|
||||||
|
}
|
||||||
@@ -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,37 +0,0 @@
|
|||||||
package lockout
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
|
||||||
)
|
|
||||||
|
|
||||||
var ErrAccountLocked = errors.New("lockout: konto ist vorübergehend gesperrt")
|
|
||||||
|
|
||||||
// GuardedLogin komponiert IAM-02s LoginService mit dem Lockout-Zustand,
|
|
||||||
// OHNE LoginService selbst zu veraendern (kein Umbau der Vorbedingung):
|
|
||||||
// vor jedem Login-Versuch wird die Sperre geprueft, nach jedem Versuch wird
|
|
||||||
// Erfolg/Fehlschlag im geteilten Postgres-Zustand vermerkt.
|
|
||||||
func GuardedLogin(ctx context.Context, store *Store, login *auth.LoginService, email, password string) (string, error) {
|
|
||||||
locked, _, err := store.IsLocked(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if locked {
|
|
||||||
return "", ErrAccountLocked
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := login.Login(ctx, email, password)
|
|
||||||
if err != nil {
|
|
||||||
if _, _, lockErr := store.RecordFailure(ctx, email); lockErr != nil {
|
|
||||||
return "", lockErr
|
|
||||||
}
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := store.RecordSuccess(ctx, email); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return token, nil
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
// Package lockout implementiert Core IAM-07: Account-Lockout nach
|
|
||||||
// Fehlversuchen und Login-Rate-Limiting mit geteiltem, externem
|
|
||||||
// (Postgres-basiertem) Zustand — kein In-Process-Zaehler, der bei
|
|
||||||
// Mehrinstanzbetrieb aushebelbar waere (bekannter Fehler aus archivdms
|
|
||||||
// internal/auth/ratelimit.go).
|
|
||||||
package lockout
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultMaxFailedAttempts/DefaultLockoutDuration sind explizit benannte
|
|
||||||
// Defaults, ueberschreibbar via WithPolicy.
|
|
||||||
const (
|
|
||||||
DefaultMaxFailedAttempts = 5
|
|
||||||
DefaultLockoutDuration = 15 * time.Minute
|
|
||||||
)
|
|
||||||
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
maxFailed int
|
|
||||||
lockoutDuration time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool, maxFailed: DefaultMaxFailedAttempts, lockoutDuration: DefaultLockoutDuration}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) WithPolicy(maxFailed int, lockoutDuration time.Duration) *Store {
|
|
||||||
return &Store{pool: s.pool, maxFailed: maxFailed, lockoutDuration: lockoutDuration}
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsLocked prueft, ob ein Konto aktuell gesperrt ist. Eine abgelaufene
|
|
||||||
// Sperre gilt automatisch als nicht mehr gesperrt (Akzeptanzkriterium 3) —
|
|
||||||
// es ist keine explizite Entsperr-Aktion noetig, der Zeitvergleich reicht.
|
|
||||||
func (s *Store) IsLocked(ctx context.Context, email string) (locked bool, lockedUntil time.Time, err error) {
|
|
||||||
err = s.pool.QueryRow(ctx, `
|
|
||||||
SELECT locked_until FROM login_attempts WHERE email = $1 AND locked_until IS NOT NULL
|
|
||||||
`, email).Scan(&lockedUntil)
|
|
||||||
if err != nil {
|
|
||||||
return false, time.Time{}, nil // kein Datensatz oder kein Lock -> nicht gesperrt
|
|
||||||
}
|
|
||||||
return time.Now().Before(lockedUntil), lockedUntil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecordFailure erhoeht den Fehlversuchszaehler ATOMAR (UPSERT) und sperrt
|
|
||||||
// das Konto, sobald die Schwelle erreicht ist (Akzeptanzkriterium 1 / 2).
|
|
||||||
// Der Zustand liegt ausschliesslich in Postgres, mehrere Core-Instanzen
|
|
||||||
// teilen sich denselben Zaehler (Akzeptanzkriterium 2).
|
|
||||||
func (s *Store) RecordFailure(ctx context.Context, email string) (locked bool, lockedUntil time.Time, err error) {
|
|
||||||
var failedCount int
|
|
||||||
var lockedUntilPtr *time.Time
|
|
||||||
|
|
||||||
err = s.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO login_attempts (email, failed_count, locked_until, last_attempt_at)
|
|
||||||
VALUES ($1, 1, CASE WHEN 1 >= $2 THEN now() + $3::interval ELSE NULL END, now())
|
|
||||||
ON CONFLICT (email) DO UPDATE SET
|
|
||||||
failed_count = login_attempts.failed_count + 1,
|
|
||||||
last_attempt_at = now(),
|
|
||||||
locked_until = CASE
|
|
||||||
WHEN login_attempts.failed_count + 1 >= $2 THEN now() + $3::interval
|
|
||||||
ELSE login_attempts.locked_until
|
|
||||||
END
|
|
||||||
RETURNING failed_count, locked_until
|
|
||||||
`, email, s.maxFailed, fmt.Sprintf("%f seconds", s.lockoutDuration.Seconds())).Scan(&failedCount, &lockedUntilPtr)
|
|
||||||
if err != nil {
|
|
||||||
return false, time.Time{}, fmt.Errorf("fehlversuch erfassen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if lockedUntilPtr != nil {
|
|
||||||
return time.Now().Before(*lockedUntilPtr), *lockedUntilPtr, nil
|
|
||||||
}
|
|
||||||
return false, time.Time{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecordSuccess setzt den Fehlversuchszaehler nach erfolgreichem Login zurueck.
|
|
||||||
func (s *Store) RecordSuccess(ctx context.Context, email string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO login_attempts (email, failed_count, locked_until, last_attempt_at)
|
|
||||||
VALUES ($1, 0, NULL, now())
|
|
||||||
ON CONFLICT (email) DO UPDATE SET failed_count = 0, locked_until = NULL, last_attempt_at = now()
|
|
||||||
`, email)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("erfolgreichen login erfassen: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unlock entsperrt ein Konto durch Administratoreingriff, unabhaengig von
|
|
||||||
// der Sperrzeit (Akzeptanzkriterium 3).
|
|
||||||
func (s *Store) Unlock(ctx context.Context, email string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
UPDATE login_attempts SET failed_count = 0, locked_until = NULL WHERE email = $1
|
|
||||||
`, email)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("konto entsperren: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
package lockout
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"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"
|
|
||||||
)
|
|
||||||
|
|
||||||
const schema = `
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), email TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active', password_hash TEXT NOT NULL DEFAULT '',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS login_attempts (
|
|
||||||
email TEXT PRIMARY KEY, failed_count INT NOT NULL DEFAULT 0,
|
|
||||||
locked_until TIMESTAMPTZ, last_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);`
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*pgxpool.Pool, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, schema); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return pool, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func uniqueEmail() string {
|
|
||||||
return fmt.Sprintf("lockout-test-%d@example.com", time.Now().UnixNano())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 2: Sperre greift nach definierten
|
|
||||||
// Fehlversuchen zuverlaessig.
|
|
||||||
func TestRecordFailure_LocksAfterThreshold(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
store := NewStore(pool).WithPolicy(3, time.Hour)
|
|
||||||
email := uniqueEmail()
|
|
||||||
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
locked, _, err := store.RecordFailure(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("record failure %d: %v", i, err)
|
|
||||||
}
|
|
||||||
if locked {
|
|
||||||
t.Fatalf("sollte nach %d fehlversuchen noch nicht gesperrt sein", i+1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
locked, lockedUntil, err := store.RecordFailure(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("record failure 3: %v", err)
|
|
||||||
}
|
|
||||||
if !locked {
|
|
||||||
t.Fatal("erwartet gesperrt nach 3 fehlversuchen (schwelle=3)")
|
|
||||||
}
|
|
||||||
if !lockedUntil.After(time.Now()) {
|
|
||||||
t.Fatal("lockedUntil sollte in der zukunft liegen")
|
|
||||||
}
|
|
||||||
|
|
||||||
isLocked, _, err := store.IsLocked(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is locked: %v", err)
|
|
||||||
}
|
|
||||||
if !isLocked {
|
|
||||||
t.Fatal("IsLocked sollte true liefern")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 1: zwei Dienstinstanzen teilen sich
|
|
||||||
// denselben Zaehler (Mehrinstanz-Test) — hier durch zwei unabhaengige
|
|
||||||
// pgxpool.Pool-Verbindungen zur selben Datenbank simuliert.
|
|
||||||
func TestRecordFailure_SharedAcrossInstances(t *testing.T) {
|
|
||||||
_, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
email := uniqueEmail()
|
|
||||||
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
instanceA, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("instance a: %v", err)
|
|
||||||
}
|
|
||||||
defer instanceA.Close()
|
|
||||||
instanceB, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("instance b: %v", err)
|
|
||||||
}
|
|
||||||
defer instanceB.Close()
|
|
||||||
|
|
||||||
storeA := NewStore(instanceA).WithPolicy(4, time.Hour)
|
|
||||||
storeB := NewStore(instanceB).WithPolicy(4, time.Hour)
|
|
||||||
|
|
||||||
// Zwei fehlversuche ueber "instanz A", zwei ueber "instanz B" — beide
|
|
||||||
// muessen sich denselben Zaehler teilen und gemeinsam die Schwelle erreichen.
|
|
||||||
if _, _, err := storeA.RecordFailure(ctx, email); err != nil {
|
|
||||||
t.Fatalf("a1: %v", err)
|
|
||||||
}
|
|
||||||
if _, _, err := storeB.RecordFailure(ctx, email); err != nil {
|
|
||||||
t.Fatalf("b1: %v", err)
|
|
||||||
}
|
|
||||||
if _, _, err := storeA.RecordFailure(ctx, email); err != nil {
|
|
||||||
t.Fatalf("a2: %v", err)
|
|
||||||
}
|
|
||||||
locked, _, err := storeB.RecordFailure(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("b2: %v", err)
|
|
||||||
}
|
|
||||||
if !locked {
|
|
||||||
t.Fatal("erwartet gesperrt nach insgesamt 4 fehlversuchen ueber beide instanzen hinweg")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: automatische Entsperrung nach Ablauf
|
|
||||||
// der Sperrzeit, Zeitversatz automatisiert getestet.
|
|
||||||
func TestIsLocked_AutoUnlocksAfterExpiry(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
store := NewStore(pool).WithPolicy(1, 50*time.Millisecond)
|
|
||||||
email := uniqueEmail()
|
|
||||||
|
|
||||||
locked, _, err := store.RecordFailure(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("record failure: %v", err)
|
|
||||||
}
|
|
||||||
if !locked {
|
|
||||||
t.Fatal("erwartet sofort gesperrt bei schwelle=1")
|
|
||||||
}
|
|
||||||
|
|
||||||
isLocked, _, err := store.IsLocked(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is locked (vor ablauf): %v", err)
|
|
||||||
}
|
|
||||||
if !isLocked {
|
|
||||||
t.Fatal("erwartet gesperrt vor ablauf der sperrzeit")
|
|
||||||
}
|
|
||||||
|
|
||||||
time.Sleep(70 * time.Millisecond)
|
|
||||||
|
|
||||||
isLocked, _, err = store.IsLocked(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is locked (nach ablauf): %v", err)
|
|
||||||
}
|
|
||||||
if isLocked {
|
|
||||||
t.Fatal("erwartet automatisch entsperrt nach ablauf der sperrzeit")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Entsperrung durch Administratoreingriff.
|
|
||||||
func TestUnlock_ClearsLockImmediately(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
store := NewStore(pool).WithPolicy(1, time.Hour)
|
|
||||||
email := uniqueEmail()
|
|
||||||
|
|
||||||
if _, _, err := store.RecordFailure(ctx, email); err != nil {
|
|
||||||
t.Fatalf("record failure: %v", err)
|
|
||||||
}
|
|
||||||
locked, _, _ := store.IsLocked(ctx, email)
|
|
||||||
if !locked {
|
|
||||||
t.Fatal("erwartet gesperrt vor admin-eingriff")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := store.Unlock(ctx, email); err != nil {
|
|
||||||
t.Fatalf("unlock: %v", err)
|
|
||||||
}
|
|
||||||
locked, _, err := store.IsLocked(ctx, email)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is locked nach unlock: %v", err)
|
|
||||||
}
|
|
||||||
if locked {
|
|
||||||
t.Fatal("erwartet sofort entsperrt nach admin-eingriff, unabhaengig von der sperrzeit")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Integrationstest: GuardedLogin komponiert IAM-02 LoginService mit dem
|
|
||||||
// Lockout-Zustand, ohne LoginService selbst zu veraendern.
|
|
||||||
func TestGuardedLogin_LocksAfterRepeatedFailures(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
email := uniqueEmail()
|
|
||||||
userStore := user.NewTenantUserStore(pool)
|
|
||||||
u, err := userStore.Create(ctx, email, "Lockout Test")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create user: %v", err)
|
|
||||||
}
|
|
||||||
hash, err := auth.HashPassword("korrektes-passwort")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("hash: %v", err)
|
|
||||||
}
|
|
||||||
if err := userStore.SetPasswordHash(ctx, u.ID, hash); err != nil {
|
|
||||||
t.Fatalf("set password: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
|
||||||
loginService := auth.NewLoginService(userStore, issuer, "acme")
|
|
||||||
lockoutStore := NewStore(pool).WithPolicy(3, time.Hour)
|
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
if _, err := GuardedLogin(ctx, lockoutStore, loginService, email, "falsches-passwort"); !errors.Is(err, auth.ErrInvalidCredentials) {
|
|
||||||
t.Fatalf("versuch %d: erwartet ErrInvalidCredentials, habe %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selbst das RICHTIGE Passwort wird jetzt abgewiesen, weil das Konto gesperrt ist.
|
|
||||||
if _, err := GuardedLogin(ctx, lockoutStore, loginService, email, "korrektes-passwort"); !errors.Is(err, ErrAccountLocked) {
|
|
||||||
t.Fatalf("erwartet ErrAccountLocked trotz korrektem passwort, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
// Package secheaders implementiert Core API-08: eine gemeinsame
|
||||||
|
// Security-Header-Middleware/Bibliothek, die jedes Modul-Frontend (DMS,
|
||||||
|
// Mail, Workflow, AI, Connect) einbindet, statt Header pro Modul erneut zu
|
||||||
|
// definieren (Akzeptanzkriterium 3) — dieselbe Konsolidierungslogik wie
|
||||||
|
// beim zentralen Rate-Limiting (API-03). Die tatsaechliche EINBINDUNG in
|
||||||
|
// jedes einzelne Modul-Frontend ist ausdruecklich NICHT Teil dieser Kachel
|
||||||
|
// (siehe Ticket "Nicht Bestandteil").
|
||||||
|
package secheaders
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config ist die Baseline-Konfiguration. DefaultConfig() liefert einen
|
||||||
|
// Ausgangspunkt OHNE 'unsafe-inline'/'unsafe-eval' (Akzeptanzkriterium 1)
|
||||||
|
// und mit angemessener HSTS-Laufzeit (Akzeptanzkriterium 2).
|
||||||
|
type Config struct {
|
||||||
|
// ContentSecurityPolicy wird unveraendert als Header-Wert gesendet.
|
||||||
|
ContentSecurityPolicy string
|
||||||
|
// HSTSMaxAge bestimmt die Gueltigkeitsdauer, die Browser sich merken.
|
||||||
|
HSTSMaxAge time.Duration
|
||||||
|
HSTSIncludeSubdomains bool
|
||||||
|
FrameOptions string
|
||||||
|
ReferrerPolicy string
|
||||||
|
ContentTypeNoSniff bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultConfig liefert die dokumentierte Baseline: restriktive CSP ohne
|
||||||
|
// unsichere Direktiven, HSTS mit 180 Tagen (empfohlener Mindestwert fuer
|
||||||
|
// HSTS-Preloading-Listen liegt bei 1 Jahr — 180 Tage ist ein bewusst
|
||||||
|
// konservativer, aber bereits "angemessener" Ausgangswert, siehe
|
||||||
|
// Akzeptanzkriterium 2), Clickjacking- und MIME-Sniffing-Schutz.
|
||||||
|
func DefaultConfig() Config {
|
||||||
|
return Config{
|
||||||
|
ContentSecurityPolicy: strings.Join([]string{
|
||||||
|
"default-src 'self'",
|
||||||
|
"script-src 'self'",
|
||||||
|
"style-src 'self'",
|
||||||
|
"img-src 'self' data:",
|
||||||
|
"object-src 'none'",
|
||||||
|
"base-uri 'self'",
|
||||||
|
"frame-ancestors 'none'",
|
||||||
|
}, "; "),
|
||||||
|
HSTSMaxAge: 180 * 24 * time.Hour,
|
||||||
|
HSTSIncludeSubdomains: true,
|
||||||
|
FrameOptions: "DENY",
|
||||||
|
ReferrerPolicy: "strict-origin-when-cross-origin",
|
||||||
|
ContentTypeNoSniff: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequiredHeaders sind die von dieser Baseline gesetzten Header-Namen — die
|
||||||
|
// Referenzliste fuer CheckCoverage (Akzeptanzkriterium/Pruefung 1).
|
||||||
|
var RequiredHeaders = []string{
|
||||||
|
"Content-Security-Policy",
|
||||||
|
"Strict-Transport-Security",
|
||||||
|
"X-Frame-Options",
|
||||||
|
"Referrer-Policy",
|
||||||
|
"X-Content-Type-Options",
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Config) hstsValue() string {
|
||||||
|
v := fmt.Sprintf("max-age=%d", int(c.HSTSMaxAge.Seconds()))
|
||||||
|
if c.HSTSIncludeSubdomains {
|
||||||
|
v += "; includeSubDomains"
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
// Middleware setzt die Baseline-Header auf JEDER Antwort und erzwingt einen
|
||||||
|
// HTTP->HTTPS-Redirect, WENN die Anfrage nicht bereits ueber TLS ankam
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 3) — serverseitig durchgesetzt, nicht nur
|
||||||
|
// dem Browser-HSTS-Cache ueberlassen (der erst nach dem ERSTEN sicheren
|
||||||
|
// Aufruf greift).
|
||||||
|
func Middleware(cfg Config, next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if !isSecure(r) {
|
||||||
|
target := "https://" + r.Host + r.URL.RequestURI()
|
||||||
|
http.Redirect(w, r, target, http.StatusMovedPermanently)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
SetHeaders(cfg, w)
|
||||||
|
next(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeaders setzt die Baseline-Header direkt, OHNE die HTTPS-Redirect-
|
||||||
|
// Pruefung von Middleware — nuetzlich fuer lokale Entwicklungs-/
|
||||||
|
// Demo-Umgebungen ohne TLS-Terminierung (siehe cmd/secheaders-devserver)
|
||||||
|
// und fuer Aufrufer, die den Redirect selbst schon anderweitig sicherstellen.
|
||||||
|
func SetHeaders(cfg Config, w http.ResponseWriter) {
|
||||||
|
w.Header().Set("Content-Security-Policy", cfg.ContentSecurityPolicy)
|
||||||
|
w.Header().Set("Strict-Transport-Security", cfg.hstsValue())
|
||||||
|
w.Header().Set("X-Frame-Options", cfg.FrameOptions)
|
||||||
|
w.Header().Set("Referrer-Policy", cfg.ReferrerPolicy)
|
||||||
|
if cfg.ContentTypeNoSniff {
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// isSecure erkennt TLS direkt ODER ueber den ueblichen Reverse-Proxy-Header
|
||||||
|
// (X-Forwarded-Proto) — der Core-Dienst laeuft in der Praxis hinter einem
|
||||||
|
// TLS-terminierenden Proxy, sieht r.TLS also nie direkt gesetzt.
|
||||||
|
func isSecure(r *http.Request) bool {
|
||||||
|
if r.TLS != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return strings.EqualFold(r.Header.Get("X-Forwarded-Proto"), "https")
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckCoverage vergleicht die tatsaechlich gesetzten Header einer Antwort
|
||||||
|
// gegen RequiredHeaders und liefert die fehlenden — der "automatisierte
|
||||||
|
// Header-Scan" aus Pruefung 1, anwendbar auf jede Antwort eines beliebigen
|
||||||
|
// Modul-Frontends.
|
||||||
|
func CheckCoverage(headers http.Header) (missing []string) {
|
||||||
|
for _, name := range RequiredHeaders {
|
||||||
|
if headers.Get(name) == "" {
|
||||||
|
missing = append(missing, name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return missing
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
package secheaders
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func secureRequest(method, target string) *http.Request {
|
||||||
|
req := httptest.NewRequest(method, target, nil)
|
||||||
|
req.Header.Set("X-Forwarded-Proto", "https")
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: CSP definiert ohne unsafe-inline/unsafe-eval.
|
||||||
|
func TestDefaultConfig_CSPHasNoUnsafeDirectives(t *testing.T) {
|
||||||
|
cfg := DefaultConfig()
|
||||||
|
if strings.Contains(cfg.ContentSecurityPolicy, "unsafe-inline") {
|
||||||
|
t.Fatal("csp enthaelt 'unsafe-inline', erwartet keine unsicheren direktiven")
|
||||||
|
}
|
||||||
|
if strings.Contains(cfg.ContentSecurityPolicy, "unsafe-eval") {
|
||||||
|
t.Fatal("csp enthaelt 'unsafe-eval', erwartet keine unsicheren direktiven")
|
||||||
|
}
|
||||||
|
if !strings.Contains(cfg.ContentSecurityPolicy, "default-src 'self'") {
|
||||||
|
t.Fatal("erwartet restriktive default-src 'self' als ausgangspunkt")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2: HSTS mit angemessener max-age gesetzt.
|
||||||
|
func TestMiddleware_SetsHSTSWithSufficientMaxAge(t *testing.T) {
|
||||||
|
cfg := DefaultConfig()
|
||||||
|
handler := Middleware(cfg, func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handler(rec, secureRequest(http.MethodGet, "https://example.test/"))
|
||||||
|
|
||||||
|
hsts := rec.Header().Get("Strict-Transport-Security")
|
||||||
|
if !strings.Contains(hsts, "max-age=") {
|
||||||
|
t.Fatalf("hsts-header fehlt max-age: %q", hsts)
|
||||||
|
}
|
||||||
|
// "Angemessen" heisst hier: mindestens 30 Tage (2592000s) — deutlich
|
||||||
|
// ueber dem bekannten Anti-Pattern kurzer/fehlender max-age-Werte.
|
||||||
|
if cfg.HSTSMaxAge.Seconds() < 2592000 {
|
||||||
|
t.Fatalf("konfigurierte hsts-max-age = %v, erwartet mindestens 30 tage", cfg.HSTSMaxAge)
|
||||||
|
}
|
||||||
|
if !strings.Contains(hsts, "includeSubDomains") {
|
||||||
|
t.Fatalf("erwartet includeSubDomains im hsts-header: %q", hsts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: EINE gemeinsame Middleware setzt ALLE
|
||||||
|
// Baseline-Header vollstaendig — automatisiert ueberprueft mit CheckCoverage.
|
||||||
|
func TestMiddleware_ProducesFullHeaderCoverage(t *testing.T) {
|
||||||
|
cfg := DefaultConfig()
|
||||||
|
handler := Middleware(cfg, func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handler(rec, secureRequest(http.MethodGet, "https://example.test/"))
|
||||||
|
|
||||||
|
if missing := CheckCoverage(rec.Header()); len(missing) != 0 {
|
||||||
|
t.Fatalf("erwartet vollstaendige header-abdeckung, fehlen: %v", missing)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 1 (Kehrseite): CheckCoverage erkennt fehlende Header
|
||||||
|
// zuverlaessig — Voraussetzung dafuer, dass ein automatisierter Scan
|
||||||
|
// gegen ein Modul-Frontend OHNE eingebundene Middleware ueberhaupt etwas
|
||||||
|
// meldet.
|
||||||
|
func TestCheckCoverage_DetectsMissingHeadersOnBareHandler(t *testing.T) {
|
||||||
|
bareHandler := func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }
|
||||||
|
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
bareHandler(rec, httptest.NewRequest(http.MethodGet, "/", nil))
|
||||||
|
|
||||||
|
missing := CheckCoverage(rec.Header())
|
||||||
|
if len(missing) != len(RequiredHeaders) {
|
||||||
|
t.Fatalf("erwartet %d fehlende header bei unbehandeltem handler, habe %d: %v",
|
||||||
|
len(RequiredHeaders), len(missing), missing)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 3: ein Aufruf ueber (simuliertes) HTTP
|
||||||
|
// wird server-seitig auf HTTPS umgeleitet, statt sich allein auf den
|
||||||
|
// HSTS-Browser-Cache zu verlassen (der erst nach dem ersten sicheren
|
||||||
|
// Aufruf greift).
|
||||||
|
func TestMiddleware_RedirectsInsecureRequestToHTTPS(t *testing.T) {
|
||||||
|
cfg := DefaultConfig()
|
||||||
|
called := false
|
||||||
|
handler := Middleware(cfg, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
called = true
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "http://example.test/pfad?x=1", nil)
|
||||||
|
// Kein X-Forwarded-Proto, kein r.TLS -> unsicherer Aufruf.
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handler(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusMovedPermanently {
|
||||||
|
t.Fatalf("status = %d, want 301 (redirect auf https)", rec.Code)
|
||||||
|
}
|
||||||
|
location := rec.Header().Get("Location")
|
||||||
|
if !strings.HasPrefix(location, "https://") {
|
||||||
|
t.Fatalf("location = %q, want https://-praefix", location)
|
||||||
|
}
|
||||||
|
if !strings.Contains(location, "/pfad?x=1") {
|
||||||
|
t.Fatalf("location = %q, erwartet erhaltenen pfad+query", location)
|
||||||
|
}
|
||||||
|
if called {
|
||||||
|
t.Fatal("eigentlicher handler haette bei unsicherem aufruf nicht erreicht werden duerfen")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS login_attempts;
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
-- Account-Lockout & Login-Rate-Limiting (IAM-07, siehe
|
|
||||||
-- core-kanban/tickets/IAM-07.md). Geteilter, externer Zustand in Postgres —
|
|
||||||
-- kein In-Process-Zaehler (bekannter Fehler aus archivdms
|
|
||||||
-- internal/auth/ratelimit.go), gilt korrekt ueber mehrere Core-Instanzen.
|
|
||||||
CREATE TABLE login_attempts (
|
|
||||||
email TEXT PRIMARY KEY,
|
|
||||||
failed_count INT NOT NULL DEFAULT 0,
|
|
||||||
locked_until TIMESTAMPTZ,
|
|
||||||
last_attempt_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