Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fcd8f92af | ||
|
|
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,158 @@
|
|||||||
|
// Package mtls implementiert Core API-09: gegenseitige TLS-Authentifizierung
|
||||||
|
// zwischen Core/DMS/Mail/Archive/Workflow/AI/Connect-Instanzen fuer
|
||||||
|
// Stufe-2/3-Installationen (siehe SKALIERUNGSKONZEPT.md) — schuetzt die
|
||||||
|
// VERTRAULICHKEIT des Transportwegs, dort wo API-05 (asymmetrische
|
||||||
|
// JWT-Signatur) und API-02 (Service-Credential) nur Authentizitaet/
|
||||||
|
// Integritaet, aber keine Transportverschluesselung zwischen getrennten
|
||||||
|
// Hosts absichern.
|
||||||
|
//
|
||||||
|
// Zertifikatsverteilung (Akzeptanzkriterium 1): Authority.IssueCert liefert
|
||||||
|
// PEM-kodiertes Zertifikat + privaten Schluessel, die ueber denselben Weg
|
||||||
|
// wie andere Secrets verteilt werden (Umgebungsvariablen/Secret-Store,
|
||||||
|
// niemals im Code) — automatisierbar, da IssueCert ein reiner
|
||||||
|
// Funktionsaufruf ohne manuelle Schritte ist.
|
||||||
|
package mtls
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ed25519"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
|
"crypto/x509/pkix"
|
||||||
|
"encoding/pem"
|
||||||
|
"fmt"
|
||||||
|
"math/big"
|
||||||
|
"net"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Authority ist eine interne Zertifizierungsstelle fuer Modul-zu-Modul-
|
||||||
|
// mTLS. Haelt — analog zu internal/moduletrust.KeyManager (API-05) — ALLE
|
||||||
|
// noch gueltigen historischen CA-Zertifikate im Vertrauensspeicher, damit
|
||||||
|
// eine Rotation bereits ausgestellte Leaf-Zertifikate nicht ungueltig macht
|
||||||
|
// (Akzeptanzkriterium 3: Rotation ohne Ausfallzeit).
|
||||||
|
type Authority struct {
|
||||||
|
current caGeneration
|
||||||
|
trustPool *x509.CertPool
|
||||||
|
generations []caGeneration
|
||||||
|
}
|
||||||
|
|
||||||
|
type caGeneration struct {
|
||||||
|
cert *x509.Certificate
|
||||||
|
key ed25519.PrivateKey
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewAuthority erzeugt eine frische interne CA.
|
||||||
|
func NewAuthority() (*Authority, error) {
|
||||||
|
gen, err := newCAGeneration()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
pool := x509.NewCertPool()
|
||||||
|
pool.AddCert(gen.cert)
|
||||||
|
return &Authority{current: gen, trustPool: pool, generations: []caGeneration{gen}}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newCAGeneration() (caGeneration, error) {
|
||||||
|
pub, priv, err := ed25519.GenerateKey(rand.Reader)
|
||||||
|
if err != nil {
|
||||||
|
return caGeneration{}, fmt.Errorf("ca-schluesselpaar erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
serial, err := rand.Int(rand.Reader, big.NewInt(1<<62))
|
||||||
|
if err != nil {
|
||||||
|
return caGeneration{}, fmt.Errorf("seriennummer erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
template := &x509.Certificate{
|
||||||
|
SerialNumber: serial,
|
||||||
|
Subject: pkix.Name{CommonName: "nexarch-internal-ca"},
|
||||||
|
NotBefore: time.Now().Add(-time.Minute),
|
||||||
|
NotAfter: time.Now().Add(5 * 365 * 24 * time.Hour),
|
||||||
|
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
||||||
|
BasicConstraintsValid: true,
|
||||||
|
IsCA: true,
|
||||||
|
}
|
||||||
|
der, err := x509.CreateCertificate(rand.Reader, template, template, pub, priv)
|
||||||
|
if err != nil {
|
||||||
|
return caGeneration{}, fmt.Errorf("ca-zertifikat erstellen: %w", err)
|
||||||
|
}
|
||||||
|
cert, err := x509.ParseCertificate(der)
|
||||||
|
if err != nil {
|
||||||
|
return caGeneration{}, fmt.Errorf("ca-zertifikat parsen: %w", err)
|
||||||
|
}
|
||||||
|
return caGeneration{cert: cert, key: priv}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rotate erzeugt eine NEUE CA-Generation fuer zukuenftige IssueCert-Aufrufe,
|
||||||
|
// behaelt aber ALLE bisherigen CA-Zertifikate im Vertrauensspeicher —
|
||||||
|
// bereits ausgestellte Leaf-Zertifikate bleiben dadurch gueltig, eine
|
||||||
|
// laufende mTLS-Verbindung wird durch Rotate NICHT unterbrochen
|
||||||
|
// (Akzeptanzkriterium 3 / Pruefung 2).
|
||||||
|
func (a *Authority) Rotate() error {
|
||||||
|
gen, err := newCAGeneration()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.trustPool.AddCert(gen.cert)
|
||||||
|
a.generations = append(a.generations, gen)
|
||||||
|
a.current = gen
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TrustPool liefert den Vertrauensspeicher mit ALLEN (auch historischen,
|
||||||
|
// noch nicht abgelaufenen) CA-Zertifikaten — Grundlage der
|
||||||
|
// Server-seitigen Client-Zertifikatspruefung (Akzeptanzkriterium 2).
|
||||||
|
func (a *Authority) TrustPool() *x509.CertPool {
|
||||||
|
return a.trustPool
|
||||||
|
}
|
||||||
|
|
||||||
|
// IssuedCert ist ein ausgestelltes Leaf-Zertifikat inklusive privatem
|
||||||
|
// Schluessel, PEM-kodiert zur Verteilung (Akzeptanzkriterium 1).
|
||||||
|
type IssuedCert struct {
|
||||||
|
CertPEM []byte
|
||||||
|
KeyPEM []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
// IssueCert stellt ein Leaf-Zertifikat fuer EINE Modul-Instanz aus, signiert
|
||||||
|
// mit der AKTUELLEN CA-Generation (Akzeptanzkriterium 1).
|
||||||
|
func (a *Authority) IssueCert(commonName string, validity time.Duration) (IssuedCert, error) {
|
||||||
|
pub, priv, err := ed25519.GenerateKey(rand.Reader)
|
||||||
|
if err != nil {
|
||||||
|
return IssuedCert{}, fmt.Errorf("leaf-schluesselpaar erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
serial, err := rand.Int(rand.Reader, big.NewInt(1<<62))
|
||||||
|
if err != nil {
|
||||||
|
return IssuedCert{}, fmt.Errorf("seriennummer erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
template := &x509.Certificate{
|
||||||
|
SerialNumber: serial,
|
||||||
|
Subject: pkix.Name{CommonName: commonName},
|
||||||
|
NotBefore: time.Now().Add(-time.Minute),
|
||||||
|
NotAfter: time.Now().Add(validity),
|
||||||
|
KeyUsage: x509.KeyUsageDigitalSignature,
|
||||||
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
|
||||||
|
// DNSNames/IPAddresses decken lokale Testumgebungen ab (127.0.0.1,
|
||||||
|
// localhost) — in echten Stufe-2/3-Installationen entspricht
|
||||||
|
// commonName dem tatsaechlichen internen Hostnamen der Instanz.
|
||||||
|
DNSNames: []string{commonName, "localhost"},
|
||||||
|
IPAddresses: []net.IP{net.IPv4(127, 0, 0, 1), net.IPv6loopback},
|
||||||
|
}
|
||||||
|
der, err := x509.CreateCertificate(rand.Reader, template, a.current.cert, pub, a.current.key)
|
||||||
|
if err != nil {
|
||||||
|
return IssuedCert{}, fmt.Errorf("leaf-zertifikat erstellen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
|
||||||
|
keyBytes, err := x509.MarshalPKCS8PrivateKey(priv)
|
||||||
|
if err != nil {
|
||||||
|
return IssuedCert{}, fmt.Errorf("leaf-schluessel serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
keyPEM := pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: keyBytes})
|
||||||
|
|
||||||
|
return IssuedCert{CertPEM: certPEM, KeyPEM: keyPEM}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TLSCertificate wandelt ein IssuedCert in ein tls.Certificate um, wie es
|
||||||
|
// tls.Config.Certificates erwartet.
|
||||||
|
func (c IssuedCert) TLSCertificate() (tls.Certificate, error) {
|
||||||
|
return tls.X509KeyPair(c.CertPEM, c.KeyPEM)
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package mtls
|
||||||
|
|
||||||
|
import "crypto/tls"
|
||||||
|
|
||||||
|
// Mode legt fest, ob mTLS erzwungen wird. Fuer Stufe-1-Einzel-LXC ist mTLS
|
||||||
|
// laut Ticket "optional/nicht zwingend" (lokale Kommunikation) — ModeOff
|
||||||
|
// liefert einen ganz normalen TLS-Server OHNE Client-Zertifikatspruefung,
|
||||||
|
// damit Stufe-1-Betrieb unveraendert weiterlaeuft (Akzeptanzkriterium 3 /
|
||||||
|
// Pruefung 3).
|
||||||
|
type Mode string
|
||||||
|
|
||||||
|
const (
|
||||||
|
ModeOff Mode = "off" // Stufe 1: kein mTLS-Zwang
|
||||||
|
ModeRequired Mode = "required" // Stufe 2/3: Client-Zertifikat zwingend
|
||||||
|
)
|
||||||
|
|
||||||
|
// ServerTLSConfig liefert die tls.Config fuer eine Modul-Instanz, die
|
||||||
|
// eingehende Verbindungen ANDERER Modul-Instanzen annimmt.
|
||||||
|
//
|
||||||
|
// - ModeRequired: verlangt UND verifiziert ein Client-Zertifikat gegen
|
||||||
|
// authority.TrustPool() (Akzeptanzkriterium 2) — eine Verbindung ohne
|
||||||
|
// gueltiges Zertifikat wird vom TLS-Handshake selbst abgelehnt, bevor
|
||||||
|
// irgendein Anwendungscode erreicht wird.
|
||||||
|
// - ModeOff: normales TLS ohne Client-Zertifikatspruefung
|
||||||
|
// (Akzeptanzkriterium 3 / Pruefung 3: Stufe-1-Betrieb funktioniert
|
||||||
|
// weiterhin ohne mTLS-Zwang).
|
||||||
|
func ServerTLSConfig(mode Mode, serverCert tls.Certificate, authority *Authority) *tls.Config {
|
||||||
|
cfg := &tls.Config{Certificates: []tls.Certificate{serverCert}}
|
||||||
|
if mode == ModeRequired {
|
||||||
|
cfg.ClientAuth = tls.RequireAndVerifyClientCert
|
||||||
|
cfg.ClientCAs = authority.TrustPool()
|
||||||
|
}
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientTLSConfig liefert die tls.Config fuer eine Modul-Instanz, die eine
|
||||||
|
// Verbindung zu einer ANDEREN Modul-Instanz aufbaut — praesentiert das
|
||||||
|
// eigene Zertifikat und vertraut Gegenstellen, die von derselben Authority
|
||||||
|
// signiert wurden.
|
||||||
|
func ClientTLSConfig(mode Mode, clientCert tls.Certificate, authority *Authority) *tls.Config {
|
||||||
|
cfg := &tls.Config{RootCAs: authority.TrustPool()}
|
||||||
|
if mode == ModeRequired {
|
||||||
|
cfg.Certificates = []tls.Certificate{clientCert}
|
||||||
|
}
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
package mtls
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/tls"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newTLSServer(t *testing.T, cfg *tls.Config) *httptest.Server {
|
||||||
|
t.Helper()
|
||||||
|
server := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_, _ = w.Write([]byte("ok"))
|
||||||
|
}))
|
||||||
|
server.TLS = cfg
|
||||||
|
server.StartTLS()
|
||||||
|
return server
|
||||||
|
}
|
||||||
|
|
||||||
|
func fetch(t *testing.T, url string, clientCfg *tls.Config) (int, error) {
|
||||||
|
t.Helper()
|
||||||
|
client := &http.Client{
|
||||||
|
Transport: &http.Transport{TLSClientConfig: clientCfg},
|
||||||
|
Timeout: 3 * time.Second,
|
||||||
|
}
|
||||||
|
resp, err := client.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
_, _ = io.ReadAll(resp.Body)
|
||||||
|
return resp.StatusCode, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Zertifikatsverteilung ist ein reiner
|
||||||
|
// Funktionsaufruf, das Ergebnis ist gueltiges, wiederverwendbares
|
||||||
|
// PEM-Material.
|
||||||
|
func TestIssueCert_ProducesValidPEMRoundTrip(t *testing.T) {
|
||||||
|
authority, err := NewAuthority()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("newauthority: %v", err)
|
||||||
|
}
|
||||||
|
issued, err := authority.IssueCert("dms", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issuecert: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := issued.TLSCertificate(); err != nil {
|
||||||
|
t.Fatalf("ausgestelltes zertifikat nicht als tls.Certificate ladbar: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: eine Verbindung ohne gueltiges
|
||||||
|
// Client-Zertifikat wird abgelehnt, eine mit gueltigem angenommen.
|
||||||
|
func TestServerTLSConfig_RejectsMissingClientCert(t *testing.T) {
|
||||||
|
authority, err := NewAuthority()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("newauthority: %v", err)
|
||||||
|
}
|
||||||
|
serverIssued, err := authority.IssueCert("core", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
serverCert, err := serverIssued.TLSCertificate()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat laden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
server := newTLSServer(t, ServerTLSConfig(ModeRequired, serverCert, authority))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
// Client OHNE Zertifikat, aber mit korrektem RootCA-Vertrauen fuer den
|
||||||
|
// Server — der Handshake muss trotzdem an der fehlenden Client-Auth
|
||||||
|
// scheitern.
|
||||||
|
_, err = fetch(t, server.URL, &tls.Config{RootCAs: authority.TrustPool()})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("erwartet fehlschlagenden handshake ohne client-zertifikat")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientIssued, err := authority.IssueCert("mail", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("client-zertifikat ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
clientCert, err := clientIssued.TLSCertificate()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("client-zertifikat laden: %v", err)
|
||||||
|
}
|
||||||
|
status, err := fetch(t, server.URL, ClientTLSConfig(ModeRequired, clientCert, authority))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("erwartet erfolgreiche verbindung mit gueltigem client-zertifikat: %v", err)
|
||||||
|
}
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Rotation der CA unterbricht laufenden
|
||||||
|
// Betrieb nicht — ein VOR der Rotation ausgestelltes Leaf-Zertifikat
|
||||||
|
// funktioniert danach weiter, UND ein NACH der Rotation neu ausgestelltes
|
||||||
|
// funktioniert ebenfalls, gegen denselben, weiterlaufenden Server (kein
|
||||||
|
// Neustart noetig, da TrustPool() denselben *x509.CertPool zurueckliefert,
|
||||||
|
// den Rotate() erweitert).
|
||||||
|
func TestAuthority_RotateWithoutDowntime(t *testing.T) {
|
||||||
|
authority, err := NewAuthority()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("newauthority: %v", err)
|
||||||
|
}
|
||||||
|
serverIssued, err := authority.IssueCert("core", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
serverCert, err := serverIssued.TLSCertificate()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat laden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
server := newTLSServer(t, ServerTLSConfig(ModeRequired, serverCert, authority))
|
||||||
|
defer server.Close() // EIN Server-Prozess ueber die gesamte Rotation hinweg — kein Neustart.
|
||||||
|
|
||||||
|
preRotationIssued, err := authority.IssueCert("dms", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("client-zertifikat (vor rotation) ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
preRotationCert, _ := preRotationIssued.TLSCertificate()
|
||||||
|
|
||||||
|
if err := authority.Rotate(); err != nil {
|
||||||
|
t.Fatalf("rotate: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// VOR der Rotation ausgestelltes Zertifikat funktioniert WEITERHIN, ohne
|
||||||
|
// dass der Server neu gestartet wurde.
|
||||||
|
status, err := fetch(t, server.URL, ClientTLSConfig(ModeRequired, preRotationCert, authority))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("vor-rotation-zertifikat haette weiterhin funktionieren sollen: %v", err)
|
||||||
|
}
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200 (vor-rotation-zertifikat)", status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NACH der Rotation neu ausgestelltes Zertifikat funktioniert ebenfalls,
|
||||||
|
// gegen DENSELBEN laufenden Server.
|
||||||
|
postRotationIssued, err := authority.IssueCert("mail", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("client-zertifikat (nach rotation) ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
postRotationCert, _ := postRotationIssued.TLSCertificate()
|
||||||
|
|
||||||
|
status, err = fetch(t, server.URL, ClientTLSConfig(ModeRequired, postRotationCert, authority))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("nach-rotation-zertifikat haette funktionieren sollen: %v", err)
|
||||||
|
}
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200 (nach-rotation-zertifikat)", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Stufe-1-Betrieb (ModeOff) funktioniert
|
||||||
|
// weiterhin OHNE mTLS-Zwang — ein Client ganz ohne Zertifikat kommt durch.
|
||||||
|
func TestServerTLSConfig_ModeOffWorksWithoutClientCert(t *testing.T) {
|
||||||
|
authority, err := NewAuthority()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("newauthority: %v", err)
|
||||||
|
}
|
||||||
|
serverIssued, err := authority.IssueCert("core", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
serverCert, err := serverIssued.TLSCertificate()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("server-zertifikat laden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
server := newTLSServer(t, ServerTLSConfig(ModeOff, serverCert, authority))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
status, err := fetch(t, server.URL, ClientTLSConfig(ModeOff, tls.Certificate{}, authority))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("stufe-1-betrieb (ModeOff) haette ohne client-zertifikat funktionieren sollen: %v", err)
|
||||||
|
}
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
Executable
+16
@@ -0,0 +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."
|
||||||
Executable
+18
@@ -0,0 +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