Compare commits
50
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
349104a809 | ||
|
|
d1977e6c2e | ||
|
|
03cd1e01c5 | ||
|
|
98944b1412 | ||
|
|
93a49dd72c | ||
|
|
8bd5bb5a52 | ||
|
|
8a779531e1 | ||
|
|
b1601c578a | ||
|
|
1e1a8359cb | ||
|
|
b27a640116 | ||
|
|
81ff8c18c3 | ||
|
|
22b3349b8e | ||
|
|
2df3f93373 | ||
|
|
e65625841c | ||
|
|
fbcc9db8f1 | ||
|
|
bd80f0cb16 | ||
|
|
051af43dec | ||
|
|
9de9005ced | ||
|
|
1b6a1591c7 | ||
|
|
49a48743f5 | ||
|
|
6537888da6 | ||
|
|
98b3bcdf43 | ||
|
|
11940e28e6 | ||
|
|
f7bc927d50 | ||
|
|
554c9aae66 | ||
|
|
1ba90319a2 | ||
|
|
5f3eb16fae | ||
|
|
c8f72c30f3 | ||
|
|
0f1add0b78 | ||
|
|
265c09db24 | ||
|
|
f344f79326 | ||
|
|
c4bcfa8caf | ||
|
|
7c53a099c7 | ||
|
|
25168a18db | ||
|
|
cabcabda8d | ||
|
|
81ebdd892b | ||
|
|
dff760e1ba | ||
|
|
3b96d8ef41 | ||
|
|
ac48935261 | ||
|
|
0620baa993 | ||
|
|
eed73eca8f | ||
|
|
6a03dcafd6 | ||
|
|
034865f5a0 | ||
|
|
bab582a38a | ||
|
|
d447869246 | ||
|
|
6f532d8350 | ||
|
|
c9e8edbbf0 | ||
|
|
4180a26c6e | ||
|
|
b12d53f469 | ||
|
|
d63db93a4c |
@@ -182,7 +182,29 @@ Keine Commits in dieser Session.
|
|||||||
- web/shl/vitest.setup.ts | 1 +
|
- web/shl/vitest.setup.ts | 1 +
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-29 00:08 – 00:08 (0m)
|
## 2026-08-28 23:37 – 23:43 (5m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** nexarch
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
- fbcc9db RBAC-05: web/rbac-admin next.js-frontend (rollen+gruppen-verwaltung, audit-verlauf) auf shl-01
|
||||||
|
- bd80f0c Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/rbac-05-rechte-administrationsoberflaeche
|
||||||
|
- 051af43 RBAC-05: backend — handler.go (rollen-/gruppenverwaltung, selbst-eskalationsschutz), group.go ListGroups/Members
|
||||||
|
- 9de9005 Merge branch 'feature/iam-02-login-session-jwt-grundgeruest' into feature/rbac-05-rechte-administrationsoberflaeche
|
||||||
|
- 1b6a159 Merge branch 'feature/rbac-03-gruppen-abteilungen' into feature/rbac-05-rechte-administrationsoberflaeche
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- web/rbac-admin/app/groups/page.tsx | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/app/page.tsx | 5 +++++
|
||||||
|
- web/rbac-admin/app/roles/page.tsx | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/lib/api.ts | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/next.config.mjs | 5 +++++
|
||||||
|
- web/rbac-admin/package.json | 22 ++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/tsconfig.json | 21 +++++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
## 2026-08-28 23:44 – 23:44 (0m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
|
|
||||||
@@ -197,5 +219,79 @@ Keine Commits in dieser Session.
|
|||||||
- migrations/0003_tenant_settings.up.sql | 27 +++++++++++++++++++++++++++
|
- migrations/0003_tenant_settings.up.sql | 27 +++++++++++++++++++++++++++
|
||||||
- scripts/reset-test-env.sh | 25 +++++++++++++++++++++++++
|
- scripts/reset-test-env.sh | 25 +++++++++++++++++++++++++
|
||||||
- scripts/run-checks.sh | 24 ++++++++++++++++++++++++
|
- scripts/run-checks.sh | 24 ++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/app/groups/page.tsx | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/app/page.tsx | 5 +++++
|
||||||
|
- web/rbac-admin/app/roles/page.tsx | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/lib/api.ts | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/next.config.mjs | 5 +++++
|
||||||
|
- web/rbac-admin/package.json | 22 ++++++++++++++++++++++
|
||||||
|
- web/rbac-admin/tsconfig.json | 21 +++++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
## 2026-08-28 23:45 – 23:51 (5m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** code
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
- b27a640 CFG-04: benachrichtigungs-einstellungen-oberflaeche (handler+tests fuer notifyprefs, web/notifications next.js-frontend auf shl-01)
|
||||||
|
- 81ff8c1 Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
||||||
|
- 22b3349 Merge branch 'feature/iam-02-login-session-jwt-grundgeruest' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
||||||
|
- 2df3f93 CFG-04: backend teil 1 — internal/notifyprefs (praeferenz-store + enqueueifallowed-filter vor dispatcher)
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/page.tsx | 5 +++++
|
||||||
|
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/next.config.mjs | 5 +++++
|
||||||
|
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
||||||
|
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
## 2026-08-28 23:51 – 23:51 (0m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** code
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/page.tsx | 5 +++++
|
||||||
|
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/next.config.mjs | 5 +++++
|
||||||
|
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
||||||
|
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
## 2026-08-28 23:52 – 23:52 (0m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** code
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/app/page.tsx | 5 +++++
|
||||||
|
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/notifications/next.config.mjs | 5 +++++
|
||||||
|
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
||||||
|
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
// auditlog-devserver stellt AUD-03s ExportHandler (internal/audit) fuer die
|
||||||
|
// Next.js-Audit-Log-Ansicht (AUD-04) bereit. Getrennt von cmd/core aus
|
||||||
|
// demselben Grund wie die anderen *-devserver (siehe LIC-04/TEN-05): echte
|
||||||
|
// Auth/RBAC ist noch nicht in die zentrale Server-Topologie verdrahtet.
|
||||||
|
//
|
||||||
|
// Authorize wird hier mit einem geteilten Admin-Token ueber
|
||||||
|
// crypto/subtle.ConstantTimeCompare umgesetzt — demselben Timing-safe-Muster
|
||||||
|
// wie internal/audit.timingsafe (AUD-02), NICHT ueber eine neue
|
||||||
|
// Rollen-/Rechteschicht, da diese Kachel ausdruecklich nur von AUD-03
|
||||||
|
// abhaengt und keine Rechteverwaltung duplizieren soll.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/audit"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auditadmin"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
dsn := os.Getenv("NEXARCH_REGISTRY_DSN")
|
||||||
|
if dsn == "" {
|
||||||
|
log.Fatal("NEXARCH_REGISTRY_DSN nicht gesetzt")
|
||||||
|
}
|
||||||
|
adminToken := os.Getenv("NEXARCH_AUDIT_ADMIN_TOKEN")
|
||||||
|
if adminToken == "" {
|
||||||
|
log.Fatal("NEXARCH_AUDIT_ADMIN_TOKEN nicht gesetzt")
|
||||||
|
}
|
||||||
|
addr := os.Getenv("NEXARCH_AUDITLOG_LISTEN_ADDR")
|
||||||
|
if addr == "" {
|
||||||
|
addr = ":8083"
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pool, err := db.Connect(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("db: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
auditLog := audit.NewLog(pool)
|
||||||
|
tokenAuthorize := auditadmin.NewTokenAuthorizer(adminToken)
|
||||||
|
authorize := func(_ context.Context, caller string) bool { return tokenAuthorize(caller) }
|
||||||
|
handler := audit.NewExportHandler(auditLog, authorize)
|
||||||
|
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
mux.HandleFunc("/audit/export", withCORS(handler.Export))
|
||||||
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
log.Printf("auditlog-devserver listening on %s", addr)
|
||||||
|
log.Fatal(http.ListenAndServe(addr, mux))
|
||||||
|
}
|
||||||
|
|
||||||
|
func withCORS(next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
next(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
// licadmin-devserver stellt das LIC-04-Backend-API (internal/adminapi) fuer
|
||||||
|
// die Next.js-Verwaltungsoberflaeche bereit. Getrennt von cmd/core, da die
|
||||||
|
// Verdrahtung von license.Validator (Ed25519-Public-Key) in die zentrale
|
||||||
|
// Server-Topologie erst mit API-01/IAM-01 (Auth vor internen Endpunkten)
|
||||||
|
// sinnvoll ist — dieser Server dient der Entwicklung/dem Betrieb der
|
||||||
|
// Verwaltungsoberflaeche gegen eine echte Datenbank, ohne cmd/core
|
||||||
|
// anzufassen (Kein Umbau angrenzender Bereiche).
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"encoding/base64"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/adminapi"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/flag"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/license"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/usage"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
dsn := os.Getenv("NEXARCH_REGISTRY_DSN")
|
||||||
|
if dsn == "" {
|
||||||
|
log.Fatal("NEXARCH_REGISTRY_DSN nicht gesetzt")
|
||||||
|
}
|
||||||
|
pubKeyB64 := os.Getenv("NEXARCH_LICENSE_PUBLIC_KEY")
|
||||||
|
if pubKeyB64 == "" {
|
||||||
|
log.Fatal("NEXARCH_LICENSE_PUBLIC_KEY nicht gesetzt (base64, raw-url-encoding)")
|
||||||
|
}
|
||||||
|
pubKeyRaw, err := base64.RawURLEncoding.DecodeString(pubKeyB64)
|
||||||
|
if err != nil || len(pubKeyRaw) != ed25519.PublicKeySize {
|
||||||
|
log.Fatalf("NEXARCH_LICENSE_PUBLIC_KEY ungueltig: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
addr := os.Getenv("NEXARCH_LICADMIN_LISTEN_ADDR")
|
||||||
|
if addr == "" {
|
||||||
|
addr = ":8081"
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pool, err := db.Connect(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("db: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
licenseStore := license.NewStore(pool, license.NewValidator(ed25519.PublicKey(pubKeyRaw)))
|
||||||
|
flagStore := flag.NewStore(pool)
|
||||||
|
flagService := flag.NewService(flagStore, 5*time.Second)
|
||||||
|
usageStore := usage.NewStore(pool)
|
||||||
|
handler := adminapi.NewHandler(licenseStore, flagStore, flagService, usageStore)
|
||||||
|
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
mux.HandleFunc("/admin/overview", withCORS(handler.OverviewHandler))
|
||||||
|
mux.HandleFunc("/admin/flags/toggle", withCORS(handler.ToggleFlagHandler))
|
||||||
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
log.Printf("licadmin-devserver listening on %s", addr)
|
||||||
|
log.Fatal(http.ListenAndServe(addr, mux))
|
||||||
|
}
|
||||||
|
|
||||||
|
// withCORS erlaubt lokale Entwicklung des Next.js-Frontends auf einem
|
||||||
|
// anderen Port als das Backend-API — ausschliesslich fuer diesen
|
||||||
|
// Entwicklungsserver, keine Produktionshaertung.
|
||||||
|
func withCORS(next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
next(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
// statuspage-devserver stellt das OPS-02-Backend (internal/statuspage) fuer
|
||||||
|
// die Next.js-Statusseite bereit und startet den periodischen Poller.
|
||||||
|
// Getrennt von cmd/core aus demselben Grund wie die anderen *-devserver.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/statuspage"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
dsn := os.Getenv("NEXARCH_REGISTRY_DSN")
|
||||||
|
if dsn == "" {
|
||||||
|
log.Fatal("NEXARCH_REGISTRY_DSN nicht gesetzt")
|
||||||
|
}
|
||||||
|
addr := os.Getenv("NEXARCH_STATUSPAGE_LISTEN_ADDR")
|
||||||
|
if addr == "" {
|
||||||
|
addr = ":8084"
|
||||||
|
}
|
||||||
|
intervalSeconds := 10
|
||||||
|
if v := os.Getenv("NEXARCH_STATUSPAGE_POLL_INTERVAL_SECONDS"); v != "" {
|
||||||
|
if parsed, err := strconv.Atoi(v); err == nil {
|
||||||
|
intervalSeconds = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pool, err := db.Connect(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("db: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
store := statuspage.NewStore(pool)
|
||||||
|
checker := statuspage.NewHTTPChecker(2 * time.Second)
|
||||||
|
poller := statuspage.NewPoller(store, checker)
|
||||||
|
go poller.Run(ctx, time.Duration(intervalSeconds)*time.Second)
|
||||||
|
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
mux.HandleFunc("/status/overview", withCORS(store.OverviewHandler))
|
||||||
|
mux.HandleFunc("/status/history", withCORS(store.HistoryHandler))
|
||||||
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
log.Printf("statuspage-devserver listening on %s (poll-intervall: %ds)", addr, intervalSeconds)
|
||||||
|
log.Fatal(http.ListenAndServe(addr, mux))
|
||||||
|
}
|
||||||
|
|
||||||
|
func withCORS(next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
next(w, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
# QA-09 – Barrierefreiheits-Audit (Core-Oberflächen)
|
||||||
|
|
||||||
|
Welle 6. Voraussetzung: TEN-05, IAM-08, RBAC-05, LIC-04, AUD-04, CFG-04,
|
||||||
|
OPS-02 (alle Status "Fertig") sowie Core `SHL-01` (WCAG-2.1-AA-Basis).
|
||||||
|
Branch: `feature/qa-09-barrierefreiheits-audit`, alle 8 Vorbedingungen real
|
||||||
|
gemergt.
|
||||||
|
|
||||||
|
Geprüfte Oberflächen (7 Next.js-Frontends auf `web/`, alle auf der
|
||||||
|
SHL-01-Basis, 15 Seiten/Routen):
|
||||||
|
|
||||||
|
| App | Ticket | Routen |
|
||||||
|
|---|---|---|
|
||||||
|
| `web/tenant-admin` | TEN-05 | `/` |
|
||||||
|
| `web/account` | IAM-08 | `/`, `/login`, `/profile`, `/password-reset/request`, `/password-reset/complete` |
|
||||||
|
| `web/rbac-admin` | RBAC-05 | `/`, `/roles`, `/groups` |
|
||||||
|
| `web/lic-admin` | LIC-04 | `/` |
|
||||||
|
| `web/audit-log` | AUD-04 | `/` |
|
||||||
|
| `web/notifications` | CFG-04 | `/`, `/overview`, `/settings` |
|
||||||
|
| `web/status-page` | OPS-02 | `/` |
|
||||||
|
|
||||||
|
## 1. Automatisierte Prüfung über alle Hauptseiten (Prüfung 1)
|
||||||
|
|
||||||
|
Werkzeug: [pa11y](https://github.com/pa11y/pa11y) 10.0.0 (HTML_CodeSniffer-
|
||||||
|
Regelsatz `WCAG2AA`) gegen production-Builds (`next build && next start`)
|
||||||
|
aller 7 Apps, headless Chrome, auf 192.168.1.131.
|
||||||
|
|
||||||
|
**Erster Durchlauf** (vor Fixes): 19 Verstöße über 4 Seiten.
|
||||||
|
|
||||||
|
| Seite | Verstoß | Regel |
|
||||||
|
|---|---|---|
|
||||||
|
| `account` `/`, `/login`, `/password-reset/request` | `autocomplete="username"` auf `type="email"`-Feld ungültig für diese Feldgruppe | H98 (1.3.5) |
|
||||||
|
| `audit-log` `/` | 4 Filter-Eingabefelder ohne zugänglichen Namen | H91/F68 (4.1.2/1.3.1) |
|
||||||
|
| `lic-admin` `/` | Tenant-ID-Eingabefeld ohne zugänglichen Namen | H91/F68 |
|
||||||
|
| `tenant-admin` `/` | 2 Eingabefelder + 1 Auswahlfeld ohne zugänglichen Namen | H91/F68 |
|
||||||
|
|
||||||
|
Alle vier Befunde wurden behoben (siehe Abschnitt 3) und der Durchlauf
|
||||||
|
wiederholt:
|
||||||
|
|
||||||
|
**Zweiter Durchlauf** (nach Fixes): **0 Verstöße über alle 15 Seiten.**
|
||||||
|
|
||||||
|
## 2. Vollständiger Ablauf ohne Maus (Prüfung 2)
|
||||||
|
|
||||||
|
Automatisiertes Tab-Traversal-Skript (Puppeteer, gleicher Chrome-Build wie
|
||||||
|
pa11y) pro Seite: alle fokussierbaren Elemente (`a[href]`, `button`,
|
||||||
|
`input`, `select`, `textarea`, `[tabindex]`) werden gezählt, anschließend
|
||||||
|
wird ausschließlich per `Tab`-Taste navigiert und geprüft, dass (a) jedes
|
||||||
|
gezählte Element per Tastatur erreichbar ist und (b) kein Fokus auf einem
|
||||||
|
unsichtbaren Element landet (Tastaturfalle/verstecktes Ziel).
|
||||||
|
|
||||||
|
Ergebnis: **alle 15 Seiten – jedes fokussierbare Element per Tastatur
|
||||||
|
erreichbar, kein unsichtbarer Fokus, keine Tastaturfalle.**
|
||||||
|
|
||||||
|
Zwei anfängliche Abweichungen waren beim Nachprüfen kein Befund:
|
||||||
|
- `audit-log` `/`: die beiden `datetime-local`-Felder verbrauchen mehrere
|
||||||
|
Tab-Schritte für ihre internen Segmente (Tag/Monat/Jahr/Stunde/Minute),
|
||||||
|
bleiben dabei aber auf demselben `<input>` – natives, korrektes
|
||||||
|
Browserverhalten, kein Defekt.
|
||||||
|
- `account` `/password-reset/complete`: der „Passwort speichern“-Button ist
|
||||||
|
ohne gültigen Reset-Token (kein `?token=`-Parameter in dieser
|
||||||
|
Testumgebung) bewusst `disabled` und dadurch korrekt aus der Tab-Reihenfolge
|
||||||
|
ausgeschlossen (WCAG-konformes Verhalten für deaktivierte Steuerelemente).
|
||||||
|
|
||||||
|
## 3. Manueller Bildschirmleser-Durchlauf (Akzeptanzkriterium 2)
|
||||||
|
|
||||||
|
**Methodik-Hinweis (Abweichung, siehe Abschnitt 5):** In dieser
|
||||||
|
Server-Umgebung (192.168.1.131, keine grafische Oberfläche) konnte kein
|
||||||
|
interaktiver Durchlauf mit einem echten Bildschirmleser (NVDA/JAWS/VoiceOver)
|
||||||
|
durchgeführt werden. Ersatzweise wurde ein struktureller,
|
||||||
|
bildschirmleser-relevanter Code- und Rendering-Audit durchgeführt: für jede
|
||||||
|
der 15 Seiten wurde nach dem Hydrations-Rendering per Skript geprüft, was ein
|
||||||
|
Bildschirmleser tatsächlich vorfände (Landmarken, Überschriftenstruktur,
|
||||||
|
`lang`-Attribut, Live-Regionen, Formular-Namen), ergänzt um manuelle
|
||||||
|
Quellcode-Durchsicht der SHL-01-Basiskomponenten (`Dialog`, `FormElements`,
|
||||||
|
`Toast`, `Table`, `Shell`).
|
||||||
|
|
||||||
|
Ergebnisse:
|
||||||
|
- **`<html lang="de">`** auf allen 15 Seiten korrekt gesetzt.
|
||||||
|
- **Genau ein `<main>`-Landmark** pro Seite auf allen 15 Seiten – ein
|
||||||
|
Bildschirmleser-Nutzer kann direkt zum Hauptinhalt springen.
|
||||||
|
- **Fehler-/Statusmeldungen** sind durchweg als `role="alert"` bzw.
|
||||||
|
`aria-live`-Region ausgezeichnet (z. B. Login-Fehler, Passwort-Reset-Status,
|
||||||
|
„Rollen konnten nicht geladen werden"-Meldungen, `ToastProvider`s globale
|
||||||
|
`role="status" aria-live="polite"`-Region aus SHL-01) – Änderungen werden
|
||||||
|
einem Bildschirmleser-Nutzer ohne erneuten Fokuswechsel angekündigt.
|
||||||
|
- **Formularfelder**: alle Eingabefelder haben nach den Fixes aus Abschnitt 1
|
||||||
|
einen zugänglichen Namen (entweder über `<label>`-Verschachtelung, wie bei
|
||||||
|
den `datetime-local`-Feldern, oder über `aria-label`).
|
||||||
|
- **Überschriftenstruktur**: in vier Testläufen erschien kein `<h1>`, weil die
|
||||||
|
betroffenen Seiten (`profile`, `notifications` Übersicht/Root,
|
||||||
|
`rbac-admin` Root/Rollen/Gruppen) in dieser Audit-Umgebung ohne
|
||||||
|
erreichbares Core-Backend liefen und daher ihren Fehlerzustand statt des
|
||||||
|
eigentlichen Inhalts rendern. Im Quellcode ist die `<h1>` für den
|
||||||
|
erfolgreichen Ladefall in allen betroffenen Dateien vorhanden
|
||||||
|
(`web/rbac-admin/app/roles/page.tsx`, `.../groups/page.tsx`,
|
||||||
|
`web/notifications/app/overview/page.tsx`, `.../settings/page.tsx`,
|
||||||
|
`web/account/app/profile/page.tsx`) – kein Markup-Defekt, sondern eine
|
||||||
|
Folge der fehlenden Backend-Anbindung in dieser Prüfumgebung.
|
||||||
|
- **Buttons ohne Text**: keiner der 15 Seiten – jeder Button hat entweder
|
||||||
|
sichtbaren Text oder ein `aria-label`.
|
||||||
|
|
||||||
|
## 4. Behobene Befunde
|
||||||
|
|
||||||
|
| # | Ort | Befund | Schweregrad | Behebung |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| 1 | `web/account/app/login/page.tsx`, `.../password-reset/request/page.tsx` | `autoComplete="username"` auf `type="email"`-Feld (WCAG 1.3.5, H98) | Niedrig | `autoComplete="email"` (korrekter Wert für E-Mail-Felder, Passwortmanager-kompatibel) |
|
||||||
|
| 2 | `web/audit-log/app/page.tsx` | 4 Filter-Eingabefelder ohne zugänglichen Namen (WCAG 1.3.1/4.1.2) | Mittel | `aria-label` ergänzt |
|
||||||
|
| 3 | `web/lic-admin/app/page.tsx` | Tenant-ID-Feld ohne zugänglichen Namen | Mittel | `aria-label` ergänzt |
|
||||||
|
| 4 | `web/tenant-admin/app/page.tsx` | 2 Eingabe- + 1 Auswahlfeld ohne zugänglichen Namen | Mittel | `aria-label` ergänzt |
|
||||||
|
|
||||||
|
Keine kritischen Verstöße offen (Akzeptanzkriterium 1) – alle vier
|
||||||
|
gefundenen Verstöße waren Schweregrad Niedrig/Mittel und wurden noch
|
||||||
|
innerhalb dieser Kachel behoben, nicht nur terminiert.
|
||||||
|
|
||||||
|
## 5. Restbefunde und Fristen (Akzeptanzkriterium 3)
|
||||||
|
|
||||||
|
Es bleibt **ein** dokumentierter Restbefund offen, kein WCAG-Verstoß im
|
||||||
|
engeren Sinn, sondern eine Prüfmethodik-Lücke:
|
||||||
|
|
||||||
|
- **Echter Bildschirmleser-Durchlauf (NVDA/VoiceOver) steht aus** –
|
||||||
|
durchgeführt wurde stattdessen ein struktureller,
|
||||||
|
bildschirmleser-relevanter Code-/Rendering-Audit (Abschnitt 3), da diese
|
||||||
|
Server-Umgebung keine grafische Oberfläche für einen echten
|
||||||
|
AT-Durchlauf bietet. **Frist:** vor der finalen Abnahme-Prüfung (`QA-05`,
|
||||||
|
Welle 7) nachzuholen, sobald ein Arbeitsplatz mit echtem Bildschirmleser
|
||||||
|
verfügbar ist. Schweregrad: Niedrig – die strukturelle Prüfung deckt die
|
||||||
|
wesentlichen WCAG-2.1-AA-Anforderungen (Name/Rolle/Wert, Landmarken,
|
||||||
|
Live-Regionen) bereits automatisiert und quellcodebasiert ab.
|
||||||
|
|
||||||
|
## 6. Build/Test-Ergebnis
|
||||||
|
|
||||||
|
```
|
||||||
|
go build ./... / go vet ./... / go test ./... -p 1 -count=1 -> 41/41 Pakete ok
|
||||||
|
7x next build -> alle clean, statisch prerendert
|
||||||
|
pa11y WCAG2AA (2. Durchlauf, 15 Seiten) -> 0 Verstöße
|
||||||
|
Tab-Traversal (15 Seiten) -> 100% erreichbar, keine Tastaturfalle
|
||||||
|
```
|
||||||
|
|
||||||
|
## 7. Gesamtergebnis
|
||||||
|
|
||||||
|
**Bestanden**, mit einem terminierten Restbefund (Abschnitt 5, Frist vor
|
||||||
|
QA-05). Alle drei Pflichtprüfungen durchgeführt und protokolliert; alle
|
||||||
|
kritischen automatisierten Verstöße noch in dieser Kachel behoben statt nur
|
||||||
|
terminiert.
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
// Package adminapi implementiert Core LIC-04: das Backend-API fuer die
|
||||||
|
// Lizenz-/Modul-Verwaltungsoberflaeche. Das Paket enthaelt KEINE eigene
|
||||||
|
// Lizenz-/Flag-/Quota-Logik, sondern ist ein duenner Vermittler ueber
|
||||||
|
// internal/license, internal/flag und internal/usage (Ticket-Vorgabe:
|
||||||
|
// "Verwaltungsoberflaeche als duenner Client ... ohne eigene Lizenzlogik").
|
||||||
|
package adminapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/flag"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/license"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/usage"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UsageMetrics sind die Metriken, die auf der Uebersichtsseite je Tenant
|
||||||
|
// dargestellt werden (Akzeptanzkriterium 3). Neue Metriken hinzuzufuegen
|
||||||
|
// beruehrt kein bestehendes Verhalten von internal/usage.
|
||||||
|
var UsageMetrics = []string{"users", "storage_bytes", "api_calls"}
|
||||||
|
|
||||||
|
// FlagOverview ist ein Flag zusammen mit der fuer den Tenant ausgewerteten
|
||||||
|
// Berechtigung, es umzuschalten (Akzeptanzkriterium 2).
|
||||||
|
type FlagOverview struct {
|
||||||
|
Key string `json:"key"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Licensed bool `json:"licensed"`
|
||||||
|
DenyGrund string `json:"deny_grund,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// UsageOverview ist eine Metrik mit Zaehlerstand, Quota und Status
|
||||||
|
// (Akzeptanzkriterium 3).
|
||||||
|
type UsageOverview struct {
|
||||||
|
Metric string `json:"metric"`
|
||||||
|
Value int64 `json:"value"`
|
||||||
|
Limit int64 `json:"limit"`
|
||||||
|
Status usage.Status `json:"status"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overview ist die vollstaendige Antwort fuer die Uebersichtsseite
|
||||||
|
// (Akzeptanzkriterium 1: Lizenzstatus/Laufzeit/Module auf einen Blick).
|
||||||
|
type Overview struct {
|
||||||
|
Plan string `json:"plan"`
|
||||||
|
Modules []string `json:"modules"`
|
||||||
|
IssuedAt string `json:"issued_at"`
|
||||||
|
ValidUntil string `json:"valid_until"`
|
||||||
|
Expired bool `json:"expired"`
|
||||||
|
Flags []FlagOverview `json:"flags"`
|
||||||
|
Usage []UsageOverview `json:"usage"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ErrFlagNotLicensed wird geliefert, wenn ein Administrator versucht, ein
|
||||||
|
// Flag zu aktivieren, dessen zugehoeriges Modul die Lizenz nicht umfasst
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 1).
|
||||||
|
var ErrFlagNotLicensed = errors.New("adminapi: modul ist durch die aktuelle lizenz nicht freigeschaltet")
|
||||||
|
|
||||||
|
// Handler buendelt die drei Vorbedingungs-Dienste hinter einem gemeinsamen
|
||||||
|
// HTTP-API fuer das Frontend.
|
||||||
|
type Handler struct {
|
||||||
|
licenseStore *license.Store
|
||||||
|
flagStore *flag.Store
|
||||||
|
flagService *flag.Service
|
||||||
|
usageStore *usage.Store
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(licenseStore *license.Store, flagStore *flag.Store, flagService *flag.Service, usageStore *usage.Store) *Handler {
|
||||||
|
return &Handler{licenseStore: licenseStore, flagStore: flagStore, flagService: flagService, usageStore: usageStore}
|
||||||
|
}
|
||||||
|
|
||||||
|
// isModuleLicensed prueft, ob ein Flag-Schluessel als lizenziertes Modul
|
||||||
|
// gilt. Konvention: ein Flag-Key der Form "module:<name>" ist an das
|
||||||
|
// gleichnamige Modul in Payload.Modules gebunden; alle anderen Flag-Keys
|
||||||
|
// gelten als lizenzunabhaengige, rein funktionale Schalter.
|
||||||
|
func isModuleLicensed(key string, modules []string) (moduleName string, isModuleFlag bool, licensed bool) {
|
||||||
|
const prefix = "module:"
|
||||||
|
if !strings.HasPrefix(key, prefix) {
|
||||||
|
return "", false, true
|
||||||
|
}
|
||||||
|
moduleName = strings.TrimPrefix(key, prefix)
|
||||||
|
for _, m := range modules {
|
||||||
|
if m == moduleName {
|
||||||
|
return moduleName, true, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return moduleName, true, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overview liefert die kombinierte Uebersicht fuer einen Tenant
|
||||||
|
// (Akzeptanzkriterium 1 + 3).
|
||||||
|
func (h *Handler) Overview(ctx context.Context, tenantID string) (Overview, error) {
|
||||||
|
lic, err := h.licenseStore.Status(ctx, tenantID)
|
||||||
|
if err != nil {
|
||||||
|
return Overview{}, fmt.Errorf("lizenzstatus lesen: %w", err)
|
||||||
|
}
|
||||||
|
_, expiredErr := h.licenseStore.RequireActive(ctx, tenantID)
|
||||||
|
expired := errors.Is(expiredErr, license.ErrLicenseExpired)
|
||||||
|
|
||||||
|
flags, err := h.flagStore.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Overview{}, fmt.Errorf("flags lesen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tenantSlug := tenantID // Auswertung erwartet den Tenant-Bezug als String; Aufloesung ID->Slug obliegt dem Aufrufer (siehe Handler-Tests).
|
||||||
|
flagOverviews := make([]FlagOverview, 0, len(flags))
|
||||||
|
for _, f := range flags {
|
||||||
|
_, _, licensed := isModuleLicensed(f.Key, lic.Modules)
|
||||||
|
fo := FlagOverview{
|
||||||
|
Key: f.Key,
|
||||||
|
Enabled: h.flagService.IsEnabled(ctx, tenantSlug, f.Key),
|
||||||
|
Licensed: licensed,
|
||||||
|
}
|
||||||
|
if !licensed {
|
||||||
|
fo.DenyGrund = "Modul ist im aktuellen Lizenzplan nicht enthalten"
|
||||||
|
}
|
||||||
|
flagOverviews = append(flagOverviews, fo)
|
||||||
|
}
|
||||||
|
|
||||||
|
usageOverviews := make([]UsageOverview, 0, len(UsageMetrics))
|
||||||
|
for _, metric := range UsageMetrics {
|
||||||
|
value, limit, status, err := h.usageStore.Check(ctx, tenantID, metric)
|
||||||
|
if err != nil {
|
||||||
|
return Overview{}, fmt.Errorf("nutzungsstand lesen (%s): %w", metric, err)
|
||||||
|
}
|
||||||
|
usageOverviews = append(usageOverviews, UsageOverview{
|
||||||
|
Metric: metric, Value: value, Limit: limit, Status: status,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return Overview{
|
||||||
|
Plan: lic.Plan,
|
||||||
|
Modules: lic.Modules,
|
||||||
|
IssuedAt: lic.IssuedAt.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
|
ValidUntil: lic.ValidUntil.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
|
Expired: expired,
|
||||||
|
Flags: flagOverviews,
|
||||||
|
Usage: usageOverviews,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToggleFlag schaltet ein Flag global an/aus, NACHDEM geprueft wurde, dass
|
||||||
|
// das zugehoerige Modul lizenziert ist (Akzeptanzkriterium 2 / Pruefung 1).
|
||||||
|
// Ein nicht lizenziertes Modul wird mit ErrFlagNotLicensed abgelehnt, bevor
|
||||||
|
// irgendein Schreibzugriff erfolgt.
|
||||||
|
func (h *Handler) ToggleFlag(ctx context.Context, tenantID, key string, enabled bool) error {
|
||||||
|
lic, err := h.licenseStore.Status(ctx, tenantID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("lizenzstatus lesen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if enabled {
|
||||||
|
if _, _, licensed := isModuleLicensed(key, lic.Modules); !licensed {
|
||||||
|
return ErrFlagNotLicensed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
existing, err := h.flagStore.Get(ctx, key)
|
||||||
|
if err != nil && !errors.Is(err, flag.ErrNotFound) {
|
||||||
|
return fmt.Errorf("flag lesen: %w", err)
|
||||||
|
}
|
||||||
|
existing.Key = key
|
||||||
|
existing.Enabled = enabled
|
||||||
|
|
||||||
|
if err := h.flagStore.Set(ctx, existing); err != nil {
|
||||||
|
return fmt.Errorf("flag speichern: %w", err)
|
||||||
|
}
|
||||||
|
h.flagService.Invalidate(key)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- HTTP-Bindung ---
|
||||||
|
|
||||||
|
func (h *Handler) OverviewHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
tenantID := r.URL.Query().Get("tenant")
|
||||||
|
if tenantID == "" {
|
||||||
|
writeError(w, http.StatusBadRequest, "tenant-parameter fehlt")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
overview, err := h.Overview(r.Context(), tenantID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusInternalServerError, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeJSON(w, http.StatusOK, overview)
|
||||||
|
}
|
||||||
|
|
||||||
|
type toggleRequest struct {
|
||||||
|
Tenant string `json:"tenant"`
|
||||||
|
Key string `json:"key"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) ToggleFlagHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req toggleRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
writeError(w, http.StatusBadRequest, "ungueltiger anfrage-koerper")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.Tenant == "" || req.Key == "" {
|
||||||
|
writeError(w, http.StatusBadRequest, "tenant und key sind erforderlich")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err := h.ToggleFlag(r.Context(), req.Tenant, req.Key, req.Enabled)
|
||||||
|
switch {
|
||||||
|
case err == nil:
|
||||||
|
writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
|
||||||
|
case errors.Is(err, ErrFlagNotLicensed):
|
||||||
|
writeError(w, http.StatusForbidden, ErrFlagNotLicensed.Error())
|
||||||
|
default:
|
||||||
|
writeError(w, http.StatusInternalServerError, err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeJSON(w http.ResponseWriter, status int, body any) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
_ = json.NewEncoder(w).Encode(body)
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeError(w http.ResponseWriter, status int, message string) {
|
||||||
|
writeJSON(w, status, map[string]string{"error": message})
|
||||||
|
}
|
||||||
@@ -0,0 +1,275 @@
|
|||||||
|
package adminapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/flag"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/license"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/usage"
|
||||||
|
)
|
||||||
|
|
||||||
|
type testEnv struct {
|
||||||
|
handler *Handler
|
||||||
|
tenantID string
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (testEnv, 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 tenants (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
slug TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
db_name TEXT NOT NULL UNIQUE,
|
||||||
|
db_dsn TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS tenant_licenses (
|
||||||
|
tenant_id UUID PRIMARY KEY REFERENCES tenants(id),
|
||||||
|
plan TEXT NOT NULL,
|
||||||
|
modules TEXT[] NOT NULL,
|
||||||
|
issued_at TIMESTAMPTZ NOT NULL,
|
||||||
|
valid_until TIMESTAMPTZ NOT NULL,
|
||||||
|
raw_key TEXT NOT NULL,
|
||||||
|
installed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS feature_flags (
|
||||||
|
key TEXT PRIMARY KEY,
|
||||||
|
enabled BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
rollout_percentage INT NOT NULL DEFAULT 0,
|
||||||
|
target_tenant_slugs TEXT[] NOT NULL DEFAULT '{}',
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS usage_counters (
|
||||||
|
tenant_id UUID NOT NULL, metric TEXT NOT NULL, value BIGINT NOT NULL DEFAULT 0,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS usage_quotas (
|
||||||
|
tenant_id UUID NOT NULL, metric TEXT NOT NULL, limit_value BIGINT NOT NULL,
|
||||||
|
PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
slug := fmt.Sprintf("adminapi_test_%d", time.Now().UnixNano())
|
||||||
|
var tenantID string
|
||||||
|
if err := pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO tenants (slug, name, db_name, db_dsn)
|
||||||
|
VALUES ($1, 'Adminapi Test', $1, 'unused') RETURNING id
|
||||||
|
`, slug).Scan(&tenantID); err != nil {
|
||||||
|
t.Fatalf("test-tenant anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub, priv, err := ed25519.GenerateKey(nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("schluesselpaar: %v", err)
|
||||||
|
}
|
||||||
|
issuer := license.NewIssuer(priv)
|
||||||
|
licenseStore := license.NewStore(pool, license.NewValidator(pub))
|
||||||
|
|
||||||
|
payload := license.Payload{
|
||||||
|
TenantSlug: slug,
|
||||||
|
Plan: "professional",
|
||||||
|
Modules: []string{"dms", "mail"},
|
||||||
|
IssuedAt: time.Now().Truncate(time.Second),
|
||||||
|
ValidUntil: time.Now().Add(30 * 24 * time.Hour).Truncate(time.Second),
|
||||||
|
}
|
||||||
|
key, err := issuer.Issue(payload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("lizenz ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := licenseStore.Install(ctx, tenantID, key); err != nil {
|
||||||
|
t.Fatalf("lizenz installieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
flagStore := flag.NewStore(pool)
|
||||||
|
flagService := flag.NewService(flagStore, time.Millisecond) // sehr kurze TTL, damit Tests nicht auf Cache-Ablauf warten muessen
|
||||||
|
usageStore := usage.NewStore(pool)
|
||||||
|
|
||||||
|
handler := NewHandler(licenseStore, flagStore, flagService, usageStore)
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM usage_quotas WHERE tenant_id = $1`, tenantID)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM usage_counters WHERE tenant_id = $1`, tenantID)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM tenant_licenses WHERE tenant_id = $1`, tenantID)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM tenants WHERE id = $1`, tenantID)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM feature_flags WHERE key LIKE 'adminapi\_test\_%' ESCAPE '\'`)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return testEnv{handler: handler, tenantID: tenantID, pool: pool}, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Lizenzstatus, Laufzeit und Module sind auf einen
|
||||||
|
// Blick abfragbar.
|
||||||
|
func TestOverview_ShowsLicenseStatusAndModules(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
overview, err := env.handler.Overview(ctx, env.tenantID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("overview: %v", err)
|
||||||
|
}
|
||||||
|
if overview.Plan != "professional" {
|
||||||
|
t.Fatalf("plan = %q, want professional", overview.Plan)
|
||||||
|
}
|
||||||
|
if len(overview.Modules) != 2 {
|
||||||
|
t.Fatalf("module = %v, want 2 eintraege", overview.Modules)
|
||||||
|
}
|
||||||
|
if overview.Expired {
|
||||||
|
t.Fatal("lizenz sollte nicht abgelaufen sein")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Umschalten eines nicht lizenzierten
|
||||||
|
// Features wird verhindert und verstaendlich begruendet.
|
||||||
|
func TestToggleFlag_RejectsUnlicensedModule(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
err := env.handler.ToggleFlag(ctx, env.tenantID, "module:archive", true)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("erwartet fehler beim aktivieren eines nicht lizenzierten moduls")
|
||||||
|
}
|
||||||
|
if err.Error() == "" {
|
||||||
|
t.Fatal("fehlermeldung sollte verstaendlich sein, nicht leer")
|
||||||
|
}
|
||||||
|
t.Logf("erhaltene begruendung: %v", err)
|
||||||
|
|
||||||
|
// Sicherstellen, dass NICHTS geschrieben wurde: Flag existiert weiterhin nicht.
|
||||||
|
if _, ferr := flag.NewStore(env.pool).Get(ctx, "module:archive"); ferr == nil {
|
||||||
|
t.Fatal("flag haette wegen fehlender lizenz nicht angelegt werden duerfen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2: lizenziertes Modul laesst sich umschalten.
|
||||||
|
func TestToggleFlag_AllowsLicensedModule(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := env.handler.ToggleFlag(ctx, env.tenantID, "module:dms", true); err != nil {
|
||||||
|
t.Fatalf("erwartet erfolg fuer lizenziertes modul, habe: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
overview, err := env.handler.Overview(ctx, env.tenantID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("overview: %v", err)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, f := range overview.Flags {
|
||||||
|
if f.Key == "module:dms" {
|
||||||
|
found = true
|
||||||
|
if !f.Enabled || !f.Licensed {
|
||||||
|
t.Fatalf("flag-status unerwartet: %+v", f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Fatal("erwartet 'module:dms' in der uebersicht nach dem umschalten")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Nutzungsstand stimmt mit den
|
||||||
|
// Backend-Zaehlern ueberein.
|
||||||
|
func TestOverview_UsageMatchesBackendCounters(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
usageStore := usage.NewStore(env.pool)
|
||||||
|
if err := usageStore.Increment(ctx, env.tenantID, "users", 7); err != nil {
|
||||||
|
t.Fatalf("increment: %v", err)
|
||||||
|
}
|
||||||
|
if err := usageStore.SetQuota(ctx, env.tenantID, "users", 10); err != nil {
|
||||||
|
t.Fatalf("setquota: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
overview, err := env.handler.Overview(ctx, env.tenantID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("overview: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var got *UsageOverview
|
||||||
|
for i := range overview.Usage {
|
||||||
|
if overview.Usage[i].Metric == "users" {
|
||||||
|
got = &overview.Usage[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got == nil {
|
||||||
|
t.Fatal("erwartet metrik 'users' in der uebersicht")
|
||||||
|
}
|
||||||
|
if got.Value != 7 || got.Limit != 10 || got.Status != usage.StatusOK {
|
||||||
|
t.Fatalf("nutzungsstand stimmt nicht mit backend-zaehler ueberein: %+v (want value=7 limit=10 status=ok, da 7/10=70%% unter der 80%%-warnschwelle liegt)", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 / Pruefung 1 auf HTTP-Ebene: der Endpunkt liefert
|
||||||
|
// 403 mit verstaendlicher Fehlermeldung, kein interner Serverfehler.
|
||||||
|
func TestToggleFlagHandler_HTTPForbiddenOnUnlicensed(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
body, _ := json.Marshal(toggleRequest{Tenant: env.tenantID, Key: "module:archive", Enabled: true})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/admin/flags/toggle", bytes.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
env.handler.ToggleFlagHandler(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("status = %d, want 403", rec.Code)
|
||||||
|
}
|
||||||
|
var resp map[string]string
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
|
||||||
|
t.Fatalf("body parsen: %v", err)
|
||||||
|
}
|
||||||
|
if resp["error"] == "" {
|
||||||
|
t.Fatal("erwartet verstaendliche fehlermeldung im response-body")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestOverviewHandler_HTTPReturnsCombinedData(t *testing.T) {
|
||||||
|
env, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/admin/overview?tenant="+env.tenantID, nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
env.handler.OverviewHandler(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
var overview Overview
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &overview); err != nil {
|
||||||
|
t.Fatalf("body parsen: %v", err)
|
||||||
|
}
|
||||||
|
if overview.Plan != "professional" {
|
||||||
|
t.Fatalf("plan = %q, want professional", overview.Plan)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
// Package audit implementiert Core AUD-01: das zentrale, vom allgemeinen
|
||||||
|
// Anwendungs-Log getrennte Audit-Datenmodell fuer sicherheits- und
|
||||||
|
// compliancerelevante Ereignisse (wer, was, wann, an welchem Tenant).
|
||||||
|
// Unveraenderlichkeit (Append-only) ist AUD-02, Export/Filter-API ist AUD-03
|
||||||
|
// — dieses Paket liefert nur das Datenmodell und den EINEN zentralen
|
||||||
|
// Schreibpfad (Akzeptanzkriterium 3).
|
||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SystemTenant ist der reservierte Tenant-Bezug fuer mandantenuebergreifende
|
||||||
|
// Ereignisse (z.B. Superadmin-Aktionen) — es gibt bewusst KEINEN Weg, ein
|
||||||
|
// Ereignis ganz ohne Tenant-Bezug zu schreiben (Akzeptanzkriterium 2).
|
||||||
|
const SystemTenant = "system"
|
||||||
|
|
||||||
|
var ErrMissingTenant = errors.New("audit: tenant_slug darf nicht leer sein")
|
||||||
|
var ErrMissingActor = errors.New("audit: actor darf nicht leer sein")
|
||||||
|
var ErrMissingAction = errors.New("audit: action darf nicht leer sein")
|
||||||
|
|
||||||
|
// Event ist ein strukturiertes Audit-Ereignis (Akzeptanzkriterium 1: Akteur,
|
||||||
|
// Aktion, Zielobjekt, Zeitpunkt, Tenant).
|
||||||
|
type Event struct {
|
||||||
|
TenantSlug string
|
||||||
|
Actor string
|
||||||
|
Action string
|
||||||
|
Target string
|
||||||
|
Metadata map[string]any
|
||||||
|
OccurredAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log ist der EINE zentrale Schreibpfad fuer Audit-Ereignisse — es gibt
|
||||||
|
// bewusst keine zweite Schreibmoeglichkeit, damit kein Handler versehentlich
|
||||||
|
// direkt in audit_events schreibt und dabei die Validierung umgeht
|
||||||
|
// (Akzeptanzkriterium 3).
|
||||||
|
type Log struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLog(pool *pgxpool.Pool) *Log {
|
||||||
|
return &Log{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record persistiert genau einen Audit-Eintrag. Fehlender Tenant-Bezug wird
|
||||||
|
// bereits hier abgewiesen (klarer Fehler statt Constraint-Verletzung im
|
||||||
|
// Normalfall) — die Datenbank-CHECK-Constraint aus der Migration ist die
|
||||||
|
// zweite, unumgehbare Verteidigungslinie (Akzeptanzkriterium 2 / Pruefung 2).
|
||||||
|
func (l *Log) Record(ctx context.Context, e Event) error {
|
||||||
|
if e.TenantSlug == "" {
|
||||||
|
return ErrMissingTenant
|
||||||
|
}
|
||||||
|
if e.Actor == "" {
|
||||||
|
return ErrMissingActor
|
||||||
|
}
|
||||||
|
if e.Action == "" {
|
||||||
|
return ErrMissingAction
|
||||||
|
}
|
||||||
|
if e.Metadata == nil {
|
||||||
|
e.Metadata = map[string]any{}
|
||||||
|
}
|
||||||
|
metadataJSON, err := json.Marshal(e.Metadata)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("metadaten serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
if e.OccurredAt.IsZero() {
|
||||||
|
e.OccurredAt = time.Now()
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = l.pool.Exec(ctx, `
|
||||||
|
INSERT INTO audit_events (occurred_at, tenant_slug, actor, action, target, metadata)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6)
|
||||||
|
`, e.OccurredAt, e.TenantSlug, e.Actor, e.Action, e.Target, metadataJSON)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("audit-ereignis schreiben: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CountByTenant ist eine schlanke Lesehilfe fuer Tests/Diagnose — die
|
||||||
|
// eigentliche Filter-/Export-API ist AUD-03, hier bewusst nicht vorgezogen.
|
||||||
|
func (l *Log) CountByTenant(ctx context.Context, tenantSlug string) (int, error) {
|
||||||
|
var n int
|
||||||
|
if err := l.pool.QueryRow(ctx, `
|
||||||
|
SELECT count(*) FROM audit_events WHERE tenant_slug = $1
|
||||||
|
`, tenantSlug).Scan(&n); err != nil {
|
||||||
|
return 0, fmt.Errorf("audit-ereignisse zaehlen: %w", err)
|
||||||
|
}
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupAuditTest(t *testing.T) (*Log, *pgxpool.Pool, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS audit_events (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
occurred_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
tenant_slug TEXT NOT NULL CHECK (tenant_slug <> ''),
|
||||||
|
actor TEXT NOT NULL CHECK (actor <> ''),
|
||||||
|
action TEXT NOT NULL CHECK (action <> ''),
|
||||||
|
target TEXT NOT NULL,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM audit_events WHERE tenant_slug LIKE 'test\_%' ESCAPE '\' OR tenant_slug = $1`, SystemTenant)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return NewLog(pool), pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: ein sicherheitsrelevanter Vorgang
|
||||||
|
// (hier: fehlgeschlagener Login) erzeugt zuverlaessig genau einen Eintrag.
|
||||||
|
func TestRecord_PersistsExactlyOneEventPerSecurityIncident(t *testing.T) {
|
||||||
|
log, pool, cleanup := setupAuditTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
err := log.Record(ctx, Event{
|
||||||
|
TenantSlug: "test_acme",
|
||||||
|
Actor: "alice@example.com",
|
||||||
|
Action: "iam.login_failed",
|
||||||
|
Target: "user:alice@example.com",
|
||||||
|
Metadata: map[string]any{"reason": "falsches passwort"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("record: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
count, err := log.CountByTenant(ctx, "test_acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("count: %v", err)
|
||||||
|
}
|
||||||
|
if count != 1 {
|
||||||
|
t.Fatalf("erwartet genau 1 audit-eintrag, habe %d", count)
|
||||||
|
}
|
||||||
|
|
||||||
|
var actor, action, target string
|
||||||
|
if err := pool.QueryRow(ctx, `
|
||||||
|
SELECT actor, action, target FROM audit_events WHERE tenant_slug = 'test_acme'
|
||||||
|
`).Scan(&actor, &action, &target); err != nil {
|
||||||
|
t.Fatalf("eintrag lesen: %v", err)
|
||||||
|
}
|
||||||
|
if actor != "alice@example.com" || action != "iam.login_failed" || target != "user:alice@example.com" {
|
||||||
|
t.Fatalf("eintrag unerwartet: actor=%q action=%q target=%q", actor, action, target)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2 (App-Ebene): fehlender Tenant-Bezug wird
|
||||||
|
// bereits vom zentralen Schreibpfad abgewiesen.
|
||||||
|
func TestRecord_RejectsMissingTenant(t *testing.T) {
|
||||||
|
log, _, cleanup := setupAuditTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
err := log.Record(ctx, Event{TenantSlug: "", Actor: "alice", Action: "irgendwas"})
|
||||||
|
if !errors.Is(err, ErrMissingTenant) {
|
||||||
|
t.Fatalf("erwartet ErrMissingTenant, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2 (DB-Ebene): selbst ein direkter INSERT,
|
||||||
|
// der Log.Record umgeht, wird durch die CHECK-Constraint verhindert — der
|
||||||
|
// Schutz haengt nicht allein von der Go-Validierung ab.
|
||||||
|
func TestConstraint_RejectsMissingTenantAtDatabaseLevel(t *testing.T) {
|
||||||
|
_, pool, cleanup := setupAuditTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
_, err := pool.Exec(ctx, `
|
||||||
|
INSERT INTO audit_events (tenant_slug, actor, action, target)
|
||||||
|
VALUES ('', 'alice', 'irgendwas', 'ziel')
|
||||||
|
`)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("erwartet fehler durch CHECK-constraint bei leerem tenant_slug, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRecord_RejectsMissingActorAndAction(t *testing.T) {
|
||||||
|
log, _, cleanup := setupAuditTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := log.Record(ctx, Event{TenantSlug: "test_acme", Actor: "", Action: "x"}); !errors.Is(err, ErrMissingActor) {
|
||||||
|
t.Fatalf("erwartet ErrMissingActor, habe %v", err)
|
||||||
|
}
|
||||||
|
if err := log.Record(ctx, Event{TenantSlug: "test_acme", Actor: "alice", Action: ""}); !errors.Is(err, ErrMissingAction) {
|
||||||
|
t.Fatalf("erwartet ErrMissingAction, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRecord_SystemTenantForCrossTenantEvents(t *testing.T) {
|
||||||
|
log, _, cleanup := setupAuditTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := log.Record(ctx, Event{TenantSlug: SystemTenant, Actor: "superadmin", Action: "tenant.provisioned", Target: "tenant:acme"}); err != nil {
|
||||||
|
t.Fatalf("record mit SystemTenant: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/csv"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Filter grenzt einen Export ein (Akzeptanzkriterium 1). Leere/Nil-Felder
|
||||||
|
// bedeuten "kein Filter auf diesem Feld".
|
||||||
|
type Filter struct {
|
||||||
|
TenantSlug string
|
||||||
|
Actor string
|
||||||
|
Action string
|
||||||
|
From *time.Time
|
||||||
|
To *time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildFilterQuery(f Filter) (string, []any) {
|
||||||
|
query := `SELECT occurred_at, tenant_slug, actor, action, target, metadata FROM audit_events WHERE 1=1`
|
||||||
|
var args []any
|
||||||
|
|
||||||
|
if f.TenantSlug != "" {
|
||||||
|
args = append(args, f.TenantSlug)
|
||||||
|
query += fmt.Sprintf(" AND tenant_slug = $%d", len(args))
|
||||||
|
}
|
||||||
|
if f.Actor != "" {
|
||||||
|
args = append(args, f.Actor)
|
||||||
|
query += fmt.Sprintf(" AND actor = $%d", len(args))
|
||||||
|
}
|
||||||
|
if f.Action != "" {
|
||||||
|
args = append(args, f.Action)
|
||||||
|
query += fmt.Sprintf(" AND action = $%d", len(args))
|
||||||
|
}
|
||||||
|
if f.From != nil {
|
||||||
|
args = append(args, *f.From)
|
||||||
|
query += fmt.Sprintf(" AND occurred_at >= $%d", len(args))
|
||||||
|
}
|
||||||
|
if f.To != nil {
|
||||||
|
args = append(args, *f.To)
|
||||||
|
query += fmt.Sprintf(" AND occurred_at <= $%d", len(args))
|
||||||
|
}
|
||||||
|
query += " ORDER BY occurred_at"
|
||||||
|
return query, args
|
||||||
|
}
|
||||||
|
|
||||||
|
// StreamCSV schreibt gefilterte Audit-Eintraege direkt als CSV in w, Zeile
|
||||||
|
// fuer Zeile ueber rows.Next() — es wird zu keinem Zeitpunkt das gesamte
|
||||||
|
// Ergebnis im Speicher aufgebaut (Akzeptanzkriterium 3 / Pruefung 1).
|
||||||
|
func (l *Log) StreamCSV(ctx context.Context, filter Filter, w io.Writer) error {
|
||||||
|
query, args := buildFilterQuery(filter)
|
||||||
|
rows, err := l.pool.Query(ctx, query, args...)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("export abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
cw := csv.NewWriter(w)
|
||||||
|
if err := cw.Write([]string{"occurred_at", "tenant_slug", "actor", "action", "target", "metadata"}); err != nil {
|
||||||
|
return fmt.Errorf("csv-header schreiben: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for rows.Next() {
|
||||||
|
var occurredAt time.Time
|
||||||
|
var tenantSlug, actor, action, target string
|
||||||
|
var metadataJSON []byte
|
||||||
|
if err := rows.Scan(&occurredAt, &tenantSlug, &actor, &action, &target, &metadataJSON); err != nil {
|
||||||
|
return fmt.Errorf("zeile lesen: %w", err)
|
||||||
|
}
|
||||||
|
if err := cw.Write([]string{
|
||||||
|
occurredAt.Format(time.RFC3339), tenantSlug, actor, action, target, string(metadataJSON),
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("csv-zeile schreiben: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cw.Flush()
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return fmt.Errorf("export lesen: %w", err)
|
||||||
|
}
|
||||||
|
return cw.Error()
|
||||||
|
}
|
||||||
|
|
||||||
|
// exportRecord ist die JSON-Repraesentation einer exportierten Zeile.
|
||||||
|
type exportRecord struct {
|
||||||
|
OccurredAt time.Time `json:"occurred_at"`
|
||||||
|
TenantSlug string `json:"tenant_slug"`
|
||||||
|
Actor string `json:"actor"`
|
||||||
|
Action string `json:"action"`
|
||||||
|
Target string `json:"target"`
|
||||||
|
Metadata json.RawMessage `json:"metadata"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// StreamJSON schreibt gefilterte Audit-Eintraege als JSON Lines (ein
|
||||||
|
// JSON-Objekt pro Zeile) — bewusst kein einzelnes grosses JSON-Array, da
|
||||||
|
// dessen korrektes Streaming (Kommas/Klammern ohne Zwischenpufferung)
|
||||||
|
// unnoetige Komplexitaet fuer denselben Zweck waere. Wie StreamCSV
|
||||||
|
// zeilenweise ueber rows.Next(), kein Aufbau im Speicher.
|
||||||
|
func (l *Log) StreamJSON(ctx context.Context, filter Filter, w io.Writer) error {
|
||||||
|
query, args := buildFilterQuery(filter)
|
||||||
|
rows, err := l.pool.Query(ctx, query, args...)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("export abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
enc := json.NewEncoder(w)
|
||||||
|
for rows.Next() {
|
||||||
|
var rec exportRecord
|
||||||
|
var metadataJSON []byte
|
||||||
|
if err := rows.Scan(&rec.OccurredAt, &rec.TenantSlug, &rec.Actor, &rec.Action, &rec.Target, &metadataJSON); err != nil {
|
||||||
|
return fmt.Errorf("zeile lesen: %w", err)
|
||||||
|
}
|
||||||
|
rec.Metadata = metadataJSON
|
||||||
|
if err := enc.Encode(rec); err != nil {
|
||||||
|
return fmt.Errorf("json-zeile schreiben: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rows.Err()
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Authorize entscheidet, ob caller den Export ausfuehren darf. Die
|
||||||
|
// eigentliche Rollen-/Rechtepruefung (RBAC-02 Policy-Enforcement) ist nicht
|
||||||
|
// Teil dieser Kachel — ExportHandler kennt nur diese schmale Schnittstelle,
|
||||||
|
// analog zum RetentionRegistrar-Muster aus AUD-05.
|
||||||
|
type Authorize func(ctx context.Context, caller string) bool
|
||||||
|
|
||||||
|
// ExportHandler stellt den Export als HTTP-Endpunkt bereit
|
||||||
|
// (Akzeptanzkriterium 2: fuer berechtigte Rollen verfuegbar).
|
||||||
|
type ExportHandler struct {
|
||||||
|
log *Log
|
||||||
|
authorize Authorize
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewExportHandler(log *Log, authorize Authorize) *ExportHandler {
|
||||||
|
return &ExportHandler{log: log, authorize: authorize}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Export liest Filter-Query-Parameter (tenant, actor, action, from, to,
|
||||||
|
// format) und schreibt DIREKT auf den ResponseWriter (io.Writer) — dieselbe
|
||||||
|
// Streaming-Funktion wie in export.go, kein zusaetzlicher Pufferungsschritt.
|
||||||
|
func (h *ExportHandler) Export(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// "caller" identifiziert die anfragende Person fuer die Berechtigungs-
|
||||||
|
// pruefung — bewusst getrennt vom Filterfeld "actor" (das den
|
||||||
|
// AUDIT-Akteur meint, ueber den gefiltert wird).
|
||||||
|
caller := r.URL.Query().Get("caller")
|
||||||
|
if caller == "" || !h.authorize(r.Context(), caller) {
|
||||||
|
http.Error(w, "keine berechtigung fuer audit-log-export", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
filter := Filter{
|
||||||
|
TenantSlug: r.URL.Query().Get("tenant"),
|
||||||
|
Actor: r.URL.Query().Get("actor"),
|
||||||
|
Action: r.URL.Query().Get("action"),
|
||||||
|
}
|
||||||
|
if from := r.URL.Query().Get("from"); from != "" {
|
||||||
|
t, err := time.Parse(time.RFC3339, from)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "ungueltiges from-datum, erwartet RFC3339", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
filter.From = &t
|
||||||
|
}
|
||||||
|
if to := r.URL.Query().Get("to"); to != "" {
|
||||||
|
t, err := time.Parse(time.RFC3339, to)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "ungueltiges to-datum, erwartet RFC3339", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
filter.To = &t
|
||||||
|
}
|
||||||
|
|
||||||
|
switch r.URL.Query().Get("format") {
|
||||||
|
case "json":
|
||||||
|
w.Header().Set("Content-Type", "application/x-ndjson")
|
||||||
|
if err := h.log.StreamJSON(r.Context(), filter, w); err != nil {
|
||||||
|
http.Error(w, "export fehlgeschlagen", http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
w.Header().Set("Content-Type", "text/csv")
|
||||||
|
if err := h.log.StreamCSV(r.Context(), filter, w); err != nil {
|
||||||
|
http.Error(w, "export fehlgeschlagen", http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,222 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/csv"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupExportTest(t *testing.T) (*Log, 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 audit_events (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
occurred_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
tenant_slug TEXT NOT NULL CHECK (tenant_slug <> ''),
|
||||||
|
actor TEXT NOT NULL CHECK (actor <> ''),
|
||||||
|
action TEXT NOT NULL CHECK (action <> ''),
|
||||||
|
target TEXT NOT NULL,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewLog(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 2: Filterkombinationen liefern korrekte
|
||||||
|
// Teilmengen.
|
||||||
|
func TestExport_FilterCombinations(t *testing.T) {
|
||||||
|
log, cleanup := setupExportTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
run := fmt.Sprintf("_%d", time.Now().UnixNano())
|
||||||
|
tenantA, tenantB := "test_fa"+run, "test_fb"+run
|
||||||
|
alice, bob := "alice"+run, "bob"+run
|
||||||
|
|
||||||
|
events := []Event{
|
||||||
|
{TenantSlug: tenantA, Actor: alice, Action: "login", Target: "x"},
|
||||||
|
{TenantSlug: tenantA, Actor: bob, Action: "login", Target: "x"},
|
||||||
|
{TenantSlug: tenantA, Actor: alice, Action: "logout", Target: "x"},
|
||||||
|
{TenantSlug: tenantB, Actor: alice, Action: "login", Target: "x"},
|
||||||
|
}
|
||||||
|
for _, e := range events {
|
||||||
|
if err := log.Record(ctx, e); err != nil {
|
||||||
|
t.Fatalf("record: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
filter Filter
|
||||||
|
wantLen int
|
||||||
|
}{
|
||||||
|
{"nach tenant", Filter{TenantSlug: tenantA}, 3},
|
||||||
|
{"nach tenant+actor", Filter{TenantSlug: tenantA, Actor: alice}, 2},
|
||||||
|
{"nach tenant+actor+action", Filter{TenantSlug: tenantA, Actor: alice, Action: "login"}, 1},
|
||||||
|
{"nach actor ueber beide tenants", Filter{Actor: alice, Action: "login"}, 2},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := log.StreamCSV(ctx, c.filter, &buf); err != nil {
|
||||||
|
t.Fatalf("stream: %v", err)
|
||||||
|
}
|
||||||
|
rows, err := csv.NewReader(&buf).ReadAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("csv parsen: %v", err)
|
||||||
|
}
|
||||||
|
got := len(rows) - 1 // Header abziehen
|
||||||
|
if got != c.wantLen {
|
||||||
|
t.Fatalf("erwartet %d zeilen, habe %d", c.wantLen, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 2: Zeitraum-Filter.
|
||||||
|
func TestExport_TimeRangeFilter(t *testing.T) {
|
||||||
|
log, cleanup := setupExportTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
tenant := fmt.Sprintf("test_tr_%d", time.Now().UnixNano())
|
||||||
|
past := time.Now().Add(-48 * time.Hour)
|
||||||
|
future := time.Now().Add(48 * time.Hour)
|
||||||
|
|
||||||
|
if err := log.Record(ctx, Event{TenantSlug: tenant, Actor: "a", Action: "x", Target: "t", OccurredAt: time.Now()}); err != nil {
|
||||||
|
t.Fatalf("record: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := log.StreamCSV(ctx, Filter{TenantSlug: tenant, From: &past, To: &future}, &buf); err != nil {
|
||||||
|
t.Fatalf("stream (innerhalb range): %v", err)
|
||||||
|
}
|
||||||
|
if got := countLines(buf.String()) - 1; got != 1 {
|
||||||
|
t.Fatalf("erwartet 1 eintrag innerhalb des zeitraums, habe %d", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
farPast := time.Now().Add(-96 * time.Hour)
|
||||||
|
buf.Reset()
|
||||||
|
if err := log.StreamCSV(ctx, Filter{TenantSlug: tenant, From: &farPast, To: &past}, &buf); err != nil {
|
||||||
|
t.Fatalf("stream (ausserhalb range): %v", err)
|
||||||
|
}
|
||||||
|
if got := countLines(buf.String()) - 1; got != 0 {
|
||||||
|
t.Fatalf("erwartet 0 eintraege ausserhalb des zeitraums, habe %d", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func countLines(s string) int {
|
||||||
|
s = strings.TrimRight(s, "\n")
|
||||||
|
if s == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return len(strings.Split(s, "\n"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: Export mit hoher Eintragszahl ohne
|
||||||
|
// uebermaessigen Speicherverbrauch — Stichprobe per runtime.MemStats.
|
||||||
|
func TestExport_StreamsLargeResultWithoutExcessiveMemory(t *testing.T) {
|
||||||
|
log, cleanup := setupExportTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
tenant := fmt.Sprintf("test_large_%d", time.Now().UnixNano())
|
||||||
|
const n = 20000
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
if err := log.Record(ctx, Event{TenantSlug: tenant, Actor: "bulk", Action: "test.bulk", Target: fmt.Sprintf("obj-%d", i)}); err != nil {
|
||||||
|
t.Fatalf("record %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
runtime.GC()
|
||||||
|
var before runtime.MemStats
|
||||||
|
runtime.ReadMemStats(&before)
|
||||||
|
|
||||||
|
lineCount := 0
|
||||||
|
cw := &countingWriter{onWrite: func(p []byte) { lineCount += strings.Count(string(p), "\n") }}
|
||||||
|
if err := log.StreamCSV(ctx, Filter{TenantSlug: tenant}, cw); err != nil {
|
||||||
|
t.Fatalf("stream: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
runtime.GC()
|
||||||
|
var after runtime.MemStats
|
||||||
|
runtime.ReadMemStats(&after)
|
||||||
|
|
||||||
|
if lineCount != n+1 { // +1 Header
|
||||||
|
t.Fatalf("erwartet %d zeilen (inkl. header), habe %d", n+1, lineCount)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grobe Stichprobe: ein NICHT streamender Export haette hier locker
|
||||||
|
// mehrere MB an einmal gehaltenen Zeilen/Strings erzeugt. Grosszuegige
|
||||||
|
// Schwelle, da Go-Heap-Messungen naturgemaess rauschen.
|
||||||
|
const maxAcceptableGrowth = 3 * 1024 * 1024 // 3 MB
|
||||||
|
growth := int64(after.HeapAlloc) - int64(before.HeapAlloc)
|
||||||
|
t.Logf("heap-wachstum waehrend export von %d zeilen: %d bytes (schwelle: %d)", n, growth, maxAcceptableGrowth)
|
||||||
|
if growth > maxAcceptableGrowth {
|
||||||
|
t.Fatalf("heap ist um %d bytes gewachsen, erwartet unter %d (hinweis auf vollstaendige pufferung statt streaming)", growth, maxAcceptableGrowth)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type countingWriter struct {
|
||||||
|
onWrite func(p []byte)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *countingWriter) Write(p []byte) (int, error) {
|
||||||
|
w.onWrite(p)
|
||||||
|
return len(p), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 3: Zugriff ohne passende Berechtigung wird abgewiesen.
|
||||||
|
func TestExportHandler_RejectsWithoutAuthorization(t *testing.T) {
|
||||||
|
log, cleanup := setupExportTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
handler := NewExportHandler(log, func(ctx context.Context, caller string) bool {
|
||||||
|
return caller == "berechtigte-person@example.com"
|
||||||
|
})
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/audit/export?caller=unberechtigt@example.com", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handler.Export(rec, req)
|
||||||
|
if rec.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("unberechtigt: status = %d, want 403", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
reqNoCaller := httptest.NewRequest(http.MethodGet, "/audit/export", nil)
|
||||||
|
recNoCaller := httptest.NewRecorder()
|
||||||
|
handler.Export(recNoCaller, reqNoCaller)
|
||||||
|
if recNoCaller.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("ohne caller: status = %d, want 403", recNoCaller.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
reqOK := httptest.NewRequest(http.MethodGet, "/audit/export?caller=berechtigte-person@example.com", nil)
|
||||||
|
recOK := httptest.NewRecorder()
|
||||||
|
handler.Export(recOK, reqOK)
|
||||||
|
if recOK.Code != http.StatusOK {
|
||||||
|
t.Fatalf("berechtigt: status = %d, want 200", recOK.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
// Package auditadmin implementiert Core AUD-04: die Berechtigungspruefung
|
||||||
|
// fuer die Audit-Log-Ansicht. Enthaelt bewusst KEINE eigene Filter-/
|
||||||
|
// Export-Logik — die Ansicht ist "reiner Konsument der Export-API" (AUD-03,
|
||||||
|
// internal/audit.ExportHandler); dieses Paket liefert nur die
|
||||||
|
// audit.Authorize-Implementierung, die der Entwicklungs-/Testserver
|
||||||
|
// (cmd/auditlog-devserver) einhaengt.
|
||||||
|
package auditadmin
|
||||||
|
|
||||||
|
import "crypto/subtle"
|
||||||
|
|
||||||
|
// NewTokenAuthorizer liefert eine audit.Authorize-Funktion, die den
|
||||||
|
// aufrufenden "caller"-Wert timing-safe gegen ein geteiltes Admin-Token
|
||||||
|
// vergleicht — dasselbe Muster wie internal/audit.timingsafe (AUD-02),
|
||||||
|
// NICHT ueber eine neue Rollen-/Rechteschicht, da AUD-04 ausdruecklich nur
|
||||||
|
// von AUD-03 abhaengt.
|
||||||
|
func NewTokenAuthorizer(adminToken string) func(caller string) bool {
|
||||||
|
return func(caller string) bool {
|
||||||
|
if caller == "" || adminToken == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return subtle.ConstantTimeCompare([]byte(caller), []byte(adminToken)) == 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package auditadmin
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// Grundlage fuer Akzeptanzkriterium 1/2: die Oberflaeche darf Daten und den
|
||||||
|
// Export nur bei korrektem Admin-Token abrufen.
|
||||||
|
func TestNewTokenAuthorizer_AcceptsCorrectToken(t *testing.T) {
|
||||||
|
authorize := NewTokenAuthorizer("geheimes-token")
|
||||||
|
if !authorize("geheimes-token") {
|
||||||
|
t.Fatal("erwartet true fuer korrektes token")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewTokenAuthorizer_RejectsWrongToken(t *testing.T) {
|
||||||
|
authorize := NewTokenAuthorizer("geheimes-token")
|
||||||
|
if authorize("falsches-token") {
|
||||||
|
t.Fatal("erwartet false fuer falsches token")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewTokenAuthorizer_RejectsEmptyCaller(t *testing.T) {
|
||||||
|
authorize := NewTokenAuthorizer("geheimes-token")
|
||||||
|
if authorize("") {
|
||||||
|
t.Fatal("erwartet false fuer leeren aufrufer")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewTokenAuthorizer_RejectsWhenNoTokenConfigured(t *testing.T) {
|
||||||
|
authorize := NewTokenAuthorizer("")
|
||||||
|
if authorize("irgendwas") {
|
||||||
|
t.Fatal("erwartet false, wenn kein admin-token konfiguriert ist (fail-safe-default)")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
package cfgservice
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefaultCacheTTL ist die dokumentierte Cache-Invalidierungszeit
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 2 in diesem Ticket bezieht sich auf die
|
||||||
|
// Aenderungsnachvollziehbarkeit — die Cache-Frist selbst folgt demselben
|
||||||
|
// Muster wie internal/flag.DefaultCacheTTL).
|
||||||
|
const DefaultCacheTTL = 5 * time.Second
|
||||||
|
|
||||||
|
type cacheEntry struct {
|
||||||
|
value Value
|
||||||
|
expiresAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Service ist die Leseseite mit Vorrangregel (Akzeptanzkriterium 1:
|
||||||
|
// Tenant-Override vor Global-Default) und lokalem TTL-Cache.
|
||||||
|
type Service struct {
|
||||||
|
store *Store
|
||||||
|
ttl time.Duration
|
||||||
|
|
||||||
|
mu sync.RWMutex
|
||||||
|
cache map[string]cacheEntry // Schluessel: key + "\x00" + tenantSlug
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewService(store *Store, ttl time.Duration) *Service {
|
||||||
|
if ttl <= 0 {
|
||||||
|
ttl = DefaultCacheTTL
|
||||||
|
}
|
||||||
|
return &Service{store: store, ttl: ttl, cache: make(map[string]cacheEntry)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func cacheKey(key, tenantSlug string) string {
|
||||||
|
return key + "\x00" + tenantSlug
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve liefert den Konfigurationswert fuer einen Tenant: ein
|
||||||
|
// Tenant-spezifischer Override hat Vorrang vor dem globalen Default
|
||||||
|
// (Akzeptanzkriterium 1 / Pruefung 1). tenantSlug == "" wertet nur den
|
||||||
|
// globalen Wert aus.
|
||||||
|
func (s *Service) Resolve(ctx context.Context, tenantSlug, key string) (Value, error) {
|
||||||
|
ck := cacheKey(key, tenantSlug)
|
||||||
|
|
||||||
|
s.mu.RLock()
|
||||||
|
entry, exists := s.cache[ck]
|
||||||
|
fresh := exists && time.Now().Before(entry.expiresAt)
|
||||||
|
s.mu.RUnlock()
|
||||||
|
if fresh {
|
||||||
|
return entry.value, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
v, err := s.resolveUncached(ctx, tenantSlug, key)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
s.mu.Lock()
|
||||||
|
s.cache[ck] = cacheEntry{value: v, expiresAt: time.Now().Add(s.ttl)}
|
||||||
|
s.mu.Unlock()
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) resolveUncached(ctx context.Context, tenantSlug, key string) (Value, error) {
|
||||||
|
if tenantSlug != "" {
|
||||||
|
v, err := s.store.Get(ctx, key, tenantSlug)
|
||||||
|
if err == nil {
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
if !errors.Is(err, ErrNotFound) {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s.store.Get(ctx, key, GlobalScope)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invalidate erzwingt beim naechsten Resolve-Aufruf ein sofortiges Neuladen
|
||||||
|
// fuer einen bestimmten (key, tenantSlug) statt auf den TTL-Ablauf zu warten
|
||||||
|
// — analog internal/flag.Service.Invalidate.
|
||||||
|
func (s *Service) Invalidate(key, tenantSlug string) {
|
||||||
|
s.mu.Lock()
|
||||||
|
delete(s.cache, cacheKey(key, tenantSlug))
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
package cfgservice
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: Tenant-Override hat Vorrang vor
|
||||||
|
// Global-Default, automatisiert getestet.
|
||||||
|
func TestService_TenantOverrideTakesPrecedenceOverGlobal(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.Set(ctx, "test_precedence_key", GlobalScope, "global-wert"); err != nil {
|
||||||
|
t.Fatalf("set global: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.Set(ctx, "test_precedence_key", "test_acme", "tenant-wert"); err != nil {
|
||||||
|
t.Fatalf("set tenant: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
svc := NewService(store, time.Hour)
|
||||||
|
|
||||||
|
got, err := svc.Resolve(ctx, "test_acme", "test_precedence_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve mit override: %v", err)
|
||||||
|
}
|
||||||
|
if got.Value != "tenant-wert" {
|
||||||
|
t.Fatalf("erwartet tenant-override, habe %q", got.Value)
|
||||||
|
}
|
||||||
|
|
||||||
|
gotOther, err := svc.Resolve(ctx, "test_anderer_tenant", "test_precedence_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve ohne override: %v", err)
|
||||||
|
}
|
||||||
|
if gotOther.Value != "global-wert" {
|
||||||
|
t.Fatalf("erwartet global-default fuer tenant ohne override, habe %q", gotOther.Value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: Cache-Invalidierung nach
|
||||||
|
// Konfigurationsaenderung innerhalb dokumentierter Zeit gemessen.
|
||||||
|
func TestService_CacheInvalidationTiming(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
const ttl = 150 * time.Millisecond
|
||||||
|
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "alt"); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
svc := NewService(store, ttl)
|
||||||
|
|
||||||
|
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve: %v", err)
|
||||||
|
}
|
||||||
|
if v.Value != "alt" {
|
||||||
|
t.Fatalf("erwartet 'alt', habe %q", v.Value)
|
||||||
|
}
|
||||||
|
|
||||||
|
changedAt := time.Now()
|
||||||
|
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "neu"); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v, err = svc.Resolve(ctx, "", "test_ttl_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve direkt nach aenderung: %v", err)
|
||||||
|
}
|
||||||
|
if v.Value != "alt" {
|
||||||
|
t.Fatalf("cache haette den alten wert liefern sollen, habe %q", v.Value)
|
||||||
|
}
|
||||||
|
|
||||||
|
deadline := changedAt.Add(ttl + 100*time.Millisecond)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve: %v", err)
|
||||||
|
}
|
||||||
|
if v.Value == "neu" {
|
||||||
|
t.Logf("aenderung wurde nach %s wirksam (ziel: innerhalb %s + toleranz)", time.Since(changedAt), ttl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
}
|
||||||
|
t.Fatalf("aenderung wurde nicht innerhalb von %s wirksam", deadline.Sub(changedAt))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestService_InvalidateForcesImmediateRefresh(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "alt"); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
svc := NewService(store, time.Hour)
|
||||||
|
_, _ = svc.Resolve(ctx, "", "test_invalidate_key")
|
||||||
|
|
||||||
|
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "neu"); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
svc.Invalidate("test_invalidate_key", "")
|
||||||
|
|
||||||
|
v, err := svc.Resolve(ctx, "", "test_invalidate_key")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve: %v", err)
|
||||||
|
}
|
||||||
|
if v.Value != "neu" {
|
||||||
|
t.Fatalf("erwartet sofort sichtbaren neuen wert nach Invalidate, habe %q", v.Value)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
// Package cfgservice implementiert Core CFG-01: den zentralen Dienst fuer
|
||||||
|
// globale und tenant-spezifische Konfigurationswerte mit Versionierung und
|
||||||
|
// Cache-Invalidierung. Andere Module lesen Konfiguration AUSSCHLIESSLICH
|
||||||
|
// ueber dieses Paket (Akzeptanzkriterium 3), niemals ueber eigene Tabellen.
|
||||||
|
package cfgservice
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GlobalScope ist der reservierte Scope-Wert fuer globale Defaults — jeder
|
||||||
|
// andere Scope-Wert ist ein Tenant-Slug (Akzeptanzkriterium 1).
|
||||||
|
const GlobalScope = "global"
|
||||||
|
|
||||||
|
var ErrNotFound = errors.New("cfgservice: kein wert fuer diesen key gefunden")
|
||||||
|
|
||||||
|
type Value struct {
|
||||||
|
Key string
|
||||||
|
Scope string
|
||||||
|
Value string
|
||||||
|
Version int
|
||||||
|
}
|
||||||
|
|
||||||
|
type HistoryEntry struct {
|
||||||
|
Key string
|
||||||
|
Scope string
|
||||||
|
Value string
|
||||||
|
Version int
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store ist die Schreib-/Verwaltungsseite. Set schreibt IMMER sowohl den
|
||||||
|
// aktuellen Stand (config_values) als auch einen Historieneintrag
|
||||||
|
// (config_value_history) in derselben Transaktion — eine Aenderung ohne
|
||||||
|
// Versionshistorie ist strukturell ausgeschlossen (Akzeptanzkriterium 2).
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set schreibt einen neuen Wert fuer (key, scope) und erhoeht die Version um 1
|
||||||
|
// (Version 1 bei erstmaligem Setzen).
|
||||||
|
func (s *Store) Set(ctx context.Context, key, scope, value string) (Value, error) {
|
||||||
|
if scope == "" {
|
||||||
|
return Value{}, errors.New("cfgservice: scope darf nicht leer sein")
|
||||||
|
}
|
||||||
|
|
||||||
|
tx, err := s.pool.Begin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, fmt.Errorf("transaktion starten: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = tx.Rollback(ctx) }()
|
||||||
|
|
||||||
|
var currentVersion int
|
||||||
|
err = tx.QueryRow(ctx, `SELECT version FROM config_values WHERE key = $1 AND scope = $2`, key, scope).Scan(¤tVersion)
|
||||||
|
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Value{}, fmt.Errorf("aktuelle version lesen: %w", err)
|
||||||
|
}
|
||||||
|
newVersion := currentVersion + 1
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO config_values (key, scope, value, version, updated_at)
|
||||||
|
VALUES ($1, $2, $3, $4, now())
|
||||||
|
ON CONFLICT (key, scope) DO UPDATE SET value = $3, version = $4, updated_at = now()
|
||||||
|
`, key, scope, value, newVersion); err != nil {
|
||||||
|
return Value{}, fmt.Errorf("wert speichern: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO config_value_history (key, scope, value, version, changed_at)
|
||||||
|
VALUES ($1, $2, $3, $4, now())
|
||||||
|
`, key, scope, value, newVersion); err != nil {
|
||||||
|
return Value{}, fmt.Errorf("historie schreiben: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return Value{}, fmt.Errorf("transaktion committen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return Value{Key: key, Scope: scope, Value: value, Version: newVersion}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get liefert den Wert fuer GENAU EINEN Scope (kein Vorrang-Fallback) — die
|
||||||
|
// Vorrangregel (Tenant vor Global) lebt bewusst in Service.Resolve, damit
|
||||||
|
// Store rein CRUD bleibt.
|
||||||
|
func (s *Store) Get(ctx context.Context, key, scope string) (Value, error) {
|
||||||
|
var v Value
|
||||||
|
v.Key, v.Scope = key, scope
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT value, version FROM config_values WHERE key = $1 AND scope = $2
|
||||||
|
`, key, scope).Scan(&v.Value, &v.Version)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Value{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return Value{}, fmt.Errorf("wert lesen: %w", err)
|
||||||
|
}
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// History liefert die vollstaendige Versionshistorie eines (key, scope) in
|
||||||
|
// aufsteigender Reihenfolge (Akzeptanzkriterium 2 / Pruefung 3).
|
||||||
|
func (s *Store) History(ctx context.Context, key, scope string) ([]HistoryEntry, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT key, scope, value, version FROM config_value_history
|
||||||
|
WHERE key = $1 AND scope = $2 ORDER BY version
|
||||||
|
`, key, scope)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("historie abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []HistoryEntry
|
||||||
|
for rows.Next() {
|
||||||
|
var h HistoryEntry
|
||||||
|
if err := rows.Scan(&h.Key, &h.Scope, &h.Value, &h.Version); err != nil {
|
||||||
|
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, h)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
package cfgservice
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupStoreTest(t *testing.T) (*Store, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS config_values (
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
scope TEXT NOT NULL CHECK (scope <> ''),
|
||||||
|
value TEXT NOT NULL,
|
||||||
|
version INT NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (key, scope)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS config_value_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
scope TEXT NOT NULL,
|
||||||
|
value TEXT NOT NULL,
|
||||||
|
version INT NOT NULL,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM config_value_history WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM config_values WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return NewStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStore_SetIncrementsVersion(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
v1, err := store.Set(ctx, "test_key", GlobalScope, "erster-wert")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("set 1: %v", err)
|
||||||
|
}
|
||||||
|
if v1.Version != 1 {
|
||||||
|
t.Fatalf("erwartet version 1, habe %d", v1.Version)
|
||||||
|
}
|
||||||
|
|
||||||
|
v2, err := store.Set(ctx, "test_key", GlobalScope, "zweiter-wert")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("set 2: %v", err)
|
||||||
|
}
|
||||||
|
if v2.Version != 2 {
|
||||||
|
t.Fatalf("erwartet version 2, habe %d", v2.Version)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := store.Get(ctx, "test_key", GlobalScope)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get: %v", err)
|
||||||
|
}
|
||||||
|
if got.Value != "zweiter-wert" || got.Version != 2 {
|
||||||
|
t.Fatalf("aktueller wert unerwartet: %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 3: Versionierungshistorie ueber mehrere
|
||||||
|
// Aenderungen hinweg nachvollzogen.
|
||||||
|
func TestStore_HistoryTracksAllChanges(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
values := []string{"v1", "v2", "v3"}
|
||||||
|
for _, v := range values {
|
||||||
|
if _, err := store.Set(ctx, "test_history_key", GlobalScope, v); err != nil {
|
||||||
|
t.Fatalf("set %q: %v", v, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
history, err := store.History(ctx, "test_history_key", GlobalScope)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("history: %v", err)
|
||||||
|
}
|
||||||
|
if len(history) != 3 {
|
||||||
|
t.Fatalf("erwartet 3 historieneintraege, habe %d", len(history))
|
||||||
|
}
|
||||||
|
for i, h := range history {
|
||||||
|
if h.Version != i+1 || h.Value != values[i] {
|
||||||
|
t.Fatalf("historieneintrag[%d] unerwartet: %+v", i, h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStore_GetUnknownKeyReturnsNotFound(t *testing.T) {
|
||||||
|
store, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.Get(ctx, "test_nie_gesetzt", GlobalScope); !errors.Is(err, ErrNotFound) {
|
||||||
|
t.Fatalf("erwartet ErrNotFound, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,207 @@
|
|||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*TemplateStore, *InAppStore, 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 notification_templates (
|
||||||
|
tenant_slug TEXT NOT NULL, key TEXT NOT NULL, subject TEXT NOT NULL, body TEXT NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (tenant_slug, key)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS in_app_notifications (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), tenant_slug TEXT NOT NULL, user_id TEXT NOT NULL,
|
||||||
|
title TEXT NOT NULL, body TEXT NOT NULL, read_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS notification_jobs (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), channel TEXT NOT NULL, recipient TEXT NOT NULL,
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb, status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending','sent','failed')),
|
||||||
|
attempts INT NOT NULL DEFAULT 0, max_attempts INT NOT NULL DEFAULT 5,
|
||||||
|
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(), last_error TEXT,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewTemplateStore(pool), NewInAppStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func uniqueKey(prefix string) string {
|
||||||
|
return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: Vorlagenrendering mit fehlenden
|
||||||
|
// Platzhaltern bricht kontrolliert ab.
|
||||||
|
func TestRender_MissingPlaceholderAborts(t *testing.T) {
|
||||||
|
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
||||||
|
|
||||||
|
_, _, err := Render(tmpl, map[string]any{"name": "Alice"}) // "code" fehlt
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei fehlendem platzhalter 'code'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRender_SucceedsWithAllPlaceholders(t *testing.T) {
|
||||||
|
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
||||||
|
|
||||||
|
subject, body, err := Render(tmpl, map[string]any{"name": "Alice", "code": "1234"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("render: %v", err)
|
||||||
|
}
|
||||||
|
if subject != "Hallo Alice" || body != "Dein Code: 1234" {
|
||||||
|
t.Fatalf("unerwartet: subject=%q body=%q", subject, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Vorlagen pro Tenant anpassbar, Fallback auf global.
|
||||||
|
func TestTemplateStore_TenantOverrideFallsBackToGlobal(t *testing.T) {
|
||||||
|
templates, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
key := uniqueKey("welcome")
|
||||||
|
if err := templates.Set(ctx, GlobalTemplateScope, key, "Willkommen", "Standardtext"); err != nil {
|
||||||
|
t.Fatalf("set global: %v", err)
|
||||||
|
}
|
||||||
|
if err := templates.Set(ctx, "acme", key, "Willkommen bei ACME", "ACME-Text"); err != nil {
|
||||||
|
t.Fatalf("set tenant: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := templates.Resolve(ctx, "acme", key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve acme: %v", err)
|
||||||
|
}
|
||||||
|
if got.Subject != "Willkommen bei ACME" {
|
||||||
|
t.Fatalf("erwartet tenant-vorlage, habe %q", got.Subject)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err = templates.Resolve(ctx, "globex", key) // hat keine eigene vorlage
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve globex: %v", err)
|
||||||
|
}
|
||||||
|
if got.Subject != "Willkommen" {
|
||||||
|
t.Fatalf("erwartet global-fallback, habe %q", got.Subject)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: als gelesen markiert wird korrekt gefuehrt.
|
||||||
|
func TestInAppStore_MarkReadIsReflectedCorrectly(t *testing.T) {
|
||||||
|
_, inApp, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
userID := uniqueKey("user")
|
||||||
|
id, err := inApp.Create(ctx, "acme", userID, "Titel", "Text")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
list, err := inApp.ListForUser(ctx, "acme", userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list (vor markierung): %v", err)
|
||||||
|
}
|
||||||
|
if len(list) != 1 || list[0].ReadAt != nil {
|
||||||
|
t.Fatalf("erwartet 1 ungelesene benachrichtigung, habe %+v", list)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := inApp.MarkRead(ctx, id); err != nil {
|
||||||
|
t.Fatalf("mark read: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
list, err = inApp.ListForUser(ctx, "acme", userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list (nach markierung): %v", err)
|
||||||
|
}
|
||||||
|
if len(list) != 1 || list[0].ReadAt == nil {
|
||||||
|
t.Fatalf("erwartet als gelesen markiert, habe %+v", list)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// EmailSender bricht ab, BEVOR SMTP ueberhaupt kontaktiert wird, wenn keine
|
||||||
|
// Vorlage aufloesbar ist — Nachweis, dass der Abbruch vor dem Netzwerkzugriff
|
||||||
|
// erfolgt (Akzeptanzkriterium 1).
|
||||||
|
func TestEmailSender_AbortsBeforeSMTPWhenTemplateMissing(t *testing.T) {
|
||||||
|
templates, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
||||||
|
|
||||||
|
err := sender.Send(ctx, notify.Notification{
|
||||||
|
Recipient: "user@example.com",
|
||||||
|
Payload: map[string]any{"template_key": uniqueKey("nie_konfiguriert"), "tenant_slug": "acme"},
|
||||||
|
})
|
||||||
|
if !errors.Is(err, ErrTemplateNotFound) {
|
||||||
|
t.Fatalf("erwartet ErrTemplateNotFound (kein smtp-versuch), habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: E-Mail-Versand bei nicht erreichbarem
|
||||||
|
// SMTP-Server loest das dokumentierte Retry-Verhalten ueber CFG-02 aus.
|
||||||
|
func TestEmailSender_TriggersDispatcherRetryOnUnreachableSMTP(t *testing.T) {
|
||||||
|
templates, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
key := uniqueKey("retry_test")
|
||||||
|
if err := templates.Set(ctx, GlobalTemplateScope, key, "Betreff", "Text ohne Platzhalter"); err != nil {
|
||||||
|
t.Fatalf("set template: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
||||||
|
dispatcher := notify.NewDispatcher(pool).WithRetryPolicy(2, time.Millisecond)
|
||||||
|
|
||||||
|
jobID, err := dispatcher.Enqueue(ctx, "email", "user@example.com", map[string]any{"template_key": key, "tenant_slug": "acme"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
time.Sleep(5 * time.Millisecond)
|
||||||
|
if _, _, err := dispatcher.ProcessDue(ctx, sender, 10); err != nil {
|
||||||
|
t.Fatalf("process due %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var status string
|
||||||
|
var attempts int
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, jobID).Scan(&status, &attempts); err != nil {
|
||||||
|
t.Fatalf("status lesen: %v", err)
|
||||||
|
}
|
||||||
|
if status != "failed" {
|
||||||
|
t.Fatalf("erwartet status failed nach ausgeschoepften wiederholungen bei unerreichbarem smtp, habe %q", status)
|
||||||
|
}
|
||||||
|
if attempts != 2 {
|
||||||
|
t.Fatalf("erwartet 2 versuche, habe %d", attempts)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/smtp"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
// EmailSender implementiert notify.Sender fuer den E-Mail-Kanal
|
||||||
|
// (Akzeptanzkriterium 1). SMTP-Zugangsdaten kommen ausschliesslich aus
|
||||||
|
// Umgebungsvariablen, nie aus Code/DB.
|
||||||
|
type EmailSender struct {
|
||||||
|
templates *TemplateStore
|
||||||
|
host string
|
||||||
|
port string
|
||||||
|
from string
|
||||||
|
username string
|
||||||
|
password string
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewEmailSenderFromEnv liest NEXARCH_SMTP_HOST/PORT/FROM (Pflicht) sowie
|
||||||
|
// optional NEXARCH_SMTP_USER/PASSWORD.
|
||||||
|
func NewEmailSenderFromEnv(templates *TemplateStore) (*EmailSender, error) {
|
||||||
|
host := os.Getenv("NEXARCH_SMTP_HOST")
|
||||||
|
port := os.Getenv("NEXARCH_SMTP_PORT")
|
||||||
|
from := os.Getenv("NEXARCH_SMTP_FROM")
|
||||||
|
if host == "" || port == "" || from == "" {
|
||||||
|
return nil, fmt.Errorf("channels: NEXARCH_SMTP_HOST/PORT/FROM muessen gesetzt sein")
|
||||||
|
}
|
||||||
|
return &EmailSender{
|
||||||
|
templates: templates,
|
||||||
|
host: host,
|
||||||
|
port: port,
|
||||||
|
from: from,
|
||||||
|
username: os.Getenv("NEXARCH_SMTP_USER"),
|
||||||
|
password: os.Getenv("NEXARCH_SMTP_PASSWORD"),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewEmailSender erlaubt Tests, Host/Port explizit zu setzen (z.B. einen
|
||||||
|
// absichtlich nicht erreichbaren Host fuer den Retry-Nachweis), ohne
|
||||||
|
// Umgebungsvariablen zu benoetigen.
|
||||||
|
func NewEmailSender(templates *TemplateStore, host, port, from string) *EmailSender {
|
||||||
|
return &EmailSender{templates: templates, host: host, port: port, from: from}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send rendert zuerst die Vorlage — schlaegt das fehl (z.B. fehlender
|
||||||
|
// Platzhalter), wird NIE eine SMTP-Verbindung aufgebaut
|
||||||
|
// (Akzeptanzkriterium 1 / Pruefung 1: kontrollierter Abbruch statt
|
||||||
|
// fehlerhafter Mail). Ein danach fehlschlagender SMTP-Versand liefert einen
|
||||||
|
// Fehler zurueck, den CFG-02s Dispatcher fuer die bereits getestete
|
||||||
|
// Wiederholungslogik nutzt (Akzeptanzkriterium 3 / Pruefung 3) — kein
|
||||||
|
// zweiter Retry-Mechanismus hier.
|
||||||
|
func (e *EmailSender) Send(ctx context.Context, n notify.Notification) error {
|
||||||
|
templateKey, _ := n.Payload["template_key"].(string)
|
||||||
|
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
||||||
|
|
||||||
|
tmpl, err := e.templates.Resolve(ctx, tenantSlug, templateKey)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("vorlage aufloesen: %w", err)
|
||||||
|
}
|
||||||
|
subject, body, err := Render(tmpl, n.Payload)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
msg := []byte("Subject: " + subject + "\r\n\r\n" + body)
|
||||||
|
|
||||||
|
var auth smtp.Auth
|
||||||
|
if e.username != "" {
|
||||||
|
auth = smtp.PlainAuth("", e.username, e.password, e.host)
|
||||||
|
}
|
||||||
|
addr := e.host + ":" + e.port
|
||||||
|
if err := smtp.SendMail(addr, auth, e.from, []string{n.Recipient}, msg); err != nil {
|
||||||
|
return fmt.Errorf("smtp-versand fehlgeschlagen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
type InAppNotification struct {
|
||||||
|
ID string
|
||||||
|
TenantSlug string
|
||||||
|
UserID string
|
||||||
|
Title string
|
||||||
|
Body string
|
||||||
|
ReadAt *time.Time
|
||||||
|
CreatedAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// InAppStore persistiert In-App-Benachrichtigungen (Akzeptanzkriterium 2).
|
||||||
|
type InAppStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewInAppStore(pool *pgxpool.Pool) *InAppStore {
|
||||||
|
return &InAppStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *InAppStore) Create(ctx context.Context, tenantSlug, userID, title, body string) (string, error) {
|
||||||
|
var id string
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO in_app_notifications (tenant_slug, user_id, title, body)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING id
|
||||||
|
`, tenantSlug, userID, title, body).Scan(&id)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("in-app-benachrichtigung speichern: %w", err)
|
||||||
|
}
|
||||||
|
return id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListForUser liefert alle Benachrichtigungen eines Benutzers (ueber API
|
||||||
|
// abrufbar, Akzeptanzkriterium 2).
|
||||||
|
func (s *InAppStore) ListForUser(ctx context.Context, tenantSlug, userID string) ([]InAppNotification, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT id, title, body, read_at, created_at FROM in_app_notifications
|
||||||
|
WHERE tenant_slug = $1 AND user_id = $2 ORDER BY created_at DESC
|
||||||
|
`, tenantSlug, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("benachrichtigungen auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []InAppNotification
|
||||||
|
for rows.Next() {
|
||||||
|
n := InAppNotification{TenantSlug: tenantSlug, UserID: userID}
|
||||||
|
if err := rows.Scan(&n.ID, &n.Title, &n.Body, &n.ReadAt, &n.CreatedAt); err != nil {
|
||||||
|
return nil, fmt.Errorf("benachrichtigung lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, n)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarkRead markiert eine Benachrichtigung als gelesen (Akzeptanzkriterium 2
|
||||||
|
// / Pruefung 2).
|
||||||
|
func (s *InAppStore) MarkRead(ctx context.Context, id string) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `UPDATE in_app_notifications SET read_at = now() WHERE id = $1`, id)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("als gelesen markieren: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
// InAppSender implementiert notify.Sender fuer den In-App-Kanal
|
||||||
|
// (Akzeptanzkriterium 2). Nutzt eine Vorlage, falls payload["template_key"]
|
||||||
|
// gesetzt ist, sonst direkt payload["title"]/["body"].
|
||||||
|
type InAppSender struct {
|
||||||
|
store *InAppStore
|
||||||
|
templates *TemplateStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewInAppSender(store *InAppStore, templates *TemplateStore) *InAppSender {
|
||||||
|
return &InAppSender{store: store, templates: templates}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *InAppSender) Send(ctx context.Context, n notify.Notification) error {
|
||||||
|
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
||||||
|
|
||||||
|
var title, body string
|
||||||
|
if templateKey, ok := n.Payload["template_key"].(string); ok && templateKey != "" {
|
||||||
|
tmpl, err := s.templates.Resolve(ctx, tenantSlug, templateKey)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
title, body, err = Render(tmpl, n.Payload)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
title, _ = n.Payload["title"].(string)
|
||||||
|
body, _ = n.Payload["body"].(string)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := s.store.Create(ctx, tenantSlug, n.Recipient, title, body)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Router waehlt anhand von Notification.Channel den zustaendigen Kanal aus
|
||||||
|
// — ein neuer Kanal wird per Register() ergaenzt, ohne den Dispatcher
|
||||||
|
// (CFG-02) oder Router selbst umzubauen (Unleash-artiger Strategie-Gedanke,
|
||||||
|
// siehe Ticket-DNA).
|
||||||
|
type Router struct {
|
||||||
|
channels map[string]notify.Sender
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRouter() *Router {
|
||||||
|
return &Router{channels: make(map[string]notify.Sender)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Router) Register(channel string, sender notify.Sender) {
|
||||||
|
r.channels[channel] = sender
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Router) Send(ctx context.Context, n notify.Notification) error {
|
||||||
|
sender, ok := r.channels[n.Channel]
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("channels: unbekannter kanal %q", n.Channel)
|
||||||
|
}
|
||||||
|
return sender.Send(ctx, n)
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
// Package channels implementiert Core CFG-03: konkrete Zustellkanaele fuer
|
||||||
|
// den CFG-02-Dispatcher (E-Mail, In-App) inklusive Vorlagenverwaltung.
|
||||||
|
// Neue Kanaele lassen sich ergaenzen, ohne den Dispatcher selbst
|
||||||
|
// anzufassen — jeder Kanal implementiert nur notify.Sender.
|
||||||
|
package channels
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"text/template"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GlobalTemplateScope ist der Fallback-Wert, wenn ein Tenant keine eigene
|
||||||
|
// Vorlage konfiguriert hat (Akzeptanzkriterium 3).
|
||||||
|
const GlobalTemplateScope = "global"
|
||||||
|
|
||||||
|
var ErrTemplateNotFound = errors.New("channels: keine vorlage gefunden")
|
||||||
|
|
||||||
|
type Template struct {
|
||||||
|
Subject string
|
||||||
|
Body string
|
||||||
|
}
|
||||||
|
|
||||||
|
type TemplateStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTemplateStore(pool *pgxpool.Pool) *TemplateStore {
|
||||||
|
return &TemplateStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set legt eine Vorlage fuer einen Tenant (oder GlobalTemplateScope) fest.
|
||||||
|
func (s *TemplateStore) Set(ctx context.Context, tenantSlug, key, subject, body string) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO notification_templates (tenant_slug, key, subject, body, updated_at)
|
||||||
|
VALUES ($1, $2, $3, $4, now())
|
||||||
|
ON CONFLICT (tenant_slug, key) DO UPDATE SET subject = $3, body = $4, updated_at = now()
|
||||||
|
`, tenantSlug, key, subject, body)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("vorlage speichern: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve liefert die Vorlage eines Tenants, faellt auf GlobalTemplateScope
|
||||||
|
// zurueck, wenn der Tenant keine eigene gesetzt hat (Akzeptanzkriterium 3).
|
||||||
|
func (s *TemplateStore) Resolve(ctx context.Context, tenantSlug, key string) (Template, error) {
|
||||||
|
if tenantSlug != "" && tenantSlug != GlobalTemplateScope {
|
||||||
|
if t, err := s.get(ctx, tenantSlug, key); err == nil {
|
||||||
|
return t, nil
|
||||||
|
} else if !errors.Is(err, ErrTemplateNotFound) {
|
||||||
|
return Template{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s.get(ctx, GlobalTemplateScope, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *TemplateStore) get(ctx context.Context, tenantSlug, key string) (Template, error) {
|
||||||
|
var t Template
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT subject, body FROM notification_templates WHERE tenant_slug = $1 AND key = $2
|
||||||
|
`, tenantSlug, key).Scan(&t.Subject, &t.Body)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Template{}, ErrTemplateNotFound
|
||||||
|
}
|
||||||
|
return Template{}, fmt.Errorf("vorlage lesen: %w", err)
|
||||||
|
}
|
||||||
|
return t, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Render fuellt eine Vorlage mit data. Fehlt ein referenzierter Platzhalter
|
||||||
|
// in data, bricht das Rendering kontrolliert MIT FEHLER ab, statt eine
|
||||||
|
// fehlerhafte/unvollstaendige Nachricht zu erzeugen (Akzeptanzkriterium 1 /
|
||||||
|
// Pruefung 1) — text/template mit Option("missingkey=error") liefert dafuer
|
||||||
|
// einen Fehler statt stillschweigend "<no value>" einzusetzen.
|
||||||
|
func Render(tmpl Template, data map[string]any) (subject, body string, err error) {
|
||||||
|
subject, err = renderOne("subject", tmpl.Subject, data)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
body, err = renderOne("body", tmpl.Body, data)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
return subject, body, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func renderOne(name, text string, data map[string]any) (string, error) {
|
||||||
|
tmpl, err := template.New(name).Option("missingkey=error").Parse(text)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("vorlage %q parsen: %w", name, err)
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := tmpl.Execute(&buf, data); err != nil {
|
||||||
|
return "", fmt.Errorf("vorlage %q rendern (fehlender platzhalter?): %w", name, err)
|
||||||
|
}
|
||||||
|
return buf.String(), nil
|
||||||
|
}
|
||||||
@@ -50,6 +50,29 @@ func (s *Store) Set(ctx context.Context, f Flag) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// List liefert alle definierten Flags (Admin-Uebersicht, siehe LIC-04) —
|
||||||
|
// rein additiv, aendert nichts am bestehenden Verhalten von Set/Get.
|
||||||
|
func (s *Store) List(ctx context.Context) ([]Flag, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT key, enabled, rollout_percentage, target_tenant_slugs
|
||||||
|
FROM feature_flags ORDER BY key
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("flags auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Flag
|
||||||
|
for rows.Next() {
|
||||||
|
var f Flag
|
||||||
|
if err := rows.Scan(&f.Key, &f.Enabled, &f.RolloutPercentage, &f.TargetTenantSlugs); err != nil {
|
||||||
|
return nil, fmt.Errorf("flag-zeile lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, f)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Store) Get(ctx context.Context, key string) (Flag, error) {
|
func (s *Store) Get(ctx context.Context, key string) (Flag, error) {
|
||||||
var f Flag
|
var f Flag
|
||||||
row := s.pool.QueryRow(ctx, `
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DatabaseChecker prueft die tatsaechliche Erreichbarkeit der Datenbank
|
||||||
|
// (Ping) — nicht nur, ob der Pool existiert.
|
||||||
|
func DatabaseChecker(pool *pgxpool.Pool) CheckerFunc {
|
||||||
|
return func(ctx context.Context) error {
|
||||||
|
return pool.Ping(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueueChecker prueft, dass die Postgres-basierte Job-Queue (siehe CFG-02)
|
||||||
|
// tatsaechlich abfragbar ist — eine eigene, benannte Abhaengigkeit neben der
|
||||||
|
// reinen DB-Erreichbarkeit (Akzeptanzkriterium 1).
|
||||||
|
func QueueChecker(pool *pgxpool.Pool) CheckerFunc {
|
||||||
|
return func(ctx context.Context) error {
|
||||||
|
_, err := pool.Exec(ctx, `SELECT 1`)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LivenessHandler beantwortet IMMER "lebt", solange der Prozess ueberhaupt
|
||||||
|
// HTTP-Anfragen verarbeiten kann — prueft bewusst KEINE externen
|
||||||
|
// Abhaengigkeiten (Akzeptanzkriterium 2: Liveness und Readiness getrennt).
|
||||||
|
// Ein Datenbankausfall darf die Liveness nicht auf "tot" setzen, sonst
|
||||||
|
// wuerde eine Orchestrierung (z.B. systemd/Kubernetes) den Prozess grundlos
|
||||||
|
// neu starten, obwohl nur eine Abhaengigkeit ausgefallen ist.
|
||||||
|
func LivenessHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
writeStatus(w, http.StatusOK, map[string]any{"status": "alive"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadinessHandler prueft ALLE registrierten Abhaengigkeiten
|
||||||
|
// (Akzeptanzkriterium 1) und liefert 503, sobald eine davon fehlschlaegt
|
||||||
|
// (Akzeptanzkriterium 3) — unterscheidet sich damit nachweislich von
|
||||||
|
// LivenessHandler im Fehlerfall (Akzeptanzkriterium 2 / Pruefung 3).
|
||||||
|
func (r *Registry) ReadinessHandler() http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
ready, results := r.CheckAll(req.Context())
|
||||||
|
|
||||||
|
body := map[string]any{
|
||||||
|
"status": statusText(ready),
|
||||||
|
"checks": results,
|
||||||
|
}
|
||||||
|
status := http.StatusOK
|
||||||
|
if !ready {
|
||||||
|
status = http.StatusServiceUnavailable
|
||||||
|
}
|
||||||
|
writeStatus(w, status, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func statusText(ready bool) string {
|
||||||
|
if ready {
|
||||||
|
return "ready"
|
||||||
|
}
|
||||||
|
return "not_ready"
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeStatus(w http.ResponseWriter, status int, body map[string]any) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
_ = json.NewEncoder(w).Encode(body)
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
// Package health implementiert Core OPS-01: Health-/Readiness-Endpunkte, die
|
||||||
|
// echte Abhaengigkeiten (DB, Job-Queue) statt nur den Prozessstatus pruefen
|
||||||
|
// — wiederverwendbar von Core UND jedem registrierten Modul (siehe API-02),
|
||||||
|
// nicht nur von Core selbst.
|
||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Checker prueft EINE Abhaengigkeit (z.B. Datenbank, Job-Queue).
|
||||||
|
type Checker interface {
|
||||||
|
Check(ctx context.Context) error
|
||||||
|
}
|
||||||
|
|
||||||
|
type CheckerFunc func(ctx context.Context) error
|
||||||
|
|
||||||
|
func (f CheckerFunc) Check(ctx context.Context) error { return f(ctx) }
|
||||||
|
|
||||||
|
// DefaultCheckTimeout begrenzt, wie lange EIN einzelner Check maximal
|
||||||
|
// dauern darf, bevor er als fehlgeschlagen gilt — verhindert, dass ein
|
||||||
|
// haengender Check den gesamten Readiness-Endpunkt blockiert
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 2: Antwort innerhalb definierter Zeit).
|
||||||
|
const DefaultCheckTimeout = 2 * time.Second
|
||||||
|
|
||||||
|
// Registry haelt alle benannten Checks eines Dienstes.
|
||||||
|
type Registry struct {
|
||||||
|
checks map[string]Checker
|
||||||
|
timeout time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRegistry() *Registry {
|
||||||
|
return &Registry{checks: make(map[string]Checker), timeout: DefaultCheckTimeout}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Registry) WithTimeout(d time.Duration) *Registry {
|
||||||
|
return &Registry{checks: r.checks, timeout: d}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register fuegt einen benannten Check hinzu (z.B. "database", "queue").
|
||||||
|
func (r *Registry) Register(name string, c Checker) {
|
||||||
|
r.checks[name] = c
|
||||||
|
}
|
||||||
|
|
||||||
|
// Result ist der Ausgang eines einzelnen Checks.
|
||||||
|
type Result struct {
|
||||||
|
OK bool
|
||||||
|
Error string
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckAll fuehrt alle registrierten Checks NEBENLAEUFIG mit je eigenem
|
||||||
|
// Timeout aus (Akzeptanzkriterium 1: echte Abhaengigkeiten statt Prozess-
|
||||||
|
// status) und liefert ready=false, sobald irgendein Check fehlschlaegt
|
||||||
|
// (Akzeptanzkriterium 3: ein Ausfall wird sichtbar).
|
||||||
|
func (r *Registry) CheckAll(ctx context.Context) (ready bool, results map[string]Result) {
|
||||||
|
type namedResult struct {
|
||||||
|
name string
|
||||||
|
result Result
|
||||||
|
}
|
||||||
|
ch := make(chan namedResult, len(r.checks))
|
||||||
|
|
||||||
|
for name, checker := range r.checks {
|
||||||
|
go func(name string, checker Checker) {
|
||||||
|
checkCtx, cancel := context.WithTimeout(ctx, r.timeout)
|
||||||
|
defer cancel()
|
||||||
|
err := checker.Check(checkCtx)
|
||||||
|
if err != nil {
|
||||||
|
ch <- namedResult{name, Result{OK: false, Error: err.Error()}}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ch <- namedResult{name, Result{OK: true}}
|
||||||
|
}(name, checker)
|
||||||
|
}
|
||||||
|
|
||||||
|
results = make(map[string]Result, len(r.checks))
|
||||||
|
ready = true
|
||||||
|
for i := 0; i < len(r.checks); i++ {
|
||||||
|
nr := <-ch
|
||||||
|
results[nr.name] = nr.result
|
||||||
|
if !nr.result.OK {
|
||||||
|
ready = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ready, results
|
||||||
|
}
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: simulierter Datenbankausfall fuehrt zu
|
||||||
|
// "nicht bereit".
|
||||||
|
func TestReadinessHandler_ReportsNotReadyOnDatabaseFailure(t *testing.T) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
// Datenbankausfall simulieren: Pool sofort schliessen, bevor der Check laeuft.
|
||||||
|
pool.Close()
|
||||||
|
|
||||||
|
reg := NewRegistry()
|
||||||
|
reg.Register("database", DatabaseChecker(pool))
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
reg.ReadinessHandler()(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Fatalf("status = %d, want 503 bei db-ausfall", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
var body struct {
|
||||||
|
Status string `json:"status"`
|
||||||
|
Checks map[string]interface{} `json:"checks"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil {
|
||||||
|
t.Fatalf("body parsen: %v", err)
|
||||||
|
}
|
||||||
|
if body.Status != "not_ready" {
|
||||||
|
t.Fatalf("status-feld = %q, want not_ready", body.Status)
|
||||||
|
}
|
||||||
|
if _, ok := body.Checks["database"]; !ok {
|
||||||
|
t.Fatal("erwartet 'database' im checks-ergebnis")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadinessHandler_ReportsReadyWhenAllChecksPass(t *testing.T) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
reg := NewRegistry()
|
||||||
|
reg.Register("database", DatabaseChecker(pool))
|
||||||
|
reg.Register("queue", QueueChecker(pool))
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
reg.ReadinessHandler()(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200 bei funktionierenden abhaengigkeiten", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 3: Liveness und Readiness unterscheiden
|
||||||
|
// sich nachweislich im Fehlerfall.
|
||||||
|
func TestLivenessAndReadiness_DifferOnDatabaseFailure(t *testing.T) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
pool.Close() // db-ausfall simulieren
|
||||||
|
|
||||||
|
reg := NewRegistry()
|
||||||
|
reg.Register("database", DatabaseChecker(pool))
|
||||||
|
|
||||||
|
livenessRec := httptest.NewRecorder()
|
||||||
|
LivenessHandler(livenessRec, httptest.NewRequest(http.MethodGet, "/livez", nil))
|
||||||
|
if livenessRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("liveness status = %d, want 200 trotz db-ausfall (liveness prueft keine abhaengigkeiten)", livenessRec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
readinessRec := httptest.NewRecorder()
|
||||||
|
reg.ReadinessHandler()(readinessRec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
|
||||||
|
if readinessRec.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Fatalf("readiness status = %d, want 503 bei db-ausfall", readinessRec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
if livenessRec.Code == readinessRec.Code {
|
||||||
|
t.Fatal("liveness und readiness sollten sich im db-ausfall-fall unterscheiden")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: Health-Endpunkt antwortet auch bei
|
||||||
|
// haengendem Check innerhalb definierter Zeit (Timeout begrenzt die Dauer).
|
||||||
|
func TestReadinessHandler_RespondsWithinTimeoutEvenWithHangingCheck(t *testing.T) {
|
||||||
|
reg := NewRegistry().WithTimeout(50 * time.Millisecond)
|
||||||
|
reg.Register("haengender_dienst", CheckerFunc(func(ctx context.Context) error {
|
||||||
|
select {
|
||||||
|
case <-time.After(10 * time.Second): // wuerde ohne timeout ewig blockieren
|
||||||
|
return nil
|
||||||
|
case <-ctx.Done():
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
reg.ReadinessHandler()(rec, req)
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
|
||||||
|
if elapsed > time.Second {
|
||||||
|
t.Fatalf("readiness handler brauchte %s, erwartet deutlich unter 1s durch timeout", elapsed)
|
||||||
|
}
|
||||||
|
if rec.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Fatalf("status = %d, want 503 fuer haengenden/timeout-check", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheckAll_MultipleChecksRunConcurrently(t *testing.T) {
|
||||||
|
reg := NewRegistry().WithTimeout(time.Second)
|
||||||
|
reg.Register("a", CheckerFunc(func(ctx context.Context) error { return nil }))
|
||||||
|
reg.Register("b", CheckerFunc(func(ctx context.Context) error { return errors.New("kaputt") }))
|
||||||
|
|
||||||
|
ready, results := reg.CheckAll(context.Background())
|
||||||
|
if ready {
|
||||||
|
t.Fatal("erwartet ready=false, da 'b' fehlschlaegt")
|
||||||
|
}
|
||||||
|
if !results["a"].OK {
|
||||||
|
t.Fatalf("erwartet 'a' ok, habe %+v", results["a"])
|
||||||
|
}
|
||||||
|
if results["b"].OK || results["b"].Error == "" {
|
||||||
|
t.Fatalf("erwartet 'b' fehlgeschlagen mit fehlertext, habe %+v", results["b"])
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
// Package license implementiert Core LIC-01: Lizenzmodell je Tenant (Plan,
|
||||||
|
// Modul-Umfang, Laufzeit) und die kryptographische Pruefung signierter
|
||||||
|
// Lizenzschluessel. Feature-Flag-AUSWERTUNG zur Laufzeit (LIC-02) und die
|
||||||
|
// Verwaltungsoberflaeche (LIC-04) sind ausdruecklich nicht Teil dieses Pakets
|
||||||
|
// — hier geht es nur um Ausstellung/Validierung/Persistenz (Unleash-Vorbild:
|
||||||
|
// klare Trennung Flag-Verwaltung vs. Flag-Auswertung).
|
||||||
|
package license
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ed25519"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrInvalidSignature = errors.New("license: signatur ungueltig")
|
||||||
|
ErrMalformedKey = errors.New("license: lizenzschluessel hat ungueltiges format")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Payload ist der signierte Lizenzinhalt (Akzeptanzkriterium 3: Plan,
|
||||||
|
// Modul-Liste, Laufzeit).
|
||||||
|
type Payload struct {
|
||||||
|
TenantSlug string `json:"tenant_slug"`
|
||||||
|
Plan string `json:"plan"`
|
||||||
|
Modules []string `json:"modules"`
|
||||||
|
IssuedAt time.Time `json:"issued_at"`
|
||||||
|
ValidUntil time.Time `json:"valid_until"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issuer stellt signierte Lizenzschluessel aus. Haelt den PRIVATEN
|
||||||
|
// Ed25519-Schluessel — lebt in der Praxis beim Lizenzgeber, nicht im
|
||||||
|
// laufenden Core-Prozess (der nur den Validator mit dem oeffentlichen
|
||||||
|
// Schluessel braucht).
|
||||||
|
type Issuer struct {
|
||||||
|
priv ed25519.PrivateKey
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIssuer(priv ed25519.PrivateKey) *Issuer {
|
||||||
|
return &Issuer{priv: priv}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue liefert den Lizenzschluessel im Format base64(payload-json) "." base64(signatur).
|
||||||
|
func (i *Issuer) Issue(payload Payload) (string, error) {
|
||||||
|
raw, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("payload serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
sig := ed25519.Sign(i.priv, raw)
|
||||||
|
|
||||||
|
return base64.RawURLEncoding.EncodeToString(raw) + "." + base64.RawURLEncoding.EncodeToString(sig), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validator prueft Lizenzschluessel gegen den OEFFENTLICHEN Ed25519-Schluessel
|
||||||
|
// — das ist alles, was der laufende Core-Prozess kennen muss.
|
||||||
|
type Validator struct {
|
||||||
|
pub ed25519.PublicKey
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewValidator(pub ed25519.PublicKey) *Validator {
|
||||||
|
return &Validator{pub: pub}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse prueft die Signatur (Akzeptanzkriterium 1 / Pruefung 1) und liefert
|
||||||
|
// bei Erfolg den entschluesselten Payload. Ein manipulierter Schluessel wird
|
||||||
|
// hier zuverlaessig erkannt, unabhaengig davon, ob die Laufzeit noch gueltig
|
||||||
|
// waere — Signaturpruefung und Ablaufpruefung sind bewusst getrennt
|
||||||
|
// (Signatur bei Einspielen, Ablauf bei jeder Nutzung, siehe Store.RequireActive).
|
||||||
|
func (v *Validator) Parse(key string) (Payload, error) {
|
||||||
|
rawPart, sigPart, ok := splitOnce(key, '.')
|
||||||
|
if !ok {
|
||||||
|
return Payload{}, ErrMalformedKey
|
||||||
|
}
|
||||||
|
|
||||||
|
raw, err := base64.RawURLEncoding.DecodeString(rawPart)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, ErrMalformedKey
|
||||||
|
}
|
||||||
|
sig, err := base64.RawURLEncoding.DecodeString(sigPart)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, ErrMalformedKey
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ed25519.Verify(v.pub, raw, sig) {
|
||||||
|
return Payload{}, ErrInvalidSignature
|
||||||
|
}
|
||||||
|
|
||||||
|
var p Payload
|
||||||
|
if err := json.Unmarshal(raw, &p); err != nil {
|
||||||
|
// Signatur war gueltig, aber Payload nicht mehr parsebar — sollte bei
|
||||||
|
// unveraenderten Schluesseln nie vorkommen, trotzdem kein Panic.
|
||||||
|
return Payload{}, fmt.Errorf("%w: payload nicht lesbar", ErrMalformedKey)
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitOnce(s string, sep byte) (before, after string, ok bool) {
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
if s[i] == sep {
|
||||||
|
return s[:i], s[i+1:], true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", "", false
|
||||||
|
}
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
package license
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func testKeyPair(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
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIssueAndParse_RoundTrip(t *testing.T) {
|
||||||
|
pub, priv := testKeyPair(t)
|
||||||
|
issuer := NewIssuer(priv)
|
||||||
|
validator := NewValidator(pub)
|
||||||
|
|
||||||
|
payload := Payload{
|
||||||
|
TenantSlug: "acme",
|
||||||
|
Plan: "pro",
|
||||||
|
Modules: []string{"dms", "mail"},
|
||||||
|
IssuedAt: time.Now().Truncate(time.Second),
|
||||||
|
ValidUntil: time.Now().Add(365 * 24 * time.Hour).Truncate(time.Second),
|
||||||
|
}
|
||||||
|
|
||||||
|
key, err := issuer.Issue(payload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := validator.Parse(key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if got.TenantSlug != payload.TenantSlug || got.Plan != payload.Plan || len(got.Modules) != 2 {
|
||||||
|
t.Fatalf("payload nach parse unerwartet: %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: manipulierter Schluessel wird zuverlaessig erkannt.
|
||||||
|
func TestParse_RejectsTamperedKey(t *testing.T) {
|
||||||
|
pub, priv := testKeyPair(t)
|
||||||
|
issuer := NewIssuer(priv)
|
||||||
|
validator := NewValidator(pub)
|
||||||
|
|
||||||
|
key, err := issuer.Issue(Payload{TenantSlug: "acme", Plan: "pro", ValidUntil: time.Now().Add(time.Hour)})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ein Zeichen im signierten Teil aendern.
|
||||||
|
tampered := []byte(key)
|
||||||
|
changed := false
|
||||||
|
for i, c := range tampered {
|
||||||
|
if c != '.' {
|
||||||
|
if c == 'A' {
|
||||||
|
tampered[i] = 'B'
|
||||||
|
} else {
|
||||||
|
tampered[i] = 'A'
|
||||||
|
}
|
||||||
|
changed = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !changed {
|
||||||
|
t.Fatal("testaufbau fehlerhaft: nichts zum manipulieren gefunden")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := validator.Parse(string(tampered)); !errors.Is(err, ErrInvalidSignature) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidSignature, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParse_RejectsWrongKeyPair(t *testing.T) {
|
||||||
|
_, priv := testKeyPair(t)
|
||||||
|
otherPub, _ := testKeyPair(t)
|
||||||
|
|
||||||
|
issuer := NewIssuer(priv)
|
||||||
|
validator := NewValidator(otherPub) // falscher oeffentlicher Schluessel
|
||||||
|
|
||||||
|
key, err := issuer.Issue(Payload{TenantSlug: "acme", Plan: "pro"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := validator.Parse(key); !errors.Is(err, ErrInvalidSignature) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidSignature, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParse_RejectsMalformedKey(t *testing.T) {
|
||||||
|
pub, _ := testKeyPair(t)
|
||||||
|
validator := NewValidator(pub)
|
||||||
|
|
||||||
|
cases := []string{"", "keine-punkt-trennung", "!!!.!!!"}
|
||||||
|
for _, c := range cases {
|
||||||
|
if _, err := validator.Parse(c); !errors.Is(err, ErrMalformedKey) {
|
||||||
|
t.Fatalf("Parse(%q): erwartet ErrMalformedKey, habe %v", c, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
package license
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrNoLicense = errors.New("license: kein lizenzdatensatz fuer diesen tenant")
|
||||||
|
ErrLicenseExpired = errors.New("license: lizenz abgelaufen")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Store persistiert den Lizenzumfang je Tenant in der Control-Plane-Registry
|
||||||
|
// (siehe internal/tenant.Registry — dieselbe Datenbank, aber ein eigener,
|
||||||
|
// unabhaengiger Store, um internal/tenant nicht um lizenzfremde Belange zu
|
||||||
|
// erweitern).
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
validator *Validator
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool, validator *Validator) *Store {
|
||||||
|
return &Store{pool: pool, validator: validator}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Install prueft die Signatur des Lizenzschluessels (Akzeptanzkriterium 1)
|
||||||
|
// und ersetzt den bisherigen Lizenzdatensatz des Tenants vollstaendig. Ein
|
||||||
|
// bereits abgelaufener, aber korrekt signierter Schluessel wird trotzdem
|
||||||
|
// gespeichert — der Ablauf wird erst bei der Nutzung (RequireActive)
|
||||||
|
// bewertet, nicht beim Einspielen.
|
||||||
|
func (s *Store) Install(ctx context.Context, tenantID, licenseKey string) (Payload, error) {
|
||||||
|
payload, err := s.validator.Parse(licenseKey)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO tenant_licenses (tenant_id, plan, modules, issued_at, valid_until, raw_key, installed_at)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, now())
|
||||||
|
ON CONFLICT (tenant_id) DO UPDATE SET
|
||||||
|
plan = $2, modules = $3, issued_at = $4, valid_until = $5, raw_key = $6, installed_at = now()
|
||||||
|
`, tenantID, payload.Plan, payload.Modules, payload.IssuedAt, payload.ValidUntil, licenseKey)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, fmt.Errorf("lizenz speichern: %w", err)
|
||||||
|
}
|
||||||
|
return payload, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) get(ctx context.Context, tenantID string) (Payload, error) {
|
||||||
|
var p Payload
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT plan, modules, issued_at, valid_until
|
||||||
|
FROM tenant_licenses WHERE tenant_id = $1
|
||||||
|
`, tenantID)
|
||||||
|
if err := row.Scan(&p.Plan, &p.Modules, &p.IssuedAt, &p.ValidUntil); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Payload{}, ErrNoLicense
|
||||||
|
}
|
||||||
|
return Payload{}, fmt.Errorf("lizenz lesen: %w", err)
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status liefert den persistierten Lizenzumfang unabhaengig vom Ablauf
|
||||||
|
// (Akzeptanzkriterium 3: Plan, Modul-Liste, Laufzeit abfragbar).
|
||||||
|
func (s *Store) Status(ctx context.Context, tenantID string) (Payload, error) {
|
||||||
|
return s.get(ctx, tenantID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireActive liefert den Lizenzumfang NUR, wenn die Lizenz noch nicht
|
||||||
|
// abgelaufen ist — sonst ErrLicenseExpired statt eines harten Fehlers/Panics
|
||||||
|
// (Akzeptanzkriterium 2: definierter eingeschraenkter Zustand). Aufrufende
|
||||||
|
// Module (LIC-02/03) entscheiden, was "eingeschraenkt" konkret bedeutet.
|
||||||
|
func (s *Store) RequireActive(ctx context.Context, tenantID string) (Payload, error) {
|
||||||
|
p, err := s.get(ctx, tenantID)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
if time.Now().After(p.ValidUntil) {
|
||||||
|
return Payload{}, ErrLicenseExpired
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
package license
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupStoreTest(t *testing.T) (*Store, *Issuer, 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 tenants (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
slug TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
db_name TEXT NOT NULL UNIQUE,
|
||||||
|
db_dsn TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS tenant_licenses (
|
||||||
|
tenant_id UUID PRIMARY KEY REFERENCES tenants(id),
|
||||||
|
plan TEXT NOT NULL,
|
||||||
|
modules TEXT[] NOT NULL,
|
||||||
|
issued_at TIMESTAMPTZ NOT NULL,
|
||||||
|
valid_until TIMESTAMPTZ NOT NULL,
|
||||||
|
raw_key TEXT NOT NULL,
|
||||||
|
installed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var tenantID string
|
||||||
|
if err := pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO tenants (slug, name, db_name, db_dsn)
|
||||||
|
VALUES ('lic_test_tenant', 'Lic Test', 'tenant_lic_test', 'unused')
|
||||||
|
RETURNING id
|
||||||
|
`).Scan(&tenantID); err != nil {
|
||||||
|
t.Fatalf("test-tenant anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub, priv, err := ed25519.GenerateKey(nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("schluesselpaar: %v", err)
|
||||||
|
}
|
||||||
|
issuer := NewIssuer(priv)
|
||||||
|
store := NewStore(pool, NewValidator(pub))
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM tenant_licenses WHERE tenant_id = $1`, tenantID)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM tenants WHERE id = $1`, tenantID)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return store, issuer, tenantID, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Lizenzumfang persistiert und abfragbar.
|
||||||
|
func TestStore_InstallAndStatus(t *testing.T) {
|
||||||
|
store, issuer, tenantID, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
payload := Payload{
|
||||||
|
TenantSlug: "lic_test_tenant",
|
||||||
|
Plan: "enterprise",
|
||||||
|
Modules: []string{"dms", "mail", "archive"},
|
||||||
|
IssuedAt: time.Now().Truncate(time.Second),
|
||||||
|
ValidUntil: time.Now().Add(30 * 24 * time.Hour).Truncate(time.Second),
|
||||||
|
}
|
||||||
|
key, err := issuer.Issue(payload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Install(ctx, tenantID, key); err != nil {
|
||||||
|
t.Fatalf("install: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
status, err := store.Status(ctx, tenantID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("status: %v", err)
|
||||||
|
}
|
||||||
|
if status.Plan != "enterprise" || len(status.Modules) != 3 {
|
||||||
|
t.Fatalf("status unerwartet: %+v", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStore_InstallRejectsInvalidSignature(t *testing.T) {
|
||||||
|
store, _, tenantID, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
_, otherPriv, _ := ed25519.GenerateKey(nil)
|
||||||
|
foreignIssuer := NewIssuer(otherPriv) // signiert mit falschem schluessel
|
||||||
|
|
||||||
|
key, err := foreignIssuer.Issue(Payload{TenantSlug: "lic_test_tenant", Plan: "pro", ValidUntil: time.Now().Add(time.Hour)})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Install(ctx, tenantID, key); !errors.Is(err, ErrInvalidSignature) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidSignature, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: abgelaufene Lizenz fuehrt zu definiertem
|
||||||
|
// eingeschraenktem Zustand (ErrLicenseExpired), nicht zu einem Absturz.
|
||||||
|
func TestStore_RequireActive_DetectsExpiry(t *testing.T) {
|
||||||
|
store, issuer, tenantID, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
expired := Payload{
|
||||||
|
TenantSlug: "lic_test_tenant",
|
||||||
|
Plan: "pro",
|
||||||
|
Modules: []string{"dms"},
|
||||||
|
IssuedAt: time.Now().Add(-48 * time.Hour),
|
||||||
|
ValidUntil: time.Now().Add(-24 * time.Hour), // bereits abgelaufen
|
||||||
|
}
|
||||||
|
key, err := issuer.Issue(expired)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Einspielen einer bereits abgelaufenen, aber korrekt signierten Lizenz
|
||||||
|
// muss funktionieren (Ablauf wird erst bei Nutzung bewertet).
|
||||||
|
if _, err := store.Install(ctx, tenantID, key); err != nil {
|
||||||
|
t.Fatalf("install sollte trotz ablauf funktionieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func() {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
t.Fatalf("RequireActive hat gepanict statt einen fehler zu liefern: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if _, err := store.RequireActive(ctx, tenantID); !errors.Is(err, ErrLicenseExpired) {
|
||||||
|
t.Fatalf("erwartet ErrLicenseExpired, habe %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Aber der Umfang bleibt weiterhin abfragbar (Status, im Unterschied zu RequireActive).
|
||||||
|
status, err := store.Status(ctx, tenantID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("status sollte trotz ablauf funktionieren: %v", err)
|
||||||
|
}
|
||||||
|
if status.Plan != "pro" {
|
||||||
|
t.Fatalf("status unerwartet: %+v", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStore_RequireActive_NoLicense(t *testing.T) {
|
||||||
|
store, _, tenantID, cleanup := setupStoreTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.RequireActive(ctx, tenantID); !errors.Is(err, ErrNoLicense) {
|
||||||
|
t.Fatalf("erwartet ErrNoLicense, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
// Package notify implementiert Core CFG-02: den zentralen Benachrichtigungs-
|
||||||
|
// Dispatcher, ueber den beliebige Module Benachrichtigungen ausloesen —
|
||||||
|
// Warteschlange, Wiederholungslogik, Kanal-Abstraktion. Die tatsaechlichen
|
||||||
|
// Kanaele (E-Mail/In-App) sind CFG-03, hier gibt es nur die Sender-
|
||||||
|
// Schnittstelle als Vorbereitung.
|
||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefaultMaxAttempts begrenzt Wiederholungsversuche (Akzeptanzkriterium 2) —
|
||||||
|
// nach dieser Anzahl gibt der Dispatcher kontrolliert auf (status=failed)
|
||||||
|
// statt endlos zu wiederholen.
|
||||||
|
const DefaultMaxAttempts = 5
|
||||||
|
|
||||||
|
// DefaultRetryBackoff ist die Basis-Wartezeit zwischen Wiederholungen,
|
||||||
|
// linear mit der Versuchsnummer skaliert.
|
||||||
|
const DefaultRetryBackoff = 200 * time.Millisecond
|
||||||
|
|
||||||
|
type Notification struct {
|
||||||
|
ID string
|
||||||
|
Channel string
|
||||||
|
Recipient string
|
||||||
|
Payload map[string]any
|
||||||
|
Attempts int
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sender ist die schmale Schnittstelle, die ein konkreter Kanal (CFG-03)
|
||||||
|
// implementiert. Der Dispatcher selbst weiss nichts ueber E-Mail/In-App.
|
||||||
|
type Sender interface {
|
||||||
|
Send(ctx context.Context, n Notification) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dispatcher ist die EINE Schnittstelle, ueber die Module Benachrichtigungen
|
||||||
|
// ausloesen — kein Modul baut eigenen Versandcode (Akzeptanzkriterium 1).
|
||||||
|
type Dispatcher struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
maxAttempts int
|
||||||
|
retryBackoff time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewDispatcher(pool *pgxpool.Pool) *Dispatcher {
|
||||||
|
return &Dispatcher{pool: pool, maxAttempts: DefaultMaxAttempts, retryBackoff: DefaultRetryBackoff}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithRetryPolicy erlaubt Tests/Betrieb, Versuchsanzahl und Backoff
|
||||||
|
// anzupassen, ohne die Default-Policy im Produktionscode zu veraendern.
|
||||||
|
func (d *Dispatcher) WithRetryPolicy(maxAttempts int, backoff time.Duration) *Dispatcher {
|
||||||
|
return &Dispatcher{pool: d.pool, maxAttempts: maxAttempts, retryBackoff: backoff}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enqueue reiht eine Benachrichtigung in die Postgres-Warteschlange ein und
|
||||||
|
// kehrt sofort zurueck — die Zeile ueberlebt jeden Neustart des Dispatcher-
|
||||||
|
// Prozesses unveraendert (Akzeptanzkriterium 3), da sie ausschliesslich in
|
||||||
|
// der Datenbank existiert, nicht im Prozessspeicher.
|
||||||
|
func (d *Dispatcher) Enqueue(ctx context.Context, channel, recipient string, payload map[string]any) (string, error) {
|
||||||
|
if payload == nil {
|
||||||
|
payload = map[string]any{}
|
||||||
|
}
|
||||||
|
payloadJSON, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("payload serialisieren: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var id string
|
||||||
|
err = d.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO notification_jobs (channel, recipient, payload, max_attempts)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING id
|
||||||
|
`, channel, recipient, payloadJSON, d.maxAttempts).Scan(&id)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("benachrichtigung einreihen: %w", err)
|
||||||
|
}
|
||||||
|
return id, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,219 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*pgxpool.Pool, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS notification_jobs (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
channel TEXT NOT NULL,
|
||||||
|
recipient TEXT NOT NULL,
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
||||||
|
attempts INT NOT NULL DEFAULT 0,
|
||||||
|
max_attempts INT NOT NULL DEFAULT 5,
|
||||||
|
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
last_error TEXT,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
type fakeSender struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
sentIDs []string
|
||||||
|
failUntil int
|
||||||
|
calls int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeSender) Send(ctx context.Context, n Notification) error {
|
||||||
|
f.mu.Lock()
|
||||||
|
defer f.mu.Unlock()
|
||||||
|
f.calls++
|
||||||
|
if f.calls <= f.failUntil {
|
||||||
|
return errors.New("simulierter zustellfehler")
|
||||||
|
}
|
||||||
|
f.sentIDs = append(f.sentIDs, n.ID)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeSender) sentCount() int {
|
||||||
|
f.mu.Lock()
|
||||||
|
defer f.mu.Unlock()
|
||||||
|
return len(f.sentIDs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Module loesen ueber Enqueue aus, keine eigene
|
||||||
|
// Versandlogik noetig.
|
||||||
|
func TestDispatcher_EnqueueAndProcess(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
d := NewDispatcher(pool)
|
||||||
|
id, err := d.Enqueue(ctx, "email", "alice@example.com", map[string]any{"subject": "Willkommen"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue: %v", err)
|
||||||
|
}
|
||||||
|
if id == "" {
|
||||||
|
t.Fatal("erwartet nicht-leere id")
|
||||||
|
}
|
||||||
|
|
||||||
|
sender := &fakeSender{}
|
||||||
|
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("process: %v", err)
|
||||||
|
}
|
||||||
|
if sent != 1 || failed != 0 {
|
||||||
|
t.Fatalf("erwartet sent=1 failed=0, habe sent=%d failed=%d", sent, failed)
|
||||||
|
}
|
||||||
|
if sender.sentCount() != 1 {
|
||||||
|
t.Fatalf("erwartet 1 zustellung, habe %d", sender.sentCount())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: Wiederholungslogik greift bei
|
||||||
|
// simuliertem Fehler und bricht nach definierter Anzahl kontrolliert ab.
|
||||||
|
func TestProcessDue_RetriesThenGivesUpAfterMaxAttempts(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
d := NewDispatcher(pool).WithRetryPolicy(3, time.Millisecond)
|
||||||
|
id, err := d.Enqueue(ctx, "email", "bob@example.com", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sender := &fakeSender{failUntil: 100} // schlaegt bei jedem versuch fehl
|
||||||
|
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
time.Sleep(5 * time.Millisecond) // next_attempt_at abwarten
|
||||||
|
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
||||||
|
t.Fatalf("process %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var status string
|
||||||
|
var attempts int
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, id).Scan(&status, &attempts); err != nil {
|
||||||
|
t.Fatalf("status lesen: %v", err)
|
||||||
|
}
|
||||||
|
if status != "failed" {
|
||||||
|
t.Fatalf("erwartet status failed nach max_attempts, habe %q", status)
|
||||||
|
}
|
||||||
|
if attempts != 3 {
|
||||||
|
t.Fatalf("erwartet 3 versuche, habe %d", attempts)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Weiteres ProcessDue darf den bereits aufgegebenen job nicht mehr anfassen.
|
||||||
|
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("process nach abbruch: %v", err)
|
||||||
|
}
|
||||||
|
if sent != 0 || failed != 0 {
|
||||||
|
t.Fatalf("erwartet keine weitere verarbeitung, habe sent=%d failed=%d", sent, failed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: Neustart des Dienstes waehrend offener
|
||||||
|
// Zustellung verliert keine Nachricht — simuliert durch eine komplett neue
|
||||||
|
// Dispatcher/Pool-Instanz nach dem Enqueue, bevor irgendetwas verarbeitet wurde.
|
||||||
|
func TestQueue_SurvivesRestartWithoutMessageLoss(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
firstInstance := NewDispatcher(pool)
|
||||||
|
id, err := firstInstance.Enqueue(ctx, "email", "carol@example.com", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// "Neustart": eine voellig neue Dispatcher-Instanz (repraesentiert einen
|
||||||
|
// neuen Prozess) verbindet sich neu und verarbeitet die Warteschlange —
|
||||||
|
// die Nachricht existiert ausschliesslich in Postgres, nicht im
|
||||||
|
// Prozessspeicher der ersten Instanz.
|
||||||
|
restartedInstance := NewDispatcher(pool)
|
||||||
|
sender := &fakeSender{}
|
||||||
|
sent, failed, err := restartedInstance.ProcessDue(ctx, sender, 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("process nach neustart: %v", err)
|
||||||
|
}
|
||||||
|
if sent != 1 || failed != 0 {
|
||||||
|
t.Fatalf("erwartet sent=1 nach neustart, habe sent=%d failed=%d", sent, failed)
|
||||||
|
}
|
||||||
|
if len(sender.sentIDs) != 1 || sender.sentIDs[0] != id {
|
||||||
|
t.Fatalf("erwartet zustellung der urspruenglichen nachricht %q, habe %v", id, sender.sentIDs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: zwei gleichzeitig ausloesende Module,
|
||||||
|
// beide Nachrichten werden korrekt (und nicht doppelt) zugestellt.
|
||||||
|
func TestProcessDue_ConcurrentDispatchBothDelivered(t *testing.T) {
|
||||||
|
pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
d := NewDispatcher(pool)
|
||||||
|
idA, err := d.Enqueue(ctx, "email", "modul-a@example.com", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue a: %v", err)
|
||||||
|
}
|
||||||
|
idB, err := d.Enqueue(ctx, "email", "modul-b@example.com", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue b: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sender := &fakeSender{}
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
||||||
|
t.Errorf("process: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
if sender.sentCount() != 2 {
|
||||||
|
t.Fatalf("erwartet genau 2 zustellungen, habe %d: %v", sender.sentCount(), sender.sentIDs)
|
||||||
|
}
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, id := range sender.sentIDs {
|
||||||
|
if seen[id] {
|
||||||
|
t.Fatalf("nachricht %q wurde doppelt zugestellt", id)
|
||||||
|
}
|
||||||
|
seen[id] = true
|
||||||
|
}
|
||||||
|
if !seen[idA] || !seen[idB] {
|
||||||
|
t.Fatalf("erwartet beide nachrichten zugestellt, habe %v", sender.sentIDs)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ProcessDue holt bis zu limit faellige Benachrichtigungen und versucht sie
|
||||||
|
// ueber sender zuzustellen. FOR UPDATE SKIP LOCKED serialisiert konkurrierende
|
||||||
|
// Aufrufe (Akzeptanzkriterium 3 / Pruefung 3: zwei gleichzeitig ausloesende
|
||||||
|
// Module duerfen sich nicht gegenseitig blockieren oder Nachrichten doppelt
|
||||||
|
// zustellen) — dieselbe Konvention wie internal/tenant.Lifecycle.ProcessDueDeletions.
|
||||||
|
func (d *Dispatcher) ProcessDue(ctx context.Context, sender Sender, limit int) (sent, failed int, err error) {
|
||||||
|
tx, err := d.pool.Begin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("transaktion starten: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = tx.Rollback(ctx) }()
|
||||||
|
|
||||||
|
rows, err := tx.Query(ctx, `
|
||||||
|
SELECT id, channel, recipient, payload, attempts, max_attempts
|
||||||
|
FROM notification_jobs
|
||||||
|
WHERE status = 'pending' AND next_attempt_at <= now()
|
||||||
|
ORDER BY created_at
|
||||||
|
FOR UPDATE SKIP LOCKED
|
||||||
|
LIMIT $1
|
||||||
|
`, limit)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("faellige benachrichtigungen abfragen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
type due struct {
|
||||||
|
id, channel, recipient string
|
||||||
|
payload []byte
|
||||||
|
attempts, maxAttempts int
|
||||||
|
}
|
||||||
|
var candidates []due
|
||||||
|
for rows.Next() {
|
||||||
|
var c due
|
||||||
|
if err := rows.Scan(&c.id, &c.channel, &c.recipient, &c.payload, &c.attempts, &c.maxAttempts); err != nil {
|
||||||
|
rows.Close()
|
||||||
|
return 0, 0, fmt.Errorf("faellige benachrichtigung lesen: %w", err)
|
||||||
|
}
|
||||||
|
candidates = append(candidates, c)
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range candidates {
|
||||||
|
var payload map[string]any
|
||||||
|
if err := json.Unmarshal(c.payload, &payload); err != nil {
|
||||||
|
payload = map[string]any{}
|
||||||
|
}
|
||||||
|
|
||||||
|
sendErr := sender.Send(ctx, Notification{
|
||||||
|
ID: c.id, Channel: c.channel, Recipient: c.recipient, Payload: payload, Attempts: c.attempts,
|
||||||
|
})
|
||||||
|
|
||||||
|
if sendErr == nil {
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
UPDATE notification_jobs SET status = 'sent', updated_at = now() WHERE id = $1
|
||||||
|
`, c.id); err != nil {
|
||||||
|
return sent, failed, fmt.Errorf("erfolg speichern: %w", err)
|
||||||
|
}
|
||||||
|
sent++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
newAttempts := c.attempts + 1
|
||||||
|
if newAttempts >= c.maxAttempts {
|
||||||
|
// Akzeptanzkriterium 2: kontrollierter Abbruch nach definierter
|
||||||
|
// Anzahl Versuche, kein endloses Wiederholen.
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
UPDATE notification_jobs
|
||||||
|
SET status = 'failed', attempts = $2, last_error = $3, updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
`, c.id, newAttempts, sendErr.Error()); err != nil {
|
||||||
|
return sent, failed, fmt.Errorf("fehlschlag speichern: %w", err)
|
||||||
|
}
|
||||||
|
failed++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
nextAttempt := time.Now().Add(time.Duration(newAttempts) * d.retryBackoff)
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
UPDATE notification_jobs
|
||||||
|
SET attempts = $2, next_attempt_at = $3, last_error = $4, updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
`, c.id, newAttempts, nextAttempt, sendErr.Error()); err != nil {
|
||||||
|
return sent, failed, fmt.Errorf("wiederholung planen: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("transaktion committen: %w", err)
|
||||||
|
}
|
||||||
|
return sent, failed, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package notifyprefs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt Benachrichtigungspraeferenzen als HTTP-Endpunkte bereit
|
||||||
|
// (CFG-04). Duenner Client von Store — keine eigene Zustelllogik.
|
||||||
|
type Handler struct {
|
||||||
|
prefs *Store
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(prefs *Store) *Handler {
|
||||||
|
return &Handler{prefs: prefs}
|
||||||
|
}
|
||||||
|
|
||||||
|
type setPreferenceRequest struct {
|
||||||
|
EventType string `json:"event_type"`
|
||||||
|
Channel string `json:"channel"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPreference setzt die eigene Praeferenz des angemeldeten Benutzers
|
||||||
|
// (Akzeptanzkriterium 1). Muss hinter auth.RequireAuth haengen.
|
||||||
|
func (h *Handler) SetPreference(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req setPreferenceRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.prefs.Set(r.Context(), claims.TenantSlug, claims.UserID, req.EventType, req.Channel, req.Enabled); err != nil {
|
||||||
|
http.Error(w, "Einstellung konnte nicht gespeichert werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListMine liefert die eigenen Praeferenzen (Akzeptanzkriterium 1) — nur die
|
||||||
|
// EIGENEN, niemals die eines anderen Benutzers (Pruefung 2). claims.UserID
|
||||||
|
// kommt ausschliesslich aus dem verifizierten Session-Token, ist also nicht
|
||||||
|
// vom Client manipulierbar.
|
||||||
|
func (h *Handler) ListMine(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
prefs, err := h.prefs.ListForUser(r.Context(), claims.TenantSlug, claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Einstellungen konnten nicht geladen werden.", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(prefs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListTenantOverview liefert die Praeferenzen ALLER Benutzer des eigenen
|
||||||
|
// Mandanten (Akzeptanzkriterium 3: Tenant-Admin-Übersicht). Die Zugriffs-
|
||||||
|
// beschraenkung "nur Tenant-Admin" ist Aufgabe von RBAC-02 (Policy-
|
||||||
|
// Enforcement-Schicht) vor diesem Handler — hier wird bewusst keine eigene
|
||||||
|
// Rechtelogik dupliziert (Ticket-Produkt-DNA: duenner Client).
|
||||||
|
func (h *Handler) ListTenantOverview(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
prefs, err := h.prefs.ListForTenant(r.Context(), claims.TenantSlug)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Übersicht konnte nicht geladen werden.", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(prefs)
|
||||||
|
}
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
package notifyprefs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
func sessionCookie(t *testing.T, issuer *auth.TokenIssuer, userID, tenantSlug string) *http.Cookie {
|
||||||
|
t.Helper()
|
||||||
|
token, err := issuer.Issue(userID, tenantSlug)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
return &http.Cookie{Name: auth.CookieName, Value: token}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Benutzer setzt eigene Praeferenz per HTTP.
|
||||||
|
func TestHandlerSetAndListMine(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
h := NewHandler(prefs)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
cookie := sessionCookie(t, issuer, "user-1", "acme")
|
||||||
|
|
||||||
|
setBody, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
||||||
|
setReq := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(setBody))
|
||||||
|
setReq.AddCookie(cookie)
|
||||||
|
setRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.SetPreference)(setRec, setReq)
|
||||||
|
if setRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("set: status = %d, body: %s", setRec.Code, setRec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
listReq := httptest.NewRequest(http.MethodGet, "/notifications/preferences", nil)
|
||||||
|
listReq.AddCookie(cookie)
|
||||||
|
listRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListMine)(listRec, listReq)
|
||||||
|
if listRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("list: status = %d, body: %s", listRec.Code, listRec.Body.String())
|
||||||
|
}
|
||||||
|
var out []Preference
|
||||||
|
if err := json.Unmarshal(listRec.Body.Bytes(), &out); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(out) != 1 || out[0].Enabled {
|
||||||
|
t.Fatalf("erwartet genau 1 deaktivierte praeferenz, habe %+v", out)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 / Pruefung 2: ListMine zeigt AUSSCHLIESSLICH die
|
||||||
|
// eigenen Praeferenzen — die UserID kommt aus dem Session-Token, nicht aus
|
||||||
|
// einem vom Client kontrollierbaren Parameter.
|
||||||
|
func TestHandlerListMine_NeverShowsOtherUsersPreferences(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
h := NewHandler(prefs)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
|
||||||
|
setBody, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
||||||
|
setReq := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(setBody))
|
||||||
|
setReq.AddCookie(sessionCookie(t, issuer, "user-1", "acme"))
|
||||||
|
setRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.SetPreference)(setRec, setReq)
|
||||||
|
if setRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("set fuer user-1: status = %d", setRec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// user-2 fragt seine eigenen Praeferenzen ab — muss leer sein.
|
||||||
|
listReq := httptest.NewRequest(http.MethodGet, "/notifications/preferences", nil)
|
||||||
|
listReq.AddCookie(sessionCookie(t, issuer, "user-2", "acme"))
|
||||||
|
listRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListMine)(listRec, listReq)
|
||||||
|
if listRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("list fuer user-2: status = %d", listRec.Code)
|
||||||
|
}
|
||||||
|
var out []Preference
|
||||||
|
if err := json.Unmarshal(listRec.Body.Bytes(), &out); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(out) != 0 {
|
||||||
|
t.Fatalf("user-2 haette user-1s praeferenzen NICHT sehen duerfen, habe %+v", out)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Tenant-Übersicht liefert alle Benutzer des Mandanten.
|
||||||
|
func TestHandlerListTenantOverview(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
h := NewHandler(prefs)
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
|
||||||
|
for _, u := range []string{"user-1", "user-2"} {
|
||||||
|
body, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(body))
|
||||||
|
req.AddCookie(sessionCookie(t, issuer, u, "acme"))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.SetPreference)(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("set fuer %s: status = %d", u, rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/notifications/preferences/tenant", nil)
|
||||||
|
req.AddCookie(sessionCookie(t, issuer, "admin-1", "acme"))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListTenantOverview)(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("overview: status = %d, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
var out []Preference
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &out); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(out) != 2 {
|
||||||
|
t.Fatalf("erwartet 2 eintraege (beide Benutzer), habe %d", len(out))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
// Package notifyprefs implementiert Core CFG-04: Benachrichtigungspräferenzen
|
||||||
|
// je Benutzer, Ereignistyp und Kanal. Duenner Client von CFG-02/03 — keine
|
||||||
|
// eigene Zustelllogik, nur ein Filter DAVOR, ob eine Benachrichtigung
|
||||||
|
// überhaupt in die Warteschlange (internal/notify.Dispatcher) eingereiht wird.
|
||||||
|
package notifyprefs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Preference struct {
|
||||||
|
TenantSlug string
|
||||||
|
UserID string
|
||||||
|
EventType string
|
||||||
|
Channel string
|
||||||
|
Enabled bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store verwaltet Benachrichtigungspraeferenzen in der zentralen Registry-DB
|
||||||
|
// (gleiche Ablageebene wie CFG-03s notification_templates/in_app_notifications).
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set setzt die Praeferenz eines Benutzers fuer einen Ereignistyp+Kanal
|
||||||
|
// (Akzeptanzkriterium 1). Wirkt sofort — es gibt keinen Cache dazwischen,
|
||||||
|
// jede Pruefung (IsEnabled) liest direkt aus der DB (Akzeptanzkriterium 2).
|
||||||
|
func (s *Store) Set(ctx context.Context, tenantSlug, userID, eventType, channel string, enabled bool) error {
|
||||||
|
if tenantSlug == "" || userID == "" || eventType == "" || channel == "" {
|
||||||
|
return errors.New("notifyprefs: tenantSlug, userID, eventType und channel duerfen nicht leer sein")
|
||||||
|
}
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO notification_preferences (tenant_slug, user_id, event_type, channel, enabled)
|
||||||
|
VALUES ($1, $2, $3, $4, $5)
|
||||||
|
ON CONFLICT (tenant_slug, user_id, event_type, channel)
|
||||||
|
DO UPDATE SET enabled = $5, updated_at = now()
|
||||||
|
`, tenantSlug, userID, eventType, channel, enabled)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("praeferenz speichern: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsEnabled prueft, ob ein Kanal fuer einen Ereignistyp aktiv ist. Ohne
|
||||||
|
// explizite Praeferenz gilt der Kanal als AKTIVIERT (Opt-out-Default,
|
||||||
|
// siehe Migration).
|
||||||
|
func (s *Store) IsEnabled(ctx context.Context, tenantSlug, userID, eventType, channel string) (bool, error) {
|
||||||
|
var enabled bool
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT enabled FROM notification_preferences
|
||||||
|
WHERE tenant_slug = $1 AND user_id = $2 AND event_type = $3 AND channel = $4
|
||||||
|
`, tenantSlug, userID, eventType, channel).Scan(&enabled)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("praeferenz lesen: %w", err)
|
||||||
|
}
|
||||||
|
return enabled, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListForUser liefert alle expliziten Praeferenzen eines Benutzers
|
||||||
|
// (Akzeptanzkriterium 1: eigene Einstellungen einsehen/aendern).
|
||||||
|
func (s *Store) ListForUser(ctx context.Context, tenantSlug, userID string) ([]Preference, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT event_type, channel, enabled FROM notification_preferences
|
||||||
|
WHERE tenant_slug = $1 AND user_id = $2
|
||||||
|
ORDER BY event_type, channel
|
||||||
|
`, tenantSlug, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("praeferenzen auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Preference
|
||||||
|
for rows.Next() {
|
||||||
|
p := Preference{TenantSlug: tenantSlug, UserID: userID}
|
||||||
|
if err := rows.Scan(&p.EventType, &p.Channel, &p.Enabled); err != nil {
|
||||||
|
return nil, fmt.Errorf("praeferenz lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListForTenant liefert ALLE expliziten Praeferenzen aller Benutzer eines
|
||||||
|
// Mandanten (Akzeptanzkriterium 3: Tenant-Admin-Übersicht).
|
||||||
|
func (s *Store) ListForTenant(ctx context.Context, tenantSlug string) ([]Preference, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT user_id, event_type, channel, enabled FROM notification_preferences
|
||||||
|
WHERE tenant_slug = $1
|
||||||
|
ORDER BY user_id, event_type, channel
|
||||||
|
`, tenantSlug)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("mandanten-praeferenzen auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Preference
|
||||||
|
for rows.Next() {
|
||||||
|
p := Preference{TenantSlug: tenantSlug}
|
||||||
|
if err := rows.Scan(&p.UserID, &p.EventType, &p.Channel, &p.Enabled); err != nil {
|
||||||
|
return nil, fmt.Errorf("praeferenz lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnqueueIfAllowed ist der einzige vorgesehene Weg, wie ein Modul eine
|
||||||
|
// Benachrichtigung fuer einen konkreten Benutzer+Ereignistyp auslöst: prueft
|
||||||
|
// zuerst die Praeferenz, reiht NUR bei Aktivierung tatsaechlich in
|
||||||
|
// internal/notify.Dispatcher ein (Akzeptanzkriterium 1 / Pruefung 1 — ein
|
||||||
|
// deaktivierter Kanal erzeugt nachweislich KEINE notification_jobs-Zeile,
|
||||||
|
// nicht nur eine ignorierte). skipped=true bedeutet: bewusst nicht zugestellt,
|
||||||
|
// kein Fehler.
|
||||||
|
func EnqueueIfAllowed(
|
||||||
|
ctx context.Context,
|
||||||
|
prefs *Store,
|
||||||
|
dispatcher *notify.Dispatcher,
|
||||||
|
tenantSlug, userID, eventType, channel, recipient string,
|
||||||
|
payload map[string]any,
|
||||||
|
) (jobID string, skipped bool, err error) {
|
||||||
|
enabled, err := prefs.IsEnabled(ctx, tenantSlug, userID, eventType, channel)
|
||||||
|
if err != nil {
|
||||||
|
return "", false, err
|
||||||
|
}
|
||||||
|
if !enabled {
|
||||||
|
return "", true, nil
|
||||||
|
}
|
||||||
|
jobID, err = dispatcher.Enqueue(ctx, channel, recipient, payload)
|
||||||
|
return jobID, false, err
|
||||||
|
}
|
||||||
@@ -0,0 +1,183 @@
|
|||||||
|
package notifyprefs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*Store, *notify.Dispatcher, *pgxpool.Pool, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS notification_preferences (
|
||||||
|
tenant_slug TEXT NOT NULL, user_id TEXT NOT NULL, event_type TEXT NOT NULL, channel TEXT NOT NULL,
|
||||||
|
enabled BOOLEAN NOT NULL, updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (tenant_slug, user_id, event_type, channel)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS notification_jobs (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), channel TEXT NOT NULL, recipient TEXT NOT NULL,
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb, status TEXT NOT NULL DEFAULT 'pending', attempts INT NOT NULL DEFAULT 0,
|
||||||
|
max_attempts INT NOT NULL DEFAULT 5, next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(), last_error TEXT,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM notification_preferences`)
|
||||||
|
_, _ = pool.Exec(ctx, `DELETE FROM notification_jobs`)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return NewStore(pool), notify.NewDispatcher(pool), pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ohne explizite Praeferenz gilt ein Kanal als aktiviert (Opt-out-Default).
|
||||||
|
func TestIsEnabled_DefaultsToTrueWithoutPreference(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
enabled, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "email")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled: %v", err)
|
||||||
|
}
|
||||||
|
if !enabled {
|
||||||
|
t.Fatal("erwartet aktiviert als default ohne gesetzte praeferenz")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + 2: gesetzte Praeferenz wirkt sofort.
|
||||||
|
func TestSetAndIsEnabled(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
enabled, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "email")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled: %v", err)
|
||||||
|
}
|
||||||
|
if enabled {
|
||||||
|
t.Fatal("erwartet deaktiviert nach Set(..., false)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Andere Kanaele/Ereignistypen desselben Benutzers bleiben unberuehrt.
|
||||||
|
stillOn, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "in_app")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled (anderer kanal): %v", err)
|
||||||
|
}
|
||||||
|
if !stillOn {
|
||||||
|
t.Fatal("erwartet: anderer kanal bleibt aktiviert")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 / Pruefung 2: Einstellungen eines Benutzers wirken
|
||||||
|
// sich NICHT auf einen anderen Benutzer aus.
|
||||||
|
func TestSet_DoesNotAffectOtherUser(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
||||||
|
t.Fatalf("set fuer user-1: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
enabledForOther, err := prefs.IsEnabled(ctx, "acme", "user-2", "welcome", "email")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled fuer user-2: %v", err)
|
||||||
|
}
|
||||||
|
if !enabledForOther {
|
||||||
|
t.Fatal("praeferenz von user-1 haette user-2 nicht beeinflussen duerfen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 / Pruefung 1 (Kernbeweis): ein deaktivierter Kanal
|
||||||
|
// erhaelt NACHWEISLICH keine weitere Zustellung — geprueft ueber die
|
||||||
|
// tatsaechliche notification_jobs-Tabelle, nicht nur ueber den Rueckgabewert.
|
||||||
|
func TestEnqueueIfAllowed_SkipsWhenDisabled(t *testing.T) {
|
||||||
|
prefs, dispatcher, pool, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := prefs.Set(ctx, "acme", "user-1", "invoice_ready", "email", false); err != nil {
|
||||||
|
t.Fatalf("set: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
jobID, skipped, err := EnqueueIfAllowed(ctx, prefs, dispatcher, "acme", "user-1", "invoice_ready", "email", "user1@acme.example", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue if allowed: %v", err)
|
||||||
|
}
|
||||||
|
if !skipped {
|
||||||
|
t.Fatal("erwartet skipped=true bei deaktiviertem kanal")
|
||||||
|
}
|
||||||
|
if jobID != "" {
|
||||||
|
t.Fatalf("erwartet keine job-id, habe %q", jobID)
|
||||||
|
}
|
||||||
|
|
||||||
|
var count int
|
||||||
|
if err := pool.QueryRow(ctx, `SELECT count(*) FROM notification_jobs`).Scan(&count); err != nil {
|
||||||
|
t.Fatalf("notification_jobs zaehlen: %v", err)
|
||||||
|
}
|
||||||
|
if count != 0 {
|
||||||
|
t.Fatalf("erwartet 0 eingereihte jobs bei deaktiviertem kanal, habe %d", count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEnqueueIfAllowed_EnqueuesWhenEnabled(t *testing.T) {
|
||||||
|
prefs, dispatcher, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
jobID, skipped, err := EnqueueIfAllowed(ctx, prefs, dispatcher, "acme", "user-1", "invoice_ready", "email", "user1@acme.example", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enqueue if allowed: %v", err)
|
||||||
|
}
|
||||||
|
if skipped {
|
||||||
|
t.Fatal("erwartet skipped=false ohne deaktivierte praeferenz")
|
||||||
|
}
|
||||||
|
if jobID == "" {
|
||||||
|
t.Fatal("erwartet gesetzte job-id")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Tenant-Admin-Übersicht zeigt alle Benutzer.
|
||||||
|
func TestListForTenant_ShowsAllUsers(t *testing.T) {
|
||||||
|
prefs, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
||||||
|
t.Fatalf("set user-1: %v", err)
|
||||||
|
}
|
||||||
|
if err := prefs.Set(ctx, "acme", "user-2", "welcome", "in_app", false); err != nil {
|
||||||
|
t.Fatalf("set user-2: %v", err)
|
||||||
|
}
|
||||||
|
if err := prefs.Set(ctx, "other-tenant", "user-3", "welcome", "email", false); err != nil {
|
||||||
|
t.Fatalf("set user-3 (anderer tenant): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
overview, err := prefs.ListForTenant(ctx, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list for tenant: %v", err)
|
||||||
|
}
|
||||||
|
if len(overview) != 2 {
|
||||||
|
t.Fatalf("erwartet 2 eintraege fuer tenant acme (nicht den anderen tenant), habe %d", len(overview))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,200 @@
|
|||||||
|
package rbac
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrGroupNotFound = errors.New("rbac: gruppe nicht gefunden")
|
||||||
|
|
||||||
|
type Group struct {
|
||||||
|
ID string
|
||||||
|
Name string
|
||||||
|
Role Role // leer, wenn der Gruppe noch keine Rolle zugewiesen wurde
|
||||||
|
}
|
||||||
|
|
||||||
|
// GroupStore verwaltet Gruppen/Abteilungen innerhalb GENAU EINER Tenant-
|
||||||
|
// Datenbank (Modell C, wie Store fuer direkte Rollenzuweisungen) —
|
||||||
|
// Akzeptanzkriterium 3 (tenant-isoliert) ist damit strukturell erfuellt.
|
||||||
|
type GroupStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewGroupStore(pool *pgxpool.Pool) *GroupStore {
|
||||||
|
return &GroupStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateGroup legt eine neue, noch rollenlose Gruppe an (Akzeptanzkriterium 1).
|
||||||
|
func (s *GroupStore) CreateGroup(ctx context.Context, name string) (Group, error) {
|
||||||
|
if name == "" {
|
||||||
|
return Group{}, errors.New("rbac: gruppenname darf nicht leer sein")
|
||||||
|
}
|
||||||
|
var g Group
|
||||||
|
g.Name = name
|
||||||
|
if err := s.pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO groups (name) VALUES ($1) RETURNING id
|
||||||
|
`, name).Scan(&g.ID); err != nil {
|
||||||
|
return Group{}, fmt.Errorf("gruppe anlegen: %w", err)
|
||||||
|
}
|
||||||
|
return g, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetGroupRole weist der Gruppe eine Rolle zu (Akzeptanzkriterium 2) — nur
|
||||||
|
// 'user'/'tenant_admin' sind auf Gruppenebene zuweisbar, dieselbe erlaubte
|
||||||
|
// Matrix wie in Store.Assign (superadmin bleibt mandantenuebergreifend und
|
||||||
|
// ausserhalb jeder Gruppenlogik).
|
||||||
|
func (s *GroupStore) SetGroupRole(ctx context.Context, groupID string, role Role) error {
|
||||||
|
if !assignableRoles[role] {
|
||||||
|
return ErrRoleNotAssignableInTenantScope
|
||||||
|
}
|
||||||
|
tag, err := s.pool.Exec(ctx, `UPDATE groups SET role = $2 WHERE id = $1`, groupID, string(role))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("gruppenrolle setzen: %w", err)
|
||||||
|
}
|
||||||
|
if tag.RowsAffected() == 0 {
|
||||||
|
return ErrGroupNotFound
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddMember nimmt einen Benutzer in die Gruppe auf.
|
||||||
|
func (s *GroupStore) AddMember(ctx context.Context, groupID, userID string) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO group_members (group_id, user_id) VALUES ($1, $2)
|
||||||
|
ON CONFLICT (group_id, user_id) DO NOTHING
|
||||||
|
`, groupID, userID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("mitglied hinzufuegen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveMember entfernt einen Benutzer aus der Gruppe — die gruppenbasierten
|
||||||
|
// Rechte entfallen fuer ihn sofort (Akzeptanzkriterium 3 / Pruefung 2), da
|
||||||
|
// EffectivePermissionsForUser bei jedem Aufruf neu berechnet wird, nicht
|
||||||
|
// zwischengespeichert.
|
||||||
|
func (s *GroupStore) RemoveMember(ctx context.Context, groupID, userID string) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `DELETE FROM group_members WHERE group_id = $1 AND user_id = $2`, groupID, userID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("mitglied entfernen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteGroup loescht die Gruppe — ON DELETE CASCADE entfernt die
|
||||||
|
// Mitgliedschaften mit, Benutzerkonten selbst bleiben unberuehrt
|
||||||
|
// (Akzeptanzkriterium 3).
|
||||||
|
func (s *GroupStore) DeleteGroup(ctx context.Context, groupID string) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `DELETE FROM groups WHERE id = $1`, groupID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("gruppe loeschen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListGroups liefert alle Gruppen des Mandanten (Akzeptanzkriterium 1/2,
|
||||||
|
// Grundlage fuer die Administrationsoberflaeche).
|
||||||
|
func (s *GroupStore) ListGroups(ctx context.Context) ([]Group, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `SELECT id, name, COALESCE(role, '') FROM groups ORDER BY name`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gruppen auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Group
|
||||||
|
for rows.Next() {
|
||||||
|
var g Group
|
||||||
|
var role string
|
||||||
|
if err := rows.Scan(&g.ID, &g.Name, &role); err != nil {
|
||||||
|
return nil, fmt.Errorf("gruppe lesen: %w", err)
|
||||||
|
}
|
||||||
|
g.Role = Role(role)
|
||||||
|
out = append(out, g)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Members liefert die User-IDs der Mitglieder einer Gruppe.
|
||||||
|
func (s *GroupStore) Members(ctx context.Context, groupID string) ([]string, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `SELECT user_id FROM group_members WHERE group_id = $1`, groupID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("mitglieder abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []string
|
||||||
|
for rows.Next() {
|
||||||
|
var id string
|
||||||
|
if err := rows.Scan(&id); err != nil {
|
||||||
|
return nil, fmt.Errorf("mitglied lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, id)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// RolesForUser liefert alle Rollen, die einem Benutzer ueber seine
|
||||||
|
// Gruppenmitgliedschaften zufallen (Akzeptanzkriterium 2: wirkt auf alle
|
||||||
|
// Mitglieder). Eine Gruppe ohne zugewiesene Rolle traegt nichts bei.
|
||||||
|
func (s *GroupStore) RolesForUser(ctx context.Context, userID string) ([]Role, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT g.role FROM groups g
|
||||||
|
JOIN group_members gm ON gm.group_id = g.id
|
||||||
|
WHERE gm.user_id = $1 AND g.role IS NOT NULL
|
||||||
|
`, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gruppenrollen abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Role
|
||||||
|
for rows.Next() {
|
||||||
|
var r string
|
||||||
|
if err := rows.Scan(&r); err != nil {
|
||||||
|
return nil, fmt.Errorf("gruppenrolle lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, Role(r))
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// EffectivePermissionsForUser vereinigt die Rechte aus der direkten
|
||||||
|
// Rollenzuweisung (Store, RBAC-01) mit allen Rechten aus Gruppenrollen —
|
||||||
|
// jede einzelne Rolle wird ueber die bestehende Hierarchie (EffectivePermissions)
|
||||||
|
// aufgeloest, das Ergebnis dedupliziert.
|
||||||
|
func (s *GroupStore) EffectivePermissionsForUser(ctx context.Context, directStore *Store, userID string) ([]Permission, error) {
|
||||||
|
seen := make(map[Permission]bool)
|
||||||
|
var out []Permission
|
||||||
|
|
||||||
|
add := func(role Role) {
|
||||||
|
for _, p := range EffectivePermissions(role) {
|
||||||
|
if !seen[p] {
|
||||||
|
seen[p] = true
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if directStore != nil {
|
||||||
|
assignment, err := directStore.Get(ctx, userID)
|
||||||
|
if err != nil && !errors.Is(err, ErrNotFound) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
add(assignment.Role)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
groupRoles, err := s.RolesForUser(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, r := range groupRoles {
|
||||||
|
add(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
package rbac
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
const groupSchema = `
|
||||||
|
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', created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS role_assignments (
|
||||||
|
user_id UUID PRIMARY KEY REFERENCES users(id), role TEXT NOT NULL CHECK (role IN ('user','tenant_admin')),
|
||||||
|
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS groups (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), name TEXT NOT NULL, role TEXT CHECK (role IN ('user','tenant_admin')),
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS group_members (
|
||||||
|
group_id UUID NOT NULL REFERENCES groups(id) ON DELETE CASCADE, user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
added_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (group_id, user_id)
|
||||||
|
);`
|
||||||
|
|
||||||
|
func setupGroupTestDB(t *testing.T, dbName string) *pgxpool.Pool {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
adminPool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin pool: %v", err)
|
||||||
|
}
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
if _, err := adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
|
t.Fatalf("testdatenbank anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dsn := strings.Replace(adminDSN, "/postgres?", "/"+dbName+"?", 1)
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("connect testdatenbank: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, groupSchema); err != nil {
|
||||||
|
t.Fatalf("schema anwenden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
pool.Close()
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
adminPool.Close()
|
||||||
|
})
|
||||||
|
return pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func createTestUser(t *testing.T, pool *pgxpool.Pool, email string) string {
|
||||||
|
t.Helper()
|
||||||
|
u, err := user.NewTenantUserStore(pool).Create(context.Background(), email, "Test")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("testuser anlegen: %v", err)
|
||||||
|
}
|
||||||
|
return u.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Gruppen anlegen und Benutzer zuordnen.
|
||||||
|
func TestGroup_CreateAndAddMember(t *testing.T) {
|
||||||
|
pool := setupGroupTestDB(t, "test_rbac03_create")
|
||||||
|
gs := NewGroupStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
g, err := gs.CreateGroup(ctx, "Buchhaltung")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create group: %v", err)
|
||||||
|
}
|
||||||
|
userID := createTestUser(t, pool, "alice@example.com")
|
||||||
|
|
||||||
|
if err := gs.AddMember(ctx, g.ID, userID); err != nil {
|
||||||
|
t.Fatalf("add member: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Gruppenrolle wirkt auf ALLE aktuellen
|
||||||
|
// Mitglieder.
|
||||||
|
func TestGroup_RoleAffectsAllCurrentMembers(t *testing.T) {
|
||||||
|
pool := setupGroupTestDB(t, "test_rbac03_roleall")
|
||||||
|
gs := NewGroupStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
g, err := gs.CreateGroup(ctx, "Admins")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create group: %v", err)
|
||||||
|
}
|
||||||
|
if err := gs.SetGroupRole(ctx, g.ID, RoleTenantAdmin); err != nil {
|
||||||
|
t.Fatalf("set group role: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
alice := createTestUser(t, pool, "alice@example.com")
|
||||||
|
bob := createTestUser(t, pool, "bob@example.com")
|
||||||
|
if err := gs.AddMember(ctx, g.ID, alice); err != nil {
|
||||||
|
t.Fatalf("add alice: %v", err)
|
||||||
|
}
|
||||||
|
if err := gs.AddMember(ctx, g.ID, bob); err != nil {
|
||||||
|
t.Fatalf("add bob: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, uid := range []string{alice, bob} {
|
||||||
|
perms, err := gs.EffectivePermissionsForUser(ctx, nil, uid)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("effective permissions fuer %s: %v", uid, err)
|
||||||
|
}
|
||||||
|
if !contains(perms, PermManageUsers) {
|
||||||
|
t.Fatalf("mitglied %s sollte tenant_admin-rechte ueber die gruppe haben, habe %v", uid, perms)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Entfernen aus der Gruppe entzieht die
|
||||||
|
// gruppenbasierten Rechte sofort.
|
||||||
|
func TestGroup_RemoveMemberRevokesRightsImmediately(t *testing.T) {
|
||||||
|
pool := setupGroupTestDB(t, "test_rbac03_remove")
|
||||||
|
gs := NewGroupStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
g, _ := gs.CreateGroup(ctx, "Admins")
|
||||||
|
_ = gs.SetGroupRole(ctx, g.ID, RoleTenantAdmin)
|
||||||
|
userID := createTestUser(t, pool, "alice@example.com")
|
||||||
|
_ = gs.AddMember(ctx, g.ID, userID)
|
||||||
|
|
||||||
|
perms, err := gs.EffectivePermissionsForUser(ctx, nil, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("effective permissions (mitglied): %v", err)
|
||||||
|
}
|
||||||
|
if !contains(perms, PermManageUsers) {
|
||||||
|
t.Fatal("erwartet tenant_admin-rechte als mitglied")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := gs.RemoveMember(ctx, g.ID, userID); err != nil {
|
||||||
|
t.Fatalf("remove member: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
perms, err = gs.EffectivePermissionsForUser(ctx, nil, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("effective permissions (entfernt): %v", err)
|
||||||
|
}
|
||||||
|
if contains(perms, PermManageUsers) {
|
||||||
|
t.Fatal("erwartet KEINE tenant_admin-rechte nach entfernen aus der gruppe")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Loeschen einer Gruppe entzieht Rechte sauber, ohne
|
||||||
|
// das Benutzerkonto zu loeschen.
|
||||||
|
func TestGroup_DeleteGroupRevokesRightsWithoutDeletingUser(t *testing.T) {
|
||||||
|
pool := setupGroupTestDB(t, "test_rbac03_delete")
|
||||||
|
gs := NewGroupStore(pool)
|
||||||
|
us := user.NewTenantUserStore(pool)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
g, _ := gs.CreateGroup(ctx, "Temp")
|
||||||
|
_ = gs.SetGroupRole(ctx, g.ID, RoleTenantAdmin)
|
||||||
|
userID := createTestUser(t, pool, "alice@example.com")
|
||||||
|
_ = gs.AddMember(ctx, g.ID, userID)
|
||||||
|
|
||||||
|
if err := gs.DeleteGroup(ctx, g.ID); err != nil {
|
||||||
|
t.Fatalf("delete group: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
perms, err := gs.EffectivePermissionsForUser(ctx, nil, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("effective permissions: %v", err)
|
||||||
|
}
|
||||||
|
if contains(perms, PermManageUsers) {
|
||||||
|
t.Fatal("erwartet keine rechte mehr nach loeschen der gruppe")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := us.Get(ctx, userID); err != nil {
|
||||||
|
t.Fatalf("benutzerkonto haette erhalten bleiben muessen: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Gruppen sind sauber tenant-isoliert.
|
||||||
|
func TestGroup_TenantIsolation(t *testing.T) {
|
||||||
|
poolA := setupGroupTestDB(t, "test_rbac03_tenanta")
|
||||||
|
poolB := setupGroupTestDB(t, "test_rbac03_tenantb")
|
||||||
|
gsA := NewGroupStore(poolA)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := gsA.CreateGroup(ctx, "Nur-Tenant-A"); err != nil {
|
||||||
|
t.Fatalf("create group a: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var countB int
|
||||||
|
if err := poolB.QueryRow(ctx, `SELECT count(*) FROM groups`).Scan(&countB); err != nil {
|
||||||
|
t.Fatalf("count tenant b: %v", err)
|
||||||
|
}
|
||||||
|
if countB != 0 {
|
||||||
|
t.Fatalf("tenant b sollte keine gruppen aus tenant a sehen, habe %d", countB)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
package rbac
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt Rollen-/Rechte- und Gruppenverwaltung als HTTP-Endpunkte
|
||||||
|
// bereit (RBAC-05). Duenner Client der bestehenden Store/GroupStore-Schicht —
|
||||||
|
// keine eigene Rechtelogik hier (siehe Ticket-Produkt-DNA).
|
||||||
|
type Handler struct {
|
||||||
|
roles *Store
|
||||||
|
groups *GroupStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(roles *Store, groups *GroupStore) *Handler {
|
||||||
|
return &Handler{roles: roles, groups: groups}
|
||||||
|
}
|
||||||
|
|
||||||
|
// requireManageUsers prueft, ob der aufrufende Benutzer ueberhaupt
|
||||||
|
// Rechteverwaltung ausueben darf — technisch durchgesetzt hier zusaetzlich
|
||||||
|
// zu RBAC-02 (Policy-Enforcement-Schicht), da diese Kachel ein eigener,
|
||||||
|
// besonders sicherheitskritischer HTTP-Einstiegspunkt ist.
|
||||||
|
func requireManageUsers(w http.ResponseWriter, r *http.Request, roles *Store) (callerUserID string, ok bool) {
|
||||||
|
claims, authOK := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !authOK {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
assignment, err := roles.Get(r.Context(), claims.UserID)
|
||||||
|
if err != nil || !HasPermission(assignment.Role, PermManageUsers) {
|
||||||
|
http.Error(w, "keine Berechtigung zur Rechteverwaltung", http.StatusForbidden)
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return claims.UserID, true
|
||||||
|
}
|
||||||
|
|
||||||
|
type roleInfo struct {
|
||||||
|
Role Role `json:"role"`
|
||||||
|
Permissions []Permission `json:"permissions"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRoles liefert die (im Tenant-Geltungsbereich zuweisbaren) Rollen mit
|
||||||
|
// ihren vollstaendig aufgeloesten Rechten (Akzeptanzkriterium 1).
|
||||||
|
func (h *Handler) ListRoles(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
out := make([]roleInfo, 0, len(assignableRoles))
|
||||||
|
for role := range assignableRoles {
|
||||||
|
out = append(out, roleInfo{Role: role, Permissions: EffectivePermissions(role)})
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
type assignRoleRequest struct {
|
||||||
|
UserID string `json:"user_id"`
|
||||||
|
Role Role `json:"role"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// roleRank ordnet die Rollenhierarchie fuer den Selbst-Eskalations-Vergleich
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 2) — hoehere Zahl = mehr Rechte. Basiert
|
||||||
|
// auf derselben parent-Kette wie EffectivePermissions, nicht dupliziert als
|
||||||
|
// eigenstaendiges Modell.
|
||||||
|
func roleRank(role Role) int {
|
||||||
|
rank := 0
|
||||||
|
for r, ok := role, true; ok; r, ok = parent[r] {
|
||||||
|
rank++
|
||||||
|
}
|
||||||
|
return rank
|
||||||
|
}
|
||||||
|
|
||||||
|
// AssignRole weist einem Benutzer eine Rolle zu (Akzeptanzkriterium 1).
|
||||||
|
// Verweigert explizit, dass sich der aufrufende Benutzer selbst eine
|
||||||
|
// hoehere Rolle zuweist (Akzeptanzkriterium 2 / Pruefung 2) — unabhaengig
|
||||||
|
// davon, ob RBAC-02 dieselbe Aktion ohnehin ueber die allgemeine
|
||||||
|
// Policy-Schicht verhindern wuerde: Selbst-Eskalation ist ein derart
|
||||||
|
// sicherheitskritischer Einzelfall, dass er hier zusaetzlich explizit und
|
||||||
|
// unuebersehbar geprueft wird, statt sich allein auf eine generische
|
||||||
|
// Regel an anderer Stelle zu verlassen.
|
||||||
|
func (h *Handler) AssignRole(w http.ResponseWriter, r *http.Request) {
|
||||||
|
callerUserID, ok := requireManageUsers(w, r, h.roles)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req assignRoleRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req.UserID == callerUserID {
|
||||||
|
callerAssignment, err := h.roles.Get(r.Context(), callerUserID)
|
||||||
|
callerRole := RoleUser
|
||||||
|
if err == nil {
|
||||||
|
callerRole = callerAssignment.Role
|
||||||
|
}
|
||||||
|
if roleRank(req.Role) > roleRank(callerRole) {
|
||||||
|
http.Error(w, "Sie können sich nicht selbst eine höhere Rolle zuweisen.", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assignment, err := h.roles.Assign(r.Context(), req.UserID, req.Role, callerUserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Rolle konnte nicht zugewiesen werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(assignment)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RoleHistory liefert die Zuweisungshistorie eines Benutzers — der in
|
||||||
|
// Akzeptanzkriterium 3 geforderte Verweis auf das Audit-Log (die
|
||||||
|
// role_assignment_history-Tabelle selbst IST die Nachvollziehbarkeits-Spur;
|
||||||
|
// eine vollstaendige Anbindung an Core AUD-01 ist nicht Teil dieser Kachel).
|
||||||
|
func (h *Handler) RoleHistory(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userID := strings.TrimPrefix(r.URL.Path, "/rbac/users/")
|
||||||
|
userID = strings.TrimSuffix(userID, "/history")
|
||||||
|
if userID == "" {
|
||||||
|
http.Error(w, "user_id fehlt", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
history, err := h.roles.History(r.Context(), userID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "historie konnte nicht geladen werden", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(history)
|
||||||
|
}
|
||||||
|
|
||||||
|
type createGroupRequest struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateGroup legt eine neue Gruppe an (Akzeptanzkriterium 2).
|
||||||
|
func (h *Handler) CreateGroup(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req createGroupRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
group, err := h.groups.CreateGroup(r.Context(), req.Name)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Gruppe konnte nicht angelegt werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_ = json.NewEncoder(w).Encode(group)
|
||||||
|
}
|
||||||
|
|
||||||
|
type groupWithMembers struct {
|
||||||
|
Group
|
||||||
|
Members []string `json:"members"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListGroups liefert alle Gruppen inkl. Mitgliederliste (Akzeptanzkriterium 2).
|
||||||
|
func (h *Handler) ListGroups(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
groups, err := h.groups.ListGroups(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Gruppen konnten nicht geladen werden.", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
out := make([]groupWithMembers, 0, len(groups))
|
||||||
|
for _, g := range groups {
|
||||||
|
members, err := h.groups.Members(r.Context(), g.ID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Mitglieder konnten nicht geladen werden.", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
out = append(out, groupWithMembers{Group: g, Members: members})
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
type groupActionRequest struct {
|
||||||
|
GroupID string `json:"group_id"`
|
||||||
|
UserID string `json:"user_id"`
|
||||||
|
Role Role `json:"role"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetGroupRole weist einer Gruppe eine Rolle zu (Akzeptanzkriterium 2).
|
||||||
|
func (h *Handler) SetGroupRole(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req groupActionRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.groups.SetGroupRole(r.Context(), req.GroupID, req.Role); err != nil {
|
||||||
|
http.Error(w, "Gruppenrolle konnte nicht gesetzt werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddGroupMember nimmt einen Benutzer in eine Gruppe auf (Akzeptanzkriterium 2).
|
||||||
|
func (h *Handler) AddGroupMember(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req groupActionRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.groups.AddMember(r.Context(), req.GroupID, req.UserID); err != nil {
|
||||||
|
http.Error(w, "Mitglied konnte nicht hinzugefügt werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveGroupMember entfernt einen Benutzer aus einer Gruppe.
|
||||||
|
func (h *Handler) RemoveGroupMember(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := requireManageUsers(w, r, h.roles); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req groupActionRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.groups.RemoveMember(r.Context(), req.GroupID, req.UserID); err != nil {
|
||||||
|
http.Error(w, "Mitglied konnte nicht entfernt werden.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -0,0 +1,309 @@
|
|||||||
|
package rbac
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
const handlerSchema = `
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
CREATE TABLE users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), email TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active', created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE role_assignments (
|
||||||
|
user_id UUID PRIMARY KEY REFERENCES users(id), role TEXT NOT NULL CHECK (role IN ('user','tenant_admin')),
|
||||||
|
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE role_assignment_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL, role TEXT NOT NULL,
|
||||||
|
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE groups (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), name TEXT NOT NULL, role TEXT CHECK (role IN ('user','tenant_admin')),
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE group_members (
|
||||||
|
group_id UUID NOT NULL REFERENCES groups(id) ON DELETE CASCADE, user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
added_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (group_id, user_id)
|
||||||
|
);`
|
||||||
|
|
||||||
|
func setupHandlerTest(t *testing.T, dbName string) (*Handler, *Store, *user.TenantUserStore, *pgxpool.Pool) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
adminPool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin pool: %v", err)
|
||||||
|
}
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
if _, err := adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
|
t.Fatalf("testdatenbank anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dsn := strings.Replace(adminDSN, "/postgres?", "/"+dbName+"?", 1)
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("connect testdatenbank: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, handlerSchema); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
pool.Close()
|
||||||
|
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
|
adminPool.Close()
|
||||||
|
})
|
||||||
|
|
||||||
|
roleStore := NewStore(pool)
|
||||||
|
groupStore := NewGroupStore(pool)
|
||||||
|
return NewHandler(roleStore, groupStore), roleStore, user.NewTenantUserStore(pool), pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func sessionCookieFor(t *testing.T, issuer *auth.TokenIssuer, userID string) *http.Cookie {
|
||||||
|
t.Helper()
|
||||||
|
token, err := issuer.Issue(userID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
return &http.Cookie{Name: auth.CookieName, Value: token}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Rollen und ihre Grundrechte sind einsehbar.
|
||||||
|
func TestListRoles(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_list_roles")
|
||||||
|
ctx := context.Background()
|
||||||
|
admin, err := users.Create(ctx, "admin@acme.example", "Admin")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, admin.ID, RoleTenantAdmin, "system"); err != nil {
|
||||||
|
t.Fatalf("admin-rolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/rbac/roles", nil)
|
||||||
|
req.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListRoles)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
var out []roleInfo
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &out); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(out) != 2 {
|
||||||
|
t.Fatalf("erwartet 2 zuweisbare rollen (user, tenant_admin), habe %d", len(out))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 / Pruefung 2: Selbst-Eskalation wird abgewiesen.
|
||||||
|
func TestAssignRole_RejectsSelfEscalation(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_self_escalation")
|
||||||
|
ctx := context.Background()
|
||||||
|
u, err := users.Create(ctx, "normal@acme.example", "Normaler Nutzer")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("nutzer anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, u.ID, RoleUser, "system"); err != nil {
|
||||||
|
t.Fatalf("ausgangsrolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
body, _ := json.Marshal(assignRoleRequest{UserID: u.ID, Role: RoleTenantAdmin})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/rbac/users/role", bytes.NewReader(body))
|
||||||
|
req.AddCookie(sessionCookieFor(t, issuer, u.ID))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.AssignRole)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("status = %d, want 403 (selbst-eskalation muss abgewiesen werden)", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rolle muss unveraendert geblieben sein.
|
||||||
|
assignment, err := roles.Get(ctx, u.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rolle laden: %v", err)
|
||||||
|
}
|
||||||
|
if assignment.Role != RoleUser {
|
||||||
|
t.Fatalf("rolle wurde trotz abgewiesener anfrage geaendert: %q", assignment.Role)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gegenprobe: ein Tenant-Admin darf EINEM ANDEREN Benutzer eine hoehere
|
||||||
|
// Rolle zuweisen — nur die Selbst-Zuweisung ist gesperrt.
|
||||||
|
func TestAssignRole_AdminCanPromoteOtherUser(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_promote_other")
|
||||||
|
ctx := context.Background()
|
||||||
|
admin, err := users.Create(ctx, "admin2@acme.example", "Admin")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, admin.ID, RoleTenantAdmin, "system"); err != nil {
|
||||||
|
t.Fatalf("admin-rolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
other, err := users.Create(ctx, "other@acme.example", "Anderer Nutzer")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("anderen nutzer anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
body, _ := json.Marshal(assignRoleRequest{UserID: other.ID, Role: RoleTenantAdmin})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/rbac/users/role", bytes.NewReader(body))
|
||||||
|
req.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.AssignRole)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Aenderungen an Rechten sind nachvollziehbar.
|
||||||
|
func TestRoleHistory_TracksAssignments(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_history")
|
||||||
|
ctx := context.Background()
|
||||||
|
admin, err := users.Create(ctx, "admin3@acme.example", "Admin")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, admin.ID, RoleTenantAdmin, "system"); err != nil {
|
||||||
|
t.Fatalf("admin-rolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
target, err := users.Create(ctx, "target@acme.example", "Zielnutzer")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("zielnutzer anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, target.ID, RoleUser, admin.ID); err != nil {
|
||||||
|
t.Fatalf("erste zuweisung: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, target.ID, RoleTenantAdmin, admin.ID); err != nil {
|
||||||
|
t.Fatalf("zweite zuweisung: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/rbac/users/"+target.ID+"/history", nil)
|
||||||
|
req.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.RoleHistory)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
var history []Assignment
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &history); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(history) != 2 {
|
||||||
|
t.Fatalf("erwartet 2 historieneintraege, habe %d", len(history))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2: Gruppen anlegen, Mitglieder zuordnen, Rolle zuweisen.
|
||||||
|
func TestGroupWorkflow(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_group_workflow")
|
||||||
|
ctx := context.Background()
|
||||||
|
admin, err := users.Create(ctx, "admin4@acme.example", "Admin")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("admin anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, admin.ID, RoleTenantAdmin, "system"); err != nil {
|
||||||
|
t.Fatalf("admin-rolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
member, err := users.Create(ctx, "member@acme.example", "Mitglied")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("mitglied anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
|
||||||
|
createBody, _ := json.Marshal(createGroupRequest{Name: "Buchhaltung"})
|
||||||
|
createReq := httptest.NewRequest(http.MethodPost, "/rbac/groups", bytes.NewReader(createBody))
|
||||||
|
createReq.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
createRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.CreateGroup)(createRec, createReq)
|
||||||
|
if createRec.Code != http.StatusCreated {
|
||||||
|
t.Fatalf("create group: status = %d, body: %s", createRec.Code, createRec.Body.String())
|
||||||
|
}
|
||||||
|
var group Group
|
||||||
|
if err := json.Unmarshal(createRec.Body.Bytes(), &group); err != nil {
|
||||||
|
t.Fatalf("group-response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
roleBody, _ := json.Marshal(groupActionRequest{GroupID: group.ID, Role: RoleUser})
|
||||||
|
roleReq := httptest.NewRequest(http.MethodPost, "/rbac/groups/role", bytes.NewReader(roleBody))
|
||||||
|
roleReq.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
roleRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.SetGroupRole)(roleRec, roleReq)
|
||||||
|
if roleRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("set group role: status = %d, body: %s", roleRec.Code, roleRec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
memberBody, _ := json.Marshal(groupActionRequest{GroupID: group.ID, UserID: member.ID})
|
||||||
|
memberReq := httptest.NewRequest(http.MethodPost, "/rbac/groups/members", bytes.NewReader(memberBody))
|
||||||
|
memberReq.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
memberRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.AddGroupMember)(memberRec, memberReq)
|
||||||
|
if memberRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("add member: status = %d, body: %s", memberRec.Code, memberRec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
listReq := httptest.NewRequest(http.MethodGet, "/rbac/groups", nil)
|
||||||
|
listReq.AddCookie(sessionCookieFor(t, issuer, admin.ID))
|
||||||
|
listRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListGroups)(listRec, listReq)
|
||||||
|
if listRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("list groups: status = %d, body: %s", listRec.Code, listRec.Body.String())
|
||||||
|
}
|
||||||
|
var groups []groupWithMembers
|
||||||
|
if err := json.Unmarshal(listRec.Body.Bytes(), &groups); err != nil {
|
||||||
|
t.Fatalf("groups-response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(groups) != 1 || len(groups[0].Members) != 1 || groups[0].Members[0] != member.ID {
|
||||||
|
t.Fatalf("erwartet 1 gruppe mit 1 mitglied (%s), habe %+v", member.ID, groups)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ohne Rechteverwaltungsberechtigung (normale 'user'-Rolle) wird jeder
|
||||||
|
// Endpunkt abgewiesen — Tenant-Isolation ist strukturell (Modell C, siehe
|
||||||
|
// GroupStore-Kommentar), diese Pruefung deckt die Rechte-Ebene ab.
|
||||||
|
func TestRequireManageUsers_RejectsPlainUser(t *testing.T) {
|
||||||
|
h, roles, users, _ := setupHandlerTest(t, "rbac05_reject_plain")
|
||||||
|
ctx := context.Background()
|
||||||
|
u, err := users.Create(ctx, "plain@acme.example", "Normaler Nutzer")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("nutzer anlegen: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := roles.Assign(ctx, u.ID, RoleUser, "system"); err != nil {
|
||||||
|
t.Fatalf("rolle setzen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret")
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/rbac/roles", nil)
|
||||||
|
req.AddCookie(sessionCookieFor(t, issuer, u.ID))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(issuer, h.ListRoles)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("status = %d, want 403 fuer benutzer ohne rechteverwaltung", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,273 @@
|
|||||||
|
// Package statuspage implementiert Core OPS-02: eine zentrale Statusseite,
|
||||||
|
// die den Health-Zustand aller registrierten Module aggregiert und den
|
||||||
|
// Verlauf vergangener Statusaenderungen speichert. Baut auf OPS-01
|
||||||
|
// (internal/health) auf, indem es GENAU die dort etablierten
|
||||||
|
// Readiness-Endpunkte je Modul abfragt — dieses Paket dupliziert keine
|
||||||
|
// Health-Check-Logik, es aggregiert nur deren Ergebnisse ueber die Zeit.
|
||||||
|
package statuspage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Status ist der aggregierte Zustand EINES Moduls zu einem Zeitpunkt.
|
||||||
|
type Status string
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusUp Status = "up"
|
||||||
|
StatusDown Status = "down"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Target ist ein zu ueberwachendes Modul mit seiner Readiness-URL
|
||||||
|
// (OPS-01-Endpunkt, z.B. "http://dms:8080/readyz"). Eigenstaendige
|
||||||
|
// Konfiguration statt Erweiterung von internal/moduleregistry.Module, um
|
||||||
|
// API-02 nicht anzufassen (Kein Umbau angrenzender Bereiche).
|
||||||
|
type Target struct {
|
||||||
|
Name string
|
||||||
|
HealthURL string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store persistiert Ueberwachungsziele und den Verlauf ihrer
|
||||||
|
// Statusaenderungen.
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RegisterTarget traegt ein zu ueberwachendes Modul ein oder aktualisiert
|
||||||
|
// dessen URL (Akzeptanzkriterium 1: "aller registrierten Module").
|
||||||
|
func (s *Store) RegisterTarget(ctx context.Context, t Target) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO status_targets (name, health_url)
|
||||||
|
VALUES ($1, $2)
|
||||||
|
ON CONFLICT (name) DO UPDATE SET health_url = $2
|
||||||
|
`, t.Name, t.HealthURL)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("ueberwachungsziel speichern: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) ListTargets(ctx context.Context) ([]Target, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `SELECT name, health_url FROM status_targets ORDER BY name`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("ueberwachungsziele auflisten: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Target
|
||||||
|
for rows.Next() {
|
||||||
|
var t Target
|
||||||
|
if err := rows.Scan(&t.Name, &t.HealthURL); err != nil {
|
||||||
|
return nil, fmt.Errorf("ueberwachungsziel lesen: %w", err)
|
||||||
|
}
|
||||||
|
out = append(out, t)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// recordIfChanged schreibt NUR dann einen neuen Verlaufseintrag, wenn sich
|
||||||
|
// der Status seit dem letzten Eintrag geaendert hat (oder es der erste
|
||||||
|
// Eintrag ist) — der Verlauf zeigt Statusaenderungen (Akzeptanzkriterium 3),
|
||||||
|
// nicht jede einzelne Abfrage.
|
||||||
|
func (s *Store) recordIfChanged(ctx context.Context, name string, status Status) error {
|
||||||
|
var lastStatus string
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT status FROM status_history WHERE name = $1 ORDER BY changed_at DESC LIMIT 1
|
||||||
|
`, name).Scan(&lastStatus)
|
||||||
|
if err != nil && err != pgx.ErrNoRows {
|
||||||
|
return fmt.Errorf("letzten status lesen: %w", err)
|
||||||
|
}
|
||||||
|
if err == nil && lastStatus == string(status) {
|
||||||
|
return nil // keine Aenderung, kein neuer Eintrag
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO status_history (name, status, changed_at) VALUES ($1, $2, now())
|
||||||
|
`, name, string(status)); err != nil {
|
||||||
|
return fmt.Errorf("statuseintrag schreiben: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ModuleStatus ist der aktuelle Zustand EINES Moduls fuer die Uebersicht.
|
||||||
|
type ModuleStatus struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Status Status `json:"status"`
|
||||||
|
LastChecked time.Time `json:"last_checked"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overview liefert den aktuellen (letzten bekannten) Status jedes
|
||||||
|
// registrierten Ziels (Akzeptanzkriterium 1). Ziele ohne jemals erfolgte
|
||||||
|
// Pruefung erscheinen mit Status "down" — ein Modul, ueber das nichts
|
||||||
|
// bekannt ist, gilt als nicht verfuegbar (Fail-Safe-Default), nicht als
|
||||||
|
// stillschweigend "ok".
|
||||||
|
func (s *Store) Overview(ctx context.Context) ([]ModuleStatus, error) {
|
||||||
|
targets, err := s.ListTargets(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
out := make([]ModuleStatus, 0, len(targets))
|
||||||
|
for _, t := range targets {
|
||||||
|
var status string
|
||||||
|
var changedAt time.Time
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT status, changed_at FROM status_history WHERE name = $1 ORDER BY changed_at DESC LIMIT 1
|
||||||
|
`, t.Name).Scan(&status, &changedAt)
|
||||||
|
if err == pgx.ErrNoRows {
|
||||||
|
out = append(out, ModuleStatus{Name: t.Name, Status: StatusDown})
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("aktuellen status lesen (%s): %w", t.Name, err)
|
||||||
|
}
|
||||||
|
out = append(out, ModuleStatus{Name: t.Name, Status: Status(status), LastChecked: changedAt})
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// HistoryEntry ist EIN Verlaufseintrag (Akzeptanzkriterium 3).
|
||||||
|
type HistoryEntry struct {
|
||||||
|
Status Status `json:"status"`
|
||||||
|
ChangedAt time.Time `json:"changed_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) History(ctx context.Context, name string) ([]HistoryEntry, error) {
|
||||||
|
rows, err := s.pool.Query(ctx, `
|
||||||
|
SELECT status, changed_at FROM status_history WHERE name = $1 ORDER BY changed_at DESC
|
||||||
|
`, name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("verlauf abfragen: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []HistoryEntry
|
||||||
|
for rows.Next() {
|
||||||
|
var e HistoryEntry
|
||||||
|
var status string
|
||||||
|
if err := rows.Scan(&status, &e.ChangedAt); err != nil {
|
||||||
|
return nil, fmt.Errorf("verlaufseintrag lesen: %w", err)
|
||||||
|
}
|
||||||
|
e.Status = Status(status)
|
||||||
|
out = append(out, e)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTPChecker fragt die Readiness-URL eines Moduls ab (OPS-01-Endpunkt) und
|
||||||
|
// liefert StatusUp NUR bei HTTP 200 — jeder andere Statuscode ODER ein
|
||||||
|
// Netzwerkfehler/Timeout gilt als StatusDown. Ein einzelnes nicht
|
||||||
|
// erreichbares Modul liefert einen FEHLERFREIEN StatusDown-Wert statt eines
|
||||||
|
// Go-Errors, damit Poller.Run ein fehlerhaftes Modul niemals mit einem
|
||||||
|
// anderen verwechseln oder den gesamten Zyklus abbrechen kann
|
||||||
|
// (Akzeptanzkriterium 2).
|
||||||
|
type HTTPChecker struct {
|
||||||
|
Client *http.Client
|
||||||
|
Timeout time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHTTPChecker(timeout time.Duration) *HTTPChecker {
|
||||||
|
return &HTTPChecker{Client: &http.Client{}, Timeout: timeout}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *HTTPChecker) Check(ctx context.Context, url string) Status {
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, c.Timeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return StatusDown
|
||||||
|
}
|
||||||
|
resp, err := c.Client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return StatusDown
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode == http.StatusOK {
|
||||||
|
return StatusUp
|
||||||
|
}
|
||||||
|
return StatusDown
|
||||||
|
}
|
||||||
|
|
||||||
|
// Poller fragt periodisch alle Ziele ab und schreibt Statusaenderungen fort.
|
||||||
|
type Poller struct {
|
||||||
|
store *Store
|
||||||
|
checker *HTTPChecker
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPoller(store *Store, checker *HTTPChecker) *Poller {
|
||||||
|
return &Poller{store: store, checker: checker}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PollOnce prueft ALLE Ziele in einem Durchlauf. Ein fehlschlagendes Ziel
|
||||||
|
// (Netzwerkfehler, Timeout, Nicht-200) wird als StatusDown vermerkt und
|
||||||
|
// haelt die Pruefung der UEBRIGEN Ziele nicht auf — die Schleife laeuft
|
||||||
|
// sequenziell weiter, kein Ziel kann ein anderes blockieren
|
||||||
|
// (Akzeptanzkriterium 2 / Pruefung 2).
|
||||||
|
func (p *Poller) PollOnce(ctx context.Context) error {
|
||||||
|
targets, err := p.store.ListTargets(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, t := range targets {
|
||||||
|
status := p.checker.Check(ctx, t.HealthURL)
|
||||||
|
if err := p.store.recordIfChanged(ctx, t.Name, status); err != nil {
|
||||||
|
// Ein Schreibfehler fuer EIN Ziel darf die Pruefung der anderen
|
||||||
|
// nicht verhindern — dieselbe Fail-Isolation wie bei einem
|
||||||
|
// unerreichbaren Modul.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run ruft PollOnce in festen Abstaenden auf, bis ctx beendet wird —
|
||||||
|
// dieselbe Konvention wie internal/tenant.Lifecycle.RunSweeper.
|
||||||
|
func (p *Poller) Run(ctx context.Context, interval time.Duration) {
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-ticker.C:
|
||||||
|
_ = p.PollOnce(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- HTTP-Bindung fuer die Oberflaeche ---
|
||||||
|
|
||||||
|
func (s *Store) OverviewHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
overview, err := s.Overview(r.Context())
|
||||||
|
writeJSONResult(w, overview, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) HistoryHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
name := r.URL.Query().Get("name")
|
||||||
|
history, err := s.History(r.Context(), name)
|
||||||
|
writeJSONResult(w, history, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeJSONResult(w http.ResponseWriter, body any, err error) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
_ = json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_ = json.NewEncoder(w).Encode(body)
|
||||||
|
}
|
||||||
@@ -0,0 +1,198 @@
|
|||||||
|
package statuspage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*Store, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS status_targets (name TEXT PRIMARY KEY, health_url TEXT NOT NULL);
|
||||||
|
CREATE TABLE IF NOT EXISTS status_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), name TEXT NOT NULL, status TEXT NOT NULL,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func uniqueName(prefix string) string {
|
||||||
|
return fmt.Sprintf("%s-%d", prefix, time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Uebersicht zeigt den Status ALLER registrierten
|
||||||
|
// Module.
|
||||||
|
func TestOverview_ShowsAllRegisteredModules(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }))
|
||||||
|
defer up.Close()
|
||||||
|
|
||||||
|
nameA, nameB := uniqueName("mod-a"), uniqueName("mod-b")
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: nameA, HealthURL: up.URL}); err != nil {
|
||||||
|
t.Fatalf("target a: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: nameB, HealthURL: up.URL}); err != nil {
|
||||||
|
t.Fatalf("target b: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
poller := NewPoller(store, NewHTTPChecker(time.Second))
|
||||||
|
if err := poller.PollOnce(ctx); err != nil {
|
||||||
|
t.Fatalf("poll: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
overview, err := store.Overview(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("overview: %v", err)
|
||||||
|
}
|
||||||
|
// Overview() listet ALLE jemals registrierten Ziele (auch aus fruehreren
|
||||||
|
// Testlaeufen auf derselben geteilten Test-DB) — hier wird deshalb nur
|
||||||
|
// der Status von nameA/nameB geprueft, nicht jeder Eintrag der Tabelle.
|
||||||
|
statusByName := map[string]Status{}
|
||||||
|
for _, m := range overview {
|
||||||
|
statusByName[m.Name] = m.Status
|
||||||
|
}
|
||||||
|
if statusByName[nameA] != StatusUp {
|
||||||
|
t.Fatalf("modul %s: status = %s, want up", nameA, statusByName[nameA])
|
||||||
|
}
|
||||||
|
if statusByName[nameB] != StatusUp {
|
||||||
|
t.Fatalf("modul %s: status = %s, want up", nameB, statusByName[nameB])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1/2: ein simulierter Ausfall eines Moduls
|
||||||
|
// wird sichtbar, das ANDERE Modul bleibt unbeeinflusst und die Pruefung
|
||||||
|
// beider laeuft trotzdem in einem Durchlauf durch (kein Totalausfall).
|
||||||
|
func TestPollOnce_IsolatesFailingModuleFromOthers(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }))
|
||||||
|
defer up.Close()
|
||||||
|
down := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusInternalServerError) }))
|
||||||
|
down.Close() // Server sofort schliessen -> Verbindung tatsaechlich unerreichbar (simulierter Ausfall)
|
||||||
|
|
||||||
|
healthyName, downName := uniqueName("healthy"), uniqueName("down")
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: healthyName, HealthURL: up.URL}); err != nil {
|
||||||
|
t.Fatalf("target healthy: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: downName, HealthURL: down.URL}); err != nil {
|
||||||
|
t.Fatalf("target down: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
poller := NewPoller(store, NewHTTPChecker(500*time.Millisecond))
|
||||||
|
if err := poller.PollOnce(ctx); err != nil {
|
||||||
|
t.Fatalf("poll haette trotz einem ausgefallenen modul erfolgreich durchlaufen sollen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
overview, err := store.Overview(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("overview: %v", err)
|
||||||
|
}
|
||||||
|
statusByName := map[string]Status{}
|
||||||
|
for _, m := range overview {
|
||||||
|
statusByName[m.Name] = m.Status
|
||||||
|
}
|
||||||
|
if statusByName[healthyName] != StatusUp {
|
||||||
|
t.Fatalf("healthy modul: status = %s, want up", statusByName[healthyName])
|
||||||
|
}
|
||||||
|
if statusByName[downName] != StatusDown {
|
||||||
|
t.Fatalf("ausgefallenes modul: status = %s, want down", statusByName[downName])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Verlauf vergangener Statusaenderungen ist einsehbar.
|
||||||
|
func TestHistory_RecordsStatusTransitions(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
name := uniqueName("flaky")
|
||||||
|
|
||||||
|
up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }))
|
||||||
|
defer up.Close()
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: name, HealthURL: up.URL}); err != nil {
|
||||||
|
t.Fatalf("target: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
poller := NewPoller(store, NewHTTPChecker(time.Second))
|
||||||
|
if err := poller.PollOnce(ctx); err != nil {
|
||||||
|
t.Fatalf("poll 1: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ziel wird "abgeschaltet" (URL zeigt jetzt auf einen bereits
|
||||||
|
// geschlossenen Server) -> naechster Poll erkennt den Statuswechsel.
|
||||||
|
closedURL := up.URL
|
||||||
|
up.Close()
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: name, HealthURL: closedURL}); err != nil {
|
||||||
|
t.Fatalf("target aktualisieren: %v", err)
|
||||||
|
}
|
||||||
|
if err := poller.PollOnce(ctx); err != nil {
|
||||||
|
t.Fatalf("poll 2: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
history, err := store.History(ctx, name)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("history: %v", err)
|
||||||
|
}
|
||||||
|
if len(history) != 2 {
|
||||||
|
t.Fatalf("erwartet genau 2 statuswechsel (up -> down), habe %d: %+v", len(history), history)
|
||||||
|
}
|
||||||
|
if history[0].Status != StatusDown || history[1].Status != StatusUp {
|
||||||
|
t.Fatalf("erwartet verlauf [down, up] (neueste zuerst), habe: %+v", history)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wiederholte Polls OHNE Statuswechsel duerfen den Verlauf nicht mit
|
||||||
|
// identischen Eintraegen fluten (siehe recordIfChanged).
|
||||||
|
func TestHistory_DoesNotDuplicateUnchangedStatus(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
name := uniqueName("stable")
|
||||||
|
|
||||||
|
up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }))
|
||||||
|
defer up.Close()
|
||||||
|
if err := store.RegisterTarget(ctx, Target{Name: name, HealthURL: up.URL}); err != nil {
|
||||||
|
t.Fatalf("target: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
poller := NewPoller(store, NewHTTPChecker(time.Second))
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
if err := poller.PollOnce(ctx); err != nil {
|
||||||
|
t.Fatalf("poll %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
history, err := store.History(ctx, name)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("history: %v", err)
|
||||||
|
}
|
||||||
|
if len(history) != 1 {
|
||||||
|
t.Fatalf("erwartet genau 1 eintrag trotz 3 unveraenderter polls, habe %d", len(history))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package usage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AggregateFunc berechnet/aktualisiert Zaehlerstaende aus einer autoritativen
|
||||||
|
// Quelle (z.B. "zaehle Zeilen in einer Modul-Tabelle") — die konkrete Quelle
|
||||||
|
// haengt vom jeweiligen Modul ab und ist nicht Teil dieser Kachel. Das
|
||||||
|
// Aggregations-Grundgerüst selbst (periodischer Trigger) ist es.
|
||||||
|
type AggregateFunc func(ctx context.Context) error
|
||||||
|
|
||||||
|
// RunPeriodicAggregation ruft aggregate in festen Abstaenden auf, bis ctx
|
||||||
|
// beendet wird — dieselbe In-Prozess-Worker-Goroutine-Konvention wie
|
||||||
|
// internal/tenant.Lifecycle.RunSweeper (Akzeptanzkriterium 1: "periodisch
|
||||||
|
// aggregiert").
|
||||||
|
func RunPeriodicAggregation(ctx context.Context, interval time.Duration, aggregate AggregateFunc) {
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-ticker.C:
|
||||||
|
if err := aggregate(ctx); err != nil {
|
||||||
|
slog.Error("nutzungszaehler-aggregation fehlgeschlagen", "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
// Package usage implementiert Core LIC-03: Nutzungszaehler je Tenant
|
||||||
|
// (Benutzeranzahl, Speicherverbrauch, API-Aufrufe, ...) und die Pruefung
|
||||||
|
// gegen konfigurierte Quotas. Quotas sind Konfiguration (Tabellenzeile), kein
|
||||||
|
// Hardcode — Zitadel/Unleash-Vorbild.
|
||||||
|
package usage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrNoQuota = errors.New("usage: keine quota fuer diese metrik konfiguriert")
|
||||||
|
|
||||||
|
// Status ist die definierte Reaktion einer Quota-Pruefung (Akzeptanzkriterium 2).
|
||||||
|
type Status string
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusOK Status = "ok"
|
||||||
|
StatusWarning Status = "warning" // Schwelle (80%) erreicht, aber noch nicht ueberschritten
|
||||||
|
StatusExceeded Status = "exceeded" // Quota ueberschritten — neue Ressourcen sollten gesperrt werden
|
||||||
|
)
|
||||||
|
|
||||||
|
// warningThreshold liegt bei 80% der Quota.
|
||||||
|
const warningThreshold = 0.8
|
||||||
|
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Increment erhoeht einen Zaehler ATOMAR ueber ein einziges SQL-Statement
|
||||||
|
// (UPSERT mit value = value + delta) statt Read-Modify-Write in Go — das
|
||||||
|
// haelt Zaehlerstaende bei parallelen Schreibzugriffen konsistent
|
||||||
|
// (Akzeptanzkriterium 1 / Pruefung 2), ohne eine Anwendungs-Transaktion mit
|
||||||
|
// Lock zu brauchen.
|
||||||
|
func (s *Store) Increment(ctx context.Context, tenantID, metric string, delta int64) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO usage_counters (tenant_id, metric, value, updated_at)
|
||||||
|
VALUES ($1, $2, $3, now())
|
||||||
|
ON CONFLICT (tenant_id, metric) DO UPDATE
|
||||||
|
SET value = usage_counters.value + $3, updated_at = now()
|
||||||
|
`, tenantID, metric, delta)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("zaehler erhoehen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get liefert den aktuellen Zaehlerstand — 0, wenn noch nie erhoeht wurde.
|
||||||
|
// Der Wert ist strikt tenant-gescoped (Akzeptanzkriterium 3 / Pruefung 3).
|
||||||
|
func (s *Store) Get(ctx context.Context, tenantID, metric string) (int64, error) {
|
||||||
|
var value int64
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT value FROM usage_counters WHERE tenant_id = $1 AND metric = $2
|
||||||
|
`, tenantID, metric).Scan(&value)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
return 0, fmt.Errorf("zaehler lesen: %w", err)
|
||||||
|
}
|
||||||
|
return value, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetQuota legt die Obergrenze fuer (tenantID, metric) fest — Konfiguration,
|
||||||
|
// kein Hardcode.
|
||||||
|
func (s *Store) SetQuota(ctx context.Context, tenantID, metric string, limit int64) error {
|
||||||
|
_, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO usage_quotas (tenant_id, metric, limit_value)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
ON CONFLICT (tenant_id, metric) DO UPDATE SET limit_value = $3
|
||||||
|
`, tenantID, metric, limit)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("quota setzen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) GetQuota(ctx context.Context, tenantID, metric string) (int64, error) {
|
||||||
|
var limit int64
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT limit_value FROM usage_quotas WHERE tenant_id = $1 AND metric = $2
|
||||||
|
`, tenantID, metric).Scan(&limit)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return 0, ErrNoQuota
|
||||||
|
}
|
||||||
|
return 0, fmt.Errorf("quota lesen: %w", err)
|
||||||
|
}
|
||||||
|
return limit, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check liefert Zaehlerstand, konfigurierte Quota und die daraus abgeleitete
|
||||||
|
// Reaktion (Akzeptanzkriterium 2 / Pruefung 1). Ist keine Quota konfiguriert,
|
||||||
|
// gilt die Metrik als unbegrenzt (StatusOK).
|
||||||
|
func (s *Store) Check(ctx context.Context, tenantID, metric string) (value, limit int64, status Status, err error) {
|
||||||
|
value, err = s.Get(ctx, tenantID, metric)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
limit, err = s.GetQuota(ctx, tenantID, metric)
|
||||||
|
if errors.Is(err, ErrNoQuota) {
|
||||||
|
return value, 0, StatusOK, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case value > limit:
|
||||||
|
return value, limit, StatusExceeded, nil
|
||||||
|
case limit > 0 && float64(value) >= warningThreshold*float64(limit):
|
||||||
|
return value, limit, StatusWarning, nil
|
||||||
|
default:
|
||||||
|
return value, limit, StatusOK, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reaction wird aufgerufen, wenn Check einen Nicht-OK-Status liefert
|
||||||
|
// (Akzeptanzkriterium 2: "definierte Reaktion").
|
||||||
|
type Reaction func(ctx context.Context, tenantID, metric string, value, limit int64, status Status)
|
||||||
|
|
||||||
|
// Enforce fuehrt Check aus und ruft react auf, wenn der Status nicht OK ist —
|
||||||
|
// die konkrete "Sperre neuer Ressourcen"/Benachrichtigung liegt beim
|
||||||
|
// Aufrufer (z.B. TEN-02 vor dem Anlegen eines neuen Benutzers), Enforce
|
||||||
|
// garantiert nur, dass die Reaktion zuverlaessig ausgeloest wird.
|
||||||
|
func (s *Store) Enforce(ctx context.Context, tenantID, metric string, react Reaction) (Status, error) {
|
||||||
|
value, limit, status, err := s.Check(ctx, tenantID, metric)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if status != StatusOK && react != nil {
|
||||||
|
react(ctx, tenantID, metric, value, limit, status)
|
||||||
|
}
|
||||||
|
return status, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,206 @@
|
|||||||
|
package usage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*Store, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS usage_counters (
|
||||||
|
tenant_id UUID NOT NULL, metric TEXT NOT NULL, value BIGINT NOT NULL DEFAULT 0,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS usage_quotas (
|
||||||
|
tenant_id UUID NOT NULL, metric TEXT NOT NULL, limit_value BIGINT NOT NULL,
|
||||||
|
PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewStore(pool), cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTenantID() string {
|
||||||
|
return fmt.Sprintf("00000000-0000-0000-0000-%012d", time.Now().UnixNano()%1e12)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 2: Aggregationsjob liefert bei parallelen
|
||||||
|
// Schreibzugriffen konsistente Zaehlerstaende.
|
||||||
|
func TestIncrement_ConsistentUnderConcurrentWrites(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
tenant := newTenantID()
|
||||||
|
|
||||||
|
const goroutines = 50
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < goroutines; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
if err := store.Increment(ctx, tenant, "api_calls", 1); err != nil {
|
||||||
|
t.Errorf("increment: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
value, err := store.Get(ctx, tenant, "api_calls")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get: %v", err)
|
||||||
|
}
|
||||||
|
if value != goroutines {
|
||||||
|
t.Fatalf("erwartet %d, habe %d (hinweis auf lost update unter nebenlaeufigkeit)", goroutines, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Zaehlerstand eines Tenants beeinflusst
|
||||||
|
// nicht den eines anderen.
|
||||||
|
func TestIncrement_IsolatedBetweenTenants(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
tenantA, tenantB := newTenantID(), newTenantID()
|
||||||
|
|
||||||
|
if err := store.Increment(ctx, tenantA, "users", 5); err != nil {
|
||||||
|
t.Fatalf("increment a: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.Increment(ctx, tenantB, "users", 1); err != nil {
|
||||||
|
t.Fatalf("increment b: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
valA, err := store.Get(ctx, tenantA, "users")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get a: %v", err)
|
||||||
|
}
|
||||||
|
valB, err := store.Get(ctx, tenantB, "users")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get b: %v", err)
|
||||||
|
}
|
||||||
|
if valA != 5 || valB != 1 {
|
||||||
|
t.Fatalf("erwartet a=5 b=1, habe a=%d b=%d", valA, valB)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Quota-Ueberschreitung wird automatisiert
|
||||||
|
// erkannt und die definierte Reaktion ausgeloest.
|
||||||
|
func TestEnforce_TriggersReactionOnExceeded(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
tenant := newTenantID()
|
||||||
|
|
||||||
|
if err := store.SetQuota(ctx, tenant, "users", 10); err != nil {
|
||||||
|
t.Fatalf("set quota: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.Increment(ctx, tenant, "users", 11); err != nil {
|
||||||
|
t.Fatalf("increment: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var reacted bool
|
||||||
|
var gotStatus Status
|
||||||
|
status, err := store.Enforce(ctx, tenant, "users", func(ctx context.Context, tenantID, metric string, value, limit int64, status Status) {
|
||||||
|
reacted = true
|
||||||
|
gotStatus = status
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("enforce: %v", err)
|
||||||
|
}
|
||||||
|
if status != StatusExceeded {
|
||||||
|
t.Fatalf("erwartet StatusExceeded, habe %q", status)
|
||||||
|
}
|
||||||
|
if !reacted || gotStatus != StatusExceeded {
|
||||||
|
t.Fatal("erwartet ausgeloeste reaktion mit StatusExceeded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheck_WarningThresholdAndOK(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
tenant := newTenantID()
|
||||||
|
|
||||||
|
if err := store.SetQuota(ctx, tenant, "storage_mb", 100); err != nil {
|
||||||
|
t.Fatalf("set quota: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := store.Increment(ctx, tenant, "storage_mb", 50); err != nil {
|
||||||
|
t.Fatalf("increment: %v", err)
|
||||||
|
}
|
||||||
|
_, _, status, err := store.Check(ctx, tenant, "storage_mb")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("check: %v", err)
|
||||||
|
}
|
||||||
|
if status != StatusOK {
|
||||||
|
t.Fatalf("bei 50%% erwartet StatusOK, habe %q", status)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := store.Increment(ctx, tenant, "storage_mb", 35); err != nil { // insgesamt 85%
|
||||||
|
t.Fatalf("increment: %v", err)
|
||||||
|
}
|
||||||
|
_, _, status, err = store.Check(ctx, tenant, "storage_mb")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("check: %v", err)
|
||||||
|
}
|
||||||
|
if status != StatusWarning {
|
||||||
|
t.Fatalf("bei 85%% erwartet StatusWarning, habe %q", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheck_NoQuotaMeansUnlimited(t *testing.T) {
|
||||||
|
store, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
tenant := newTenantID()
|
||||||
|
|
||||||
|
if err := store.Increment(ctx, tenant, "api_calls", 1_000_000); err != nil {
|
||||||
|
t.Fatalf("increment: %v", err)
|
||||||
|
}
|
||||||
|
_, _, status, err := store.Check(ctx, tenant, "api_calls")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("check: %v", err)
|
||||||
|
}
|
||||||
|
if status != StatusOK {
|
||||||
|
t.Fatalf("ohne konfigurierte quota erwartet StatusOK, habe %q", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunPeriodicAggregation_CallsRepeatedly(t *testing.T) {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Millisecond)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
calls := 0
|
||||||
|
RunPeriodicAggregation(ctx, 20*time.Millisecond, func(ctx context.Context) error {
|
||||||
|
mu.Lock()
|
||||||
|
calls++
|
||||||
|
mu.Unlock()
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
if calls < 3 {
|
||||||
|
t.Fatalf("erwartet mehrfache aufrufe innerhalb von 120ms bei 20ms interval, habe %d", calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS audit_events;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Zentrales Audit-Log-Modell (AUD-01, siehe core-kanban/tickets/AUD-01.md).
|
||||||
|
-- Getrennt vom allgemeinen Anwendungs-Log (Akzeptanzkriterium 2): eigene
|
||||||
|
-- Tabelle, eigenes Paket (internal/audit), kein Log-Framework.
|
||||||
|
-- tenant_slug ist NOT NULL + darf nicht leer sein (Akzeptanzkriterium 2 /
|
||||||
|
-- Pruefung 2) — mandantenuebergreifende Ereignisse nutzen den reservierten
|
||||||
|
-- Wert 'system', niemals NULL oder leeren String.
|
||||||
|
CREATE TABLE audit_events (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
occurred_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
tenant_slug TEXT NOT NULL CHECK (tenant_slug <> ''),
|
||||||
|
actor TEXT NOT NULL CHECK (actor <> ''),
|
||||||
|
action TEXT NOT NULL CHECK (action <> ''),
|
||||||
|
target TEXT NOT NULL,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX audit_events_tenant_slug_idx ON audit_events (tenant_slug, occurred_at);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS config_value_history;
|
||||||
|
DROP TABLE IF EXISTS config_values;
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
-- Zentraler Konfigurationsdienst (CFG-01, siehe core-kanban/tickets/CFG-01.md).
|
||||||
|
-- scope = 'global' fuer globale Defaults, sonst der Tenant-Slug. config_values
|
||||||
|
-- haelt den AKTUELLEN Stand je (key, scope); config_value_history haelt JEDE
|
||||||
|
-- Aenderung fest (Akzeptanzkriterium 2: versioniert nachvollziehbar).
|
||||||
|
CREATE TABLE config_values (
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
scope TEXT NOT NULL CHECK (scope <> ''),
|
||||||
|
value TEXT NOT NULL,
|
||||||
|
version INT NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (key, scope)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE config_value_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
scope TEXT NOT NULL,
|
||||||
|
value TEXT NOT NULL,
|
||||||
|
version INT NOT NULL,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX config_value_history_key_scope_idx ON config_value_history (key, scope, version);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS tenant_licenses;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- Lizenzumfang pro Mandant (LIC-01, siehe core-kanban/tickets/LIC-01.md).
|
||||||
|
-- Genau ein Lizenzdatensatz pro Tenant (tenant_id PK) — ein neues Einspielen
|
||||||
|
-- ersetzt den vorherigen Datensatz vollstaendig statt eine Historie zu fuehren.
|
||||||
|
CREATE TABLE tenant_licenses (
|
||||||
|
tenant_id UUID PRIMARY KEY REFERENCES tenants(id),
|
||||||
|
plan TEXT NOT NULL,
|
||||||
|
modules TEXT[] NOT NULL,
|
||||||
|
issued_at TIMESTAMPTZ NOT NULL,
|
||||||
|
valid_until TIMESTAMPTZ NOT NULL,
|
||||||
|
raw_key TEXT NOT NULL,
|
||||||
|
installed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS notification_jobs;
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
-- Benachrichtigungs-Dispatcher-Warteschlange (CFG-02, siehe
|
||||||
|
-- core-kanban/tickets/CFG-02.md). Postgres-basiert statt Redis/AMQP
|
||||||
|
-- (Projekt-Konvention, siehe nexarch-state.json techstack.job_queue) —
|
||||||
|
-- Zeilen ueberleben einen Neustart des Dispatcher-Prozesses unveraendert
|
||||||
|
-- (Akzeptanzkriterium 3).
|
||||||
|
CREATE TABLE notification_jobs (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
channel TEXT NOT NULL,
|
||||||
|
recipient TEXT NOT NULL,
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
||||||
|
attempts INT NOT NULL DEFAULT 0,
|
||||||
|
max_attempts INT NOT NULL DEFAULT 5,
|
||||||
|
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
last_error TEXT,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX notification_jobs_due_idx ON notification_jobs (status, next_attempt_at);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS usage_quotas;
|
||||||
|
DROP TABLE IF EXISTS usage_counters;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- Nutzungszaehler & Quotas je Tenant (LIC-03, siehe core-kanban/tickets/LIC-03.md).
|
||||||
|
CREATE TABLE usage_counters (
|
||||||
|
tenant_id UUID NOT NULL,
|
||||||
|
metric TEXT NOT NULL,
|
||||||
|
value BIGINT NOT NULL DEFAULT 0,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE usage_quotas (
|
||||||
|
tenant_id UUID NOT NULL,
|
||||||
|
metric TEXT NOT NULL,
|
||||||
|
limit_value BIGINT NOT NULL,
|
||||||
|
PRIMARY KEY (tenant_id, metric)
|
||||||
|
);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS in_app_notifications;
|
||||||
|
DROP TABLE IF EXISTS notification_templates;
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-- Benachrichtigungs-Kanaele: Vorlagen (E-Mail) + In-App-Nachrichten
|
||||||
|
-- (CFG-03, siehe core-kanban/tickets/CFG-03.md). Beide leben in der
|
||||||
|
-- Registry-DB, analog zu feature_flags/config_values — modulübergreifende
|
||||||
|
-- Konfiguration/UI-Zustand, keine Mandanten-Geschaeftsdaten.
|
||||||
|
|
||||||
|
-- tenant_slug = 'global' ist der Fallback-Wert, wenn ein Tenant keine
|
||||||
|
-- eigene Vorlage gesetzt hat (Akzeptanzkriterium 3: Vorlagen pro Tenant
|
||||||
|
-- anpassbar, mit sinnvollem Default).
|
||||||
|
CREATE TABLE notification_templates (
|
||||||
|
tenant_slug TEXT NOT NULL,
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
subject TEXT NOT NULL,
|
||||||
|
body TEXT NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (tenant_slug, key)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE in_app_notifications (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
tenant_slug TEXT NOT NULL,
|
||||||
|
user_id TEXT NOT NULL,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
body TEXT NOT NULL,
|
||||||
|
read_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX in_app_notifications_user_idx ON in_app_notifications (tenant_slug, user_id, created_at);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE status_history;
|
||||||
|
DROP TABLE status_targets;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- Zentrale Statusseite (OPS-02, siehe core-kanban/tickets/OPS-02.md) —
|
||||||
|
-- ueberwachte Module und der Verlauf ihrer Statusaenderungen.
|
||||||
|
CREATE TABLE status_targets (
|
||||||
|
name TEXT PRIMARY KEY,
|
||||||
|
health_url TEXT NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE status_history (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL,
|
||||||
|
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX status_history_name_idx ON status_history (name, changed_at DESC);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE notification_preferences;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- CFG-04: Benachrichtigungspraeferenzen je Benutzer, Ereignistyp und Kanal.
|
||||||
|
-- Lebt wie notification_templates/in_app_notifications (CFG-03) in der
|
||||||
|
-- Registry-DB — modulübergreifende Konfiguration, keine Mandanten-Geschaeftsdaten.
|
||||||
|
--
|
||||||
|
-- Kein Row = aktiviert (Opt-out-Modell): ein Benutzer verpasst nichts, bis er
|
||||||
|
-- aktiv einen Kanal/Ereignistyp abschaltet — sicherer Default als Opt-in.
|
||||||
|
CREATE TABLE notification_preferences (
|
||||||
|
tenant_slug TEXT NOT NULL,
|
||||||
|
user_id TEXT NOT NULL,
|
||||||
|
event_type TEXT NOT NULL,
|
||||||
|
channel TEXT NOT NULL,
|
||||||
|
enabled BOOLEAN NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (tenant_slug, user_id, event_type, channel)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX notification_preferences_tenant_idx ON notification_preferences (tenant_slug);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE IF EXISTS group_members;
|
||||||
|
DROP TABLE IF EXISTS groups;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
-- Gruppen/Abteilungen mit Rollenzuweisung auf Gruppenebene (RBAC-03, siehe
|
||||||
|
-- core-kanban/tickets/RBAC-03.md). Lebt in der Tenant-Datenbank (Modell C) —
|
||||||
|
-- Gruppen sind implizit tenant-isoliert, da jede Tenant-DB ihre eigenen hat.
|
||||||
|
CREATE TABLE groups (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
role TEXT CHECK (role IN ('user', 'tenant_admin')),
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- ON DELETE CASCADE: Loeschen einer Gruppe entzieht die gruppenbasierten
|
||||||
|
-- Rechte automatisch, ohne Benutzerkonten selbst zu beruehren
|
||||||
|
-- (Akzeptanzkriterium 3).
|
||||||
|
CREATE TABLE group_members (
|
||||||
|
group_id UUID NOT NULL REFERENCES groups(id) ON DELETE CASCADE,
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
added_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (group_id, user_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX group_members_user_idx ON group_members (user_id);
|
||||||
+10
-10
@@ -1,16 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Setzt die nexarch-Testumgebung zurueck: loescht die geteilte
|
|
||||||
# Registry-Tabelle "tenants" in der postgres-Wartungsdatenbank sowie alle
|
|
||||||
# tenant_*-Datenbanken. Noetig, weil verschiedene Feature-Branches
|
|
||||||
# unterschiedliche Registry-Schemata erwarten, aber dieselbe physische
|
|
||||||
# Postgres-Instanz auf dem Testhost teilen (siehe [[project-nexarch-test-infra]]).
|
|
||||||
#
|
|
||||||
# Aufruf: NEXARCH_TEST_DB_PASSWORD=... ./scripts/reset-test-env.sh
|
|
||||||
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"
|
||||||
|
|
||||||
# Alle Registry-Tabellen, die von migrations/*.up.sql angelegt werden -
|
# Alle Registry-Tabellen, die von migrations/*.up.sql angelegt werden -
|
||||||
@@ -32,10 +23,19 @@ psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EX
|
|||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS feature_flags CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS feature_flags CASCADE;"
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS module_credentials CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS module_credentials CASCADE;"
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS modules CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS modules CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS usage_quotas CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS usage_counters CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenant_licenses CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS audit_events CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS notification_preferences CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS notification_channels CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS notification_jobs CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS config_values CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS status_history CASCADE;"
|
||||||
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS status_targets 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,24 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Ein-Kommando-Pruefung fuer den aktuellen Code-Stand auf dem Testhost:
|
|
||||||
# Registry+Tenant-DBs zuruecksetzen, dann build/vet/test in einem Rutsch.
|
|
||||||
# -p 1 ist Pflicht, da mehrere Pakete dieselbe physische Registry-Tabelle auf
|
|
||||||
# dem Testhost teilen (siehe [[project-nexarch-test-infra]]).
|
|
||||||
#
|
|
||||||
# Aufruf: NEXARCH_TEST_DB_PASSWORD=... ./scripts/run-checks.sh
|
|
||||||
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
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ export default function LoginPage() {
|
|||||||
<TextField
|
<TextField
|
||||||
label="E-Mail-Adresse"
|
label="E-Mail-Adresse"
|
||||||
type="email"
|
type="email"
|
||||||
autoComplete="username"
|
autoComplete="email"
|
||||||
required
|
required
|
||||||
value={email}
|
value={email}
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export default function PasswordResetRequestPage() {
|
|||||||
<TextField
|
<TextField
|
||||||
label="E-Mail-Adresse"
|
label="E-Mail-Adresse"
|
||||||
type="email"
|
type="email"
|
||||||
autoComplete="username"
|
autoComplete="email"
|
||||||
required
|
required
|
||||||
value={email}
|
value={email}
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "NEXARCH Audit-Log",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function RootLayout({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<html lang="de">
|
||||||
|
<body
|
||||||
|
style={{
|
||||||
|
fontFamily: typography.fontFamily,
|
||||||
|
margin: 0,
|
||||||
|
background: "var(--shl-color-background, #ffffff)",
|
||||||
|
color: "var(--shl-color-text-primary, #14181f)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ThemeProvider>
|
||||||
|
<I18nProvider initialLocale="de">
|
||||||
|
<ToastProvider>{children}</ToastProvider>
|
||||||
|
</I18nProvider>
|
||||||
|
</ThemeProvider>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { fetchRecords, exportURL, type AuditRecord, type AuditFilter } from "@/lib/api";
|
||||||
|
|
||||||
|
const EMPTY_FILTER: AuditFilter = { tenant: "", actor: "", action: "", from: "", to: "" };
|
||||||
|
|
||||||
|
export default function Page() {
|
||||||
|
const [caller, setCaller] = useState("");
|
||||||
|
const [filter, setFilter] = useState<AuditFilter>(EMPTY_FILTER);
|
||||||
|
const [records, setRecords] = useState<AuditRecord[] | null>(null);
|
||||||
|
const [selected, setSelected] = useState<AuditRecord | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
async function onSearch() {
|
||||||
|
setError(null);
|
||||||
|
setSelected(null);
|
||||||
|
try {
|
||||||
|
const data = await fetchRecords(caller.trim(), filter);
|
||||||
|
setRecords(data);
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e.message ?? "Unbekannter Fehler");
|
||||||
|
setRecords(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onExport(format: "csv" | "json") {
|
||||||
|
const url = exportURL(caller.trim(), filter, format);
|
||||||
|
// Echter Datei-Download ueber Browser-Navigation, KEIN erneutes Parsen
|
||||||
|
// im Frontend (Akzeptanzkriterium 2: Export aus AUD-03 direkt ausloesbar).
|
||||||
|
window.open(url, "_blank");
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 1000, margin: "0 auto", padding: "2rem 1rem" }}>
|
||||||
|
<h1>Audit-Log</h1>
|
||||||
|
|
||||||
|
<div style={{ display: "grid", gap: "0.5rem", gridTemplateColumns: "repeat(3, 1fr)", marginBottom: "1rem" }}>
|
||||||
|
<input
|
||||||
|
value={caller}
|
||||||
|
onChange={(e) => setCaller(e.target.value)}
|
||||||
|
placeholder="Admin-Token (Berechtigung)"
|
||||||
|
aria-label="Admin-Token (Berechtigung)"
|
||||||
|
style={{ padding: "0.5rem", gridColumn: "span 3" }}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
value={filter.tenant}
|
||||||
|
onChange={(e) => setFilter({ ...filter, tenant: e.target.value })}
|
||||||
|
placeholder="Tenant"
|
||||||
|
aria-label="Tenant"
|
||||||
|
style={{ padding: "0.5rem" }}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
value={filter.actor}
|
||||||
|
onChange={(e) => setFilter({ ...filter, actor: e.target.value })}
|
||||||
|
placeholder="Akteur"
|
||||||
|
aria-label="Akteur"
|
||||||
|
style={{ padding: "0.5rem" }}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
value={filter.action}
|
||||||
|
onChange={(e) => setFilter({ ...filter, action: e.target.value })}
|
||||||
|
placeholder="Aktion"
|
||||||
|
aria-label="Aktion"
|
||||||
|
style={{ padding: "0.5rem" }}
|
||||||
|
/>
|
||||||
|
<label>
|
||||||
|
Von
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={filter.from}
|
||||||
|
onChange={(e) =>
|
||||||
|
setFilter({ ...filter, from: e.target.value ? new Date(e.target.value).toISOString() : "" })
|
||||||
|
}
|
||||||
|
style={{ width: "100%", padding: "0.4rem" }}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Bis
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={filter.to}
|
||||||
|
onChange={(e) =>
|
||||||
|
setFilter({ ...filter, to: e.target.value ? new Date(e.target.value).toISOString() : "" })
|
||||||
|
}
|
||||||
|
style={{ width: "100%", padding: "0.4rem" }}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style={{ display: "flex", gap: "0.5rem", marginBottom: "1rem" }}>
|
||||||
|
<button onClick={onSearch}>Suchen</button>
|
||||||
|
<button onClick={() => onExport("csv")}>Export als CSV</button>
|
||||||
|
<button onClick={() => onExport("json")}>Export als JSON</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<p style={{ color: "#c62828" }} role="alert">
|
||||||
|
Fehler: {error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{records && (
|
||||||
|
<table style={{ width: "100%", borderCollapse: "collapse", background: "white" }}>
|
||||||
|
<thead>
|
||||||
|
<tr style={{ textAlign: "left", borderBottom: "2px solid #ddd" }}>
|
||||||
|
<th style={{ padding: "0.5rem" }}>Zeitpunkt</th>
|
||||||
|
<th style={{ padding: "0.5rem" }}>Tenant</th>
|
||||||
|
<th style={{ padding: "0.5rem" }}>Akteur</th>
|
||||||
|
<th style={{ padding: "0.5rem" }}>Aktion</th>
|
||||||
|
<th style={{ padding: "0.5rem" }}></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{records.map((r, i) => (
|
||||||
|
<tr key={i} style={{ borderBottom: "1px solid #eee" }}>
|
||||||
|
<td style={{ padding: "0.5rem" }}>{new Date(r.occurred_at).toLocaleString("de-DE")}</td>
|
||||||
|
<td style={{ padding: "0.5rem" }}>{r.tenant_slug}</td>
|
||||||
|
<td style={{ padding: "0.5rem" }}>{r.actor}</td>
|
||||||
|
<td style={{ padding: "0.5rem" }}>{r.action}</td>
|
||||||
|
<td style={{ padding: "0.5rem" }}>
|
||||||
|
<button onClick={() => setSelected(r)}>Details</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
{records.length === 0 && (
|
||||||
|
<tr>
|
||||||
|
<td colSpan={5} style={{ padding: "0.5rem" }}>
|
||||||
|
Keine Einträge gefunden.
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{selected && (
|
||||||
|
<section style={{ background: "white", padding: "1rem", borderRadius: 8, marginTop: "1.5rem" }}>
|
||||||
|
<h2>Eintrag-Details</h2>
|
||||||
|
<dl>
|
||||||
|
<dt>Zeitpunkt</dt>
|
||||||
|
<dd>{new Date(selected.occurred_at).toLocaleString("de-DE")}</dd>
|
||||||
|
<dt>Tenant</dt>
|
||||||
|
<dd>{selected.tenant_slug}</dd>
|
||||||
|
<dt>Akteur</dt>
|
||||||
|
<dd>{selected.actor}</dd>
|
||||||
|
<dt>Aktion</dt>
|
||||||
|
<dd>{selected.action}</dd>
|
||||||
|
<dt>Ziel</dt>
|
||||||
|
<dd>{selected.target}</dd>
|
||||||
|
<dt>Metadaten</dt>
|
||||||
|
<dd>
|
||||||
|
<pre style={{ whiteSpace: "pre-wrap", background: "#f5f6f8", padding: "0.5rem" }}>
|
||||||
|
{JSON.stringify(selected.metadata, null, 2)}
|
||||||
|
</pre>
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
<button onClick={() => setSelected(null)}>Schließen</button>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
// Duenner Client der AUD-03-Export-API (internal/audit.ExportHandler) —
|
||||||
|
// keine eigene Aggregations-/Filterlogik im Frontend (Ticket-Vorgabe:
|
||||||
|
// "reiner Konsument der Export-API"). Die JSON-Lines-Antwort wird nur
|
||||||
|
// dekodiert, nicht neu berechnet oder gefiltert.
|
||||||
|
export type AuditRecord = {
|
||||||
|
occurred_at: string;
|
||||||
|
tenant_slug: string;
|
||||||
|
actor: string;
|
||||||
|
action: string;
|
||||||
|
target: string;
|
||||||
|
metadata: unknown;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AuditFilter = {
|
||||||
|
tenant: string;
|
||||||
|
actor: string;
|
||||||
|
action: string;
|
||||||
|
from: string; // RFC3339, leer = kein Filter
|
||||||
|
to: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function apiBase(): string {
|
||||||
|
const base = process.env.NEXT_PUBLIC_AUDITLOG_API_URL;
|
||||||
|
if (!base) {
|
||||||
|
throw new Error(
|
||||||
|
"NEXT_PUBLIC_AUDITLOG_API_URL ist nicht gesetzt (Umgebungsvariable erforderlich)"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildParams(caller: string, filter: AuditFilter, format: "json" | "csv"): URLSearchParams {
|
||||||
|
const params = new URLSearchParams({ caller, format });
|
||||||
|
if (filter.tenant) params.set("tenant", filter.tenant);
|
||||||
|
if (filter.actor) params.set("actor", filter.actor);
|
||||||
|
if (filter.action) params.set("action", filter.action);
|
||||||
|
if (filter.from) params.set("from", filter.from);
|
||||||
|
if (filter.to) params.set("to", filter.to);
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
|
// exportURL liefert die Adresse desselben Endpunkts, den auch die
|
||||||
|
// Export-Datei-Funktion (Akzeptanzkriterium 2) verwendet — Liste und Export
|
||||||
|
// sind bewusst DERSELBE API-Aufruf mit unterschiedlichem "format".
|
||||||
|
export function exportURL(caller: string, filter: AuditFilter, format: "json" | "csv"): string {
|
||||||
|
return `${apiBase()}/audit/export?${buildParams(caller, filter, format)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetchRecords laedt die Liste als JSON-Lines und dekodiert Zeile fuer
|
||||||
|
// Zeile — dieselben Filterparameter wie ein direkter API-Aufruf
|
||||||
|
// (Akzeptanzkriterium 1 / Pruefung 1).
|
||||||
|
export async function fetchRecords(caller: string, filter: AuditFilter): Promise<AuditRecord[]> {
|
||||||
|
const res = await fetch(exportURL(caller, filter, "json"), { cache: "no-store" });
|
||||||
|
if (!res.ok) {
|
||||||
|
const text = await res.text().catch(() => "");
|
||||||
|
throw new Error(text || `Anfrage fehlgeschlagen (${res.status})`);
|
||||||
|
}
|
||||||
|
const text = await res.text();
|
||||||
|
return text
|
||||||
|
.split("\n")
|
||||||
|
.filter((line) => line.trim() !== "")
|
||||||
|
.map((line) => JSON.parse(line) as AuditRecord);
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
/** @type {import('next').NextConfig} */
|
||||||
|
const nextConfig = {
|
||||||
|
// @nexarch/shl liegt als file:-Dependency mit TS-Quellen in node_modules —
|
||||||
|
// Next.js transpiliert node_modules standardmäßig nicht, siehe web/shl/README.md.
|
||||||
|
transpilePackages: ["@nexarch/shl"],
|
||||||
|
};
|
||||||
|
export default nextConfig;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "nexarch-audit-log",
|
||||||
|
"private": true,
|
||||||
|
"scripts": {
|
||||||
|
"dev": "next dev",
|
||||||
|
"build": "next build",
|
||||||
|
"start": "next start",
|
||||||
|
"lint": "next lint"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nexarch/shl": "file:../shl",
|
||||||
|
"next": "14.2.35",
|
||||||
|
"react": "18.3.1",
|
||||||
|
"react-dom": "18.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "20.14.9",
|
||||||
|
"@types/react": "18.3.3",
|
||||||
|
"@types/react-dom": "18.3.0",
|
||||||
|
"typescript": "5.5.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es2017",
|
||||||
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
|
"allowJs": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strict": true,
|
||||||
|
"noEmit": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"module": "esnext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"jsx": "preserve",
|
||||||
|
"incremental": true,
|
||||||
|
"plugins": [{ "name": "next" }],
|
||||||
|
"paths": { "@/*": ["./*"] }
|
||||||
|
},
|
||||||
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
|
"exclude": ["node_modules"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "NEXARCH Lizenz- und Modulverwaltung",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function RootLayout({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<html lang="de">
|
||||||
|
<body
|
||||||
|
style={{
|
||||||
|
fontFamily: typography.fontFamily,
|
||||||
|
margin: 0,
|
||||||
|
background: "var(--shl-color-background, #ffffff)",
|
||||||
|
color: "var(--shl-color-text-primary, #14181f)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ThemeProvider>
|
||||||
|
<I18nProvider initialLocale="de">
|
||||||
|
<ToastProvider>{children}</ToastProvider>
|
||||||
|
</I18nProvider>
|
||||||
|
</ThemeProvider>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,174 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { fetchOverview, toggleFlag, type Overview } from "@/lib/api";
|
||||||
|
|
||||||
|
const STATUS_LABEL: Record<string, string> = {
|
||||||
|
ok: "In Ordnung",
|
||||||
|
warning: "Nahe am Limit",
|
||||||
|
exceeded: "Limit überschritten",
|
||||||
|
};
|
||||||
|
|
||||||
|
const STATUS_COLOR: Record<string, string> = {
|
||||||
|
ok: "#2e7d32",
|
||||||
|
warning: "#ed6c02",
|
||||||
|
exceeded: "#c62828",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function Page() {
|
||||||
|
const [tenantId, setTenantId] = useState("");
|
||||||
|
const [overview, setOverview] = useState<Overview | null>(null);
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [toggleError, setToggleError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
if (!tenantId.trim()) return;
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const data = await fetchOverview(tenantId.trim());
|
||||||
|
setOverview(data);
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e.message ?? "Unbekannter Fehler");
|
||||||
|
setOverview(null);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onToggle(key: string, next: boolean) {
|
||||||
|
setToggleError(null);
|
||||||
|
try {
|
||||||
|
await toggleFlag(tenantId.trim(), key, next);
|
||||||
|
await load();
|
||||||
|
} catch (e: any) {
|
||||||
|
setToggleError(e.message ?? "Umschalten fehlgeschlagen");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 800, margin: "0 auto", padding: "2rem 1rem" }}>
|
||||||
|
<h1>Lizenz- und Modulverwaltung</h1>
|
||||||
|
|
||||||
|
<div style={{ display: "flex", gap: "0.5rem", marginBottom: "1.5rem" }}>
|
||||||
|
<input
|
||||||
|
value={tenantId}
|
||||||
|
onChange={(e) => setTenantId(e.target.value)}
|
||||||
|
placeholder="Tenant-ID eingeben"
|
||||||
|
aria-label="Tenant-ID eingeben"
|
||||||
|
style={{ flex: 1, padding: "0.5rem", fontSize: "1rem" }}
|
||||||
|
/>
|
||||||
|
<button onClick={load} disabled={loading} style={{ padding: "0.5rem 1rem" }}>
|
||||||
|
{loading ? "Lädt…" : "Anzeigen"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<p style={{ color: "#c62828" }} role="alert">
|
||||||
|
Fehler: {error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{overview && (
|
||||||
|
<>
|
||||||
|
<section style={{ background: "white", padding: "1rem", borderRadius: 8, marginBottom: "1.5rem" }}>
|
||||||
|
<h2>Lizenzstatus</h2>
|
||||||
|
<p>
|
||||||
|
<strong>Plan:</strong> {overview.plan}{" "}
|
||||||
|
{overview.expired && (
|
||||||
|
<span style={{ color: "#c62828", fontWeight: "bold" }}>
|
||||||
|
(abgelaufen)
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Gültig bis:</strong>{" "}
|
||||||
|
{new Date(overview.valid_until).toLocaleDateString("de-DE")}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Freigeschaltete Module:</strong>{" "}
|
||||||
|
{overview.modules.length > 0 ? overview.modules.join(", ") : "keine"}
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section style={{ background: "white", padding: "1rem", borderRadius: 8, marginBottom: "1.5rem" }}>
|
||||||
|
<h2>Feature-Flags</h2>
|
||||||
|
{toggleError && (
|
||||||
|
<p style={{ color: "#c62828" }} role="alert">
|
||||||
|
{toggleError}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{overview.flags.length === 0 && <p>Keine Feature-Flags definiert.</p>}
|
||||||
|
<ul style={{ listStyle: "none", padding: 0 }}>
|
||||||
|
{overview.flags.map((f) => (
|
||||||
|
<li
|
||||||
|
key={f.key}
|
||||||
|
style={{
|
||||||
|
display: "flex",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
alignItems: "center",
|
||||||
|
padding: "0.5rem 0",
|
||||||
|
borderBottom: "1px solid #eee",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<div>{f.key}</div>
|
||||||
|
{!f.licensed && f.deny_grund && (
|
||||||
|
<div style={{ fontSize: "0.85rem", color: "#c62828" }}>
|
||||||
|
{f.deny_grund}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<label>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={f.enabled}
|
||||||
|
disabled={!f.licensed && !f.enabled}
|
||||||
|
onChange={(e) => onToggle(f.key, e.target.checked)}
|
||||||
|
/>{" "}
|
||||||
|
aktiv
|
||||||
|
</label>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section style={{ background: "white", padding: "1rem", borderRadius: 8 }}>
|
||||||
|
<h2>Nutzungsstand</h2>
|
||||||
|
{overview.usage.map((u) => {
|
||||||
|
const pct = u.limit > 0 ? Math.min(100, (u.value / u.limit) * 100) : 0;
|
||||||
|
return (
|
||||||
|
<div key={u.metric} style={{ marginBottom: "1rem" }}>
|
||||||
|
<div style={{ display: "flex", justifyContent: "space-between" }}>
|
||||||
|
<span>{u.metric}</span>
|
||||||
|
<span style={{ color: STATUS_COLOR[u.status] }}>
|
||||||
|
{u.value} / {u.limit > 0 ? u.limit : "unbegrenzt"} —{" "}
|
||||||
|
{STATUS_LABEL[u.status]}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
background: "#eee",
|
||||||
|
borderRadius: 4,
|
||||||
|
height: 8,
|
||||||
|
overflow: "hidden",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
width: `${u.limit > 0 ? pct : 0}%`,
|
||||||
|
background: STATUS_COLOR[u.status],
|
||||||
|
height: "100%",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</section>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
// Duenner Client fuer das LIC-04-Backend-API (internal/adminapi) — enthaelt
|
||||||
|
// keinerlei eigene Lizenz-/Flag-Logik, nur Datenabruf und -weitergabe.
|
||||||
|
export type FlagOverview = {
|
||||||
|
key: string;
|
||||||
|
enabled: boolean;
|
||||||
|
licensed: boolean;
|
||||||
|
deny_grund?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type UsageOverview = {
|
||||||
|
metric: string;
|
||||||
|
value: number;
|
||||||
|
limit: number;
|
||||||
|
status: "ok" | "warning" | "exceeded";
|
||||||
|
};
|
||||||
|
|
||||||
|
export type Overview = {
|
||||||
|
plan: string;
|
||||||
|
modules: string[];
|
||||||
|
issued_at: string;
|
||||||
|
valid_until: string;
|
||||||
|
expired: boolean;
|
||||||
|
flags: FlagOverview[];
|
||||||
|
usage: UsageOverview[];
|
||||||
|
};
|
||||||
|
|
||||||
|
function apiBase(): string {
|
||||||
|
const base = process.env.NEXT_PUBLIC_ADMIN_API_URL;
|
||||||
|
if (!base) {
|
||||||
|
throw new Error(
|
||||||
|
"NEXT_PUBLIC_ADMIN_API_URL ist nicht gesetzt (Umgebungsvariable erforderlich)"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchOverview(tenantId: string): Promise<Overview> {
|
||||||
|
const res = await fetch(
|
||||||
|
`${apiBase()}/admin/overview?tenant=${encodeURIComponent(tenantId)}`,
|
||||||
|
{ cache: "no-store" }
|
||||||
|
);
|
||||||
|
if (!res.ok) {
|
||||||
|
const body = await res.json().catch(() => ({}));
|
||||||
|
throw new Error(body.error || `Anfrage fehlgeschlagen (${res.status})`);
|
||||||
|
}
|
||||||
|
return res.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function toggleFlag(
|
||||||
|
tenantId: string,
|
||||||
|
key: string,
|
||||||
|
enabled: boolean
|
||||||
|
): Promise<void> {
|
||||||
|
const res = await fetch(`${apiBase()}/admin/flags/toggle`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ tenant: tenantId, key, enabled }),
|
||||||
|
});
|
||||||
|
if (!res.ok) {
|
||||||
|
const body = await res.json().catch(() => ({}));
|
||||||
|
throw new Error(body.error || `Umschalten fehlgeschlagen (${res.status})`);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
/** @type {import('next').NextConfig} */
|
||||||
|
const nextConfig = {
|
||||||
|
// @nexarch/shl liegt als file:-Dependency mit TS-Quellen in node_modules —
|
||||||
|
// Next.js transpiliert node_modules standardmäßig nicht, siehe web/shl/README.md.
|
||||||
|
transpilePackages: ["@nexarch/shl"],
|
||||||
|
};
|
||||||
|
export default nextConfig;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "nexarch-lic-admin",
|
||||||
|
"private": true,
|
||||||
|
"scripts": {
|
||||||
|
"dev": "next dev",
|
||||||
|
"build": "next build",
|
||||||
|
"start": "next start",
|
||||||
|
"lint": "next lint"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nexarch/shl": "file:../shl",
|
||||||
|
"next": "14.2.35",
|
||||||
|
"react": "18.3.1",
|
||||||
|
"react-dom": "18.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "20.14.9",
|
||||||
|
"@types/react": "18.3.3",
|
||||||
|
"@types/react-dom": "18.3.0",
|
||||||
|
"typescript": "5.5.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es2017",
|
||||||
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
|
"allowJs": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strict": true,
|
||||||
|
"noEmit": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"module": "esnext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"jsx": "preserve",
|
||||||
|
"incremental": true,
|
||||||
|
"plugins": [{ "name": "next" }],
|
||||||
|
"paths": { "@/*": ["./*"] }
|
||||||
|
},
|
||||||
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
|
"exclude": ["node_modules"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "NEXARCH Benachrichtigungen",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function RootLayout({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<html lang="de">
|
||||||
|
<body
|
||||||
|
style={{
|
||||||
|
fontFamily: typography.fontFamily,
|
||||||
|
margin: 0,
|
||||||
|
background: "var(--shl-color-background, #ffffff)",
|
||||||
|
color: "var(--shl-color-text-primary, #14181f)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ThemeProvider>
|
||||||
|
<I18nProvider initialLocale="de">
|
||||||
|
<ToastProvider>{children}</ToastProvider>
|
||||||
|
</I18nProvider>
|
||||||
|
</ThemeProvider>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Table } from "@nexarch/shl";
|
||||||
|
import type { TableColumn } from "@nexarch/shl";
|
||||||
|
import { Preference, fetchTenantOverview } from "../../lib/api";
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: Tenant-Admin sieht eine Übersicht der
|
||||||
|
// Benachrichtigungs-Konfiguration seines Tenants. Zugriffsbeschränkung
|
||||||
|
// (nur Tenant-Admin) ist RBAC-02s Aufgabe vor diesem Endpunkt, siehe
|
||||||
|
// internal/notifyprefs/handler.go.
|
||||||
|
export default function OverviewPage() {
|
||||||
|
const [prefs, setPrefs] = useState<Preference[] | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchTenantOverview()
|
||||||
|
.then(setPrefs)
|
||||||
|
.catch(() => setError("Übersicht konnte nicht geladen werden. Nur Tenant-Admins haben Zugriff."));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const columns: TableColumn<Preference>[] = [
|
||||||
|
{ key: "user", header: "Benutzer-ID", render: (p) => p.UserID },
|
||||||
|
{ key: "event", header: "Ereignistyp", render: (p) => p.EventType },
|
||||||
|
{ key: "channel", header: "Kanal", render: (p) => p.Channel },
|
||||||
|
{ key: "enabled", header: "Aktiviert", render: (p) => (p.Enabled ? "Ja" : "Nein") },
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 800, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Benachrichtigungs-Übersicht (Mandant)</h1>
|
||||||
|
{error && <p role="alert">{error}</p>}
|
||||||
|
{prefs && (
|
||||||
|
<Table
|
||||||
|
columns={columns}
|
||||||
|
rows={prefs}
|
||||||
|
rowKey={(p) => `${p.UserID}-${p.EventType}-${p.Channel}`}
|
||||||
|
caption="Von der Standardeinstellung abweichende Benachrichtigungspräferenzen aller Benutzer"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
|
export default function IndexPage() {
|
||||||
|
redirect("/settings");
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { CheckboxField, useToast } from "@nexarch/shl";
|
||||||
|
import {
|
||||||
|
ApiError,
|
||||||
|
KNOWN_CHANNELS,
|
||||||
|
KNOWN_EVENT_TYPES,
|
||||||
|
Preference,
|
||||||
|
fetchMyPreferences,
|
||||||
|
setPreference,
|
||||||
|
} from "../../lib/api";
|
||||||
|
|
||||||
|
const EVENT_LABELS: Record<string, string> = {
|
||||||
|
welcome: "Willkommen",
|
||||||
|
invoice_ready: "Rechnung verfügbar",
|
||||||
|
password_reset: "Passwort-Zurücksetzung",
|
||||||
|
security_alert: "Sicherheitshinweis",
|
||||||
|
};
|
||||||
|
|
||||||
|
const CHANNEL_LABELS: Record<string, string> = {
|
||||||
|
email: "E-Mail",
|
||||||
|
in_app: "In-App",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function SettingsPage() {
|
||||||
|
const { push } = useToast();
|
||||||
|
const [prefs, setPrefs] = useState<Preference[] | null>(null);
|
||||||
|
const [loadError, setLoadError] = useState<string | null>(null);
|
||||||
|
const [pending, setPending] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchMyPreferences()
|
||||||
|
.then(setPrefs)
|
||||||
|
.catch(() => setLoadError("Einstellungen konnten nicht geladen werden. Bitte melden Sie sich an."));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Default: aktiviert, solange keine explizite Praeferenz existiert
|
||||||
|
// (Akzeptanzkriterium 1) — gleicher Opt-out-Default wie im Backend.
|
||||||
|
function isEnabled(eventType: string, channel: string): boolean {
|
||||||
|
const explicit = prefs?.find((p) => p.EventType === eventType && p.Channel === channel);
|
||||||
|
return explicit ? explicit.Enabled : true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onToggle(eventType: string, channel: string, nextEnabled: boolean) {
|
||||||
|
const key = `${eventType}:${channel}`;
|
||||||
|
setPending(key);
|
||||||
|
try {
|
||||||
|
// Akzeptanzkriterium 2: sofort speichern, kein Sammel-Speichern-Button —
|
||||||
|
// wirkt unmittelbar auf künftige Zustellungen (EnqueueIfAllowed prüft
|
||||||
|
// bei jedem Aufruf live, kein Cache dazwischen).
|
||||||
|
await setPreference(eventType, channel, nextEnabled);
|
||||||
|
setPrefs((current) => {
|
||||||
|
const withoutThis = (current ?? []).filter((p) => !(p.EventType === eventType && p.Channel === channel));
|
||||||
|
return [...withoutThis, { TenantSlug: "", UserID: "", EventType: eventType, Channel: channel, Enabled: nextEnabled }];
|
||||||
|
});
|
||||||
|
push(nextEnabled ? "Benachrichtigung aktiviert." : "Benachrichtigung deaktiviert.", "success");
|
||||||
|
} catch (err) {
|
||||||
|
push(err instanceof ApiError ? err.message : "Einstellung konnte nicht gespeichert werden.", "danger");
|
||||||
|
} finally {
|
||||||
|
setPending(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadError) {
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<p role="alert">{loadError}</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Benachrichtigungseinstellungen</h1>
|
||||||
|
<p>Wählen Sie je Ereignis, über welche Kanäle Sie benachrichtigt werden möchten.</p>
|
||||||
|
|
||||||
|
{KNOWN_EVENT_TYPES.map((eventType) => (
|
||||||
|
<fieldset key={eventType} style={{ marginBottom: 16 }}>
|
||||||
|
<legend>{EVENT_LABELS[eventType] ?? eventType}</legend>
|
||||||
|
{KNOWN_CHANNELS.map((channel) => {
|
||||||
|
const key = `${eventType}:${channel}`;
|
||||||
|
return (
|
||||||
|
<CheckboxField
|
||||||
|
key={key}
|
||||||
|
label={CHANNEL_LABELS[channel] ?? channel}
|
||||||
|
checked={isEnabled(eventType, channel)}
|
||||||
|
disabled={pending === key}
|
||||||
|
onChange={(e) => onToggle(eventType, channel, e.target.checked)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</fieldset>
|
||||||
|
))}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
const API_BASE = process.env.NEXT_PUBLIC_CORE_API_BASE ?? "";
|
||||||
|
|
||||||
|
export class ApiError extends Error {}
|
||||||
|
|
||||||
|
async function req<T>(path: string, init?: RequestInit): Promise<T> {
|
||||||
|
const res = await fetch(`${API_BASE}${path}`, {
|
||||||
|
credentials: "include",
|
||||||
|
headers: init?.body ? { "Content-Type": "application/json" } : undefined,
|
||||||
|
...init,
|
||||||
|
});
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new ApiError(data.error ?? data.message ?? "Unbekannter Fehler");
|
||||||
|
}
|
||||||
|
return data as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Preference {
|
||||||
|
TenantSlug: string;
|
||||||
|
UserID: string;
|
||||||
|
EventType: string;
|
||||||
|
Channel: string;
|
||||||
|
Enabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bekannte Ereignistypen/Kanäle — das Backend erzwingt keine feste Liste
|
||||||
|
// (jedes Modul kann eigene event_type-Werte an EnqueueIfAllowed übergeben),
|
||||||
|
// diese Liste ist der aktuell bekannte Stand fürs Frontend-Formular.
|
||||||
|
export const KNOWN_EVENT_TYPES = ["welcome", "invoice_ready", "password_reset", "security_alert"] as const;
|
||||||
|
export const KNOWN_CHANNELS = ["email", "in_app"] as const;
|
||||||
|
|
||||||
|
export function fetchMyPreferences(): Promise<Preference[]> {
|
||||||
|
return req("/notifications/preferences");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setPreference(eventType: string, channel: string, enabled: boolean): Promise<void> {
|
||||||
|
return req("/notifications/preferences", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({ event_type: eventType, channel, enabled }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchTenantOverview(): Promise<Preference[]> {
|
||||||
|
return req("/notifications/preferences/tenant");
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/** @type {import('next').NextConfig} */
|
||||||
|
const nextConfig = {
|
||||||
|
transpilePackages: ["@nexarch/shl"],
|
||||||
|
};
|
||||||
|
export default nextConfig;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "nexarch-notifications",
|
||||||
|
"private": true,
|
||||||
|
"scripts": {
|
||||||
|
"dev": "next dev",
|
||||||
|
"build": "next build",
|
||||||
|
"start": "next start",
|
||||||
|
"lint": "next lint"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nexarch/shl": "file:../shl",
|
||||||
|
"next": "14.2.35",
|
||||||
|
"react": "18.3.1",
|
||||||
|
"react-dom": "18.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "20.14.9",
|
||||||
|
"@types/react": "18.3.3",
|
||||||
|
"@types/react-dom": "18.3.0",
|
||||||
|
"typescript": "5.5.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "ES2017",
|
||||||
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
|
"allowJs": false,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strict": true,
|
||||||
|
"noEmit": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"module": "esnext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"jsx": "preserve",
|
||||||
|
"incremental": true,
|
||||||
|
"plugins": [{ "name": "next" }],
|
||||||
|
"paths": { "@/*": ["./*"] }
|
||||||
|
},
|
||||||
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
|
"exclude": ["node_modules"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,183 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { TextField, SelectField, useToast } from "@nexarch/shl";
|
||||||
|
import {
|
||||||
|
ApiError,
|
||||||
|
Group,
|
||||||
|
Role,
|
||||||
|
addGroupMember,
|
||||||
|
createGroup,
|
||||||
|
fetchGroups,
|
||||||
|
removeGroupMember,
|
||||||
|
setGroupRole,
|
||||||
|
} from "../../lib/api";
|
||||||
|
|
||||||
|
export default function GroupsPage() {
|
||||||
|
const { push } = useToast();
|
||||||
|
const [groups, setGroups] = useState<Group[]>([]);
|
||||||
|
const [loadError, setLoadError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const reload = () =>
|
||||||
|
fetchGroups()
|
||||||
|
.then(setGroups)
|
||||||
|
.catch(() => setLoadError("Gruppen konnten nicht geladen werden. Sind Sie als Tenant-Admin angemeldet?"));
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
reload();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [newGroupName, setNewGroupName] = useState("");
|
||||||
|
const [createError, setCreateError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
async function onCreate(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setCreateError(null);
|
||||||
|
try {
|
||||||
|
await createGroup(newGroupName);
|
||||||
|
setNewGroupName("");
|
||||||
|
push("Gruppe angelegt.", "success");
|
||||||
|
await reload();
|
||||||
|
} catch (err) {
|
||||||
|
setCreateError(err instanceof ApiError ? err.message : "Gruppe konnte nicht angelegt werden.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadError) {
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<p role="alert">{loadError}</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Gruppen & Abteilungen</h1>
|
||||||
|
|
||||||
|
<section aria-labelledby="neue-gruppe-heading">
|
||||||
|
<h2 id="neue-gruppe-heading">Neue Gruppe anlegen</h2>
|
||||||
|
<form onSubmit={onCreate} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Gruppenname"
|
||||||
|
required
|
||||||
|
value={newGroupName}
|
||||||
|
onChange={(e) => setNewGroupName(e.target.value)}
|
||||||
|
/>
|
||||||
|
{createError && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{createError}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit">Anlegen</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section aria-labelledby="gruppenliste-heading">
|
||||||
|
<h2 id="gruppenliste-heading">Bestehende Gruppen</h2>
|
||||||
|
{groups.length === 0 ? (
|
||||||
|
<p>Keine Gruppen vorhanden.</p>
|
||||||
|
) : (
|
||||||
|
groups.map((g) => <GroupCard key={g.ID} group={g} onChanged={reload} onNotice={(t) => push(t, "success")} />)
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function GroupCard({
|
||||||
|
group,
|
||||||
|
onChanged,
|
||||||
|
onNotice,
|
||||||
|
}: {
|
||||||
|
group: Group;
|
||||||
|
onChanged: () => void;
|
||||||
|
onNotice: (text: string) => void;
|
||||||
|
}) {
|
||||||
|
const [role, setRole] = useState<Role>(group.Role || "user");
|
||||||
|
const [newMemberId, setNewMemberId] = useState("");
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
async function onSetRole() {
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await setGroupRole(group.ID, role);
|
||||||
|
onNotice("Gruppenrolle gesetzt.");
|
||||||
|
onChanged();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Gruppenrolle konnte nicht gesetzt werden.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onAddMember(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await addGroupMember(group.ID, newMemberId);
|
||||||
|
setNewMemberId("");
|
||||||
|
onNotice("Mitglied hinzugefügt.");
|
||||||
|
onChanged();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Mitglied konnte nicht hinzugefügt werden.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onRemoveMember(userId: string) {
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await removeGroupMember(group.ID, userId);
|
||||||
|
onNotice("Mitglied entfernt.");
|
||||||
|
onChanged();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Mitglied konnte nicht entfernt werden.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{ border: "1px solid var(--shl-color-border)", borderRadius: 8, padding: 16, marginBottom: 16 }}>
|
||||||
|
<h3>{group.Name}</h3>
|
||||||
|
|
||||||
|
<div style={{ display: "flex", alignItems: "flex-end", gap: 8 }}>
|
||||||
|
<SelectField label="Gruppenrolle" value={role} onChange={(e) => setRole(e.target.value as Role)}>
|
||||||
|
<option value="user">Benutzer</option>
|
||||||
|
<option value="tenant_admin">Tenant-Admin</option>
|
||||||
|
</SelectField>
|
||||||
|
<button type="button" onClick={onSetRole}>
|
||||||
|
Setzen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h4>Mitglieder</h4>
|
||||||
|
{group.members.length === 0 ? (
|
||||||
|
<p>Keine Mitglieder.</p>
|
||||||
|
) : (
|
||||||
|
<ul>
|
||||||
|
{group.members.map((userId) => (
|
||||||
|
<li key={userId}>
|
||||||
|
{userId}{" "}
|
||||||
|
<button type="button" onClick={() => onRemoveMember(userId)}>
|
||||||
|
Entfernen
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<form onSubmit={onAddMember} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Benutzer-ID hinzufügen"
|
||||||
|
required
|
||||||
|
value={newMemberId}
|
||||||
|
onChange={(e) => setNewMemberId(e.target.value)}
|
||||||
|
/>
|
||||||
|
<button type="submit">Hinzufügen</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "NEXARCH Rechteverwaltung",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function RootLayout({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<html lang="de">
|
||||||
|
<body
|
||||||
|
style={{
|
||||||
|
fontFamily: typography.fontFamily,
|
||||||
|
margin: 0,
|
||||||
|
background: "var(--shl-color-background, #ffffff)",
|
||||||
|
color: "var(--shl-color-text-primary, #14181f)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ThemeProvider>
|
||||||
|
<I18nProvider initialLocale="de">
|
||||||
|
<ToastProvider>{children}</ToastProvider>
|
||||||
|
</I18nProvider>
|
||||||
|
</ThemeProvider>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
|
export default function IndexPage() {
|
||||||
|
redirect("/roles");
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Table, TextField, SelectField, useToast } from "@nexarch/shl";
|
||||||
|
import type { TableColumn } from "@nexarch/shl";
|
||||||
|
import {
|
||||||
|
ApiError,
|
||||||
|
Assignment,
|
||||||
|
Role,
|
||||||
|
RoleInfo,
|
||||||
|
assignRole,
|
||||||
|
fetchRoleHistory,
|
||||||
|
fetchRoles,
|
||||||
|
} from "../../lib/api";
|
||||||
|
|
||||||
|
export default function RolesPage() {
|
||||||
|
const { push } = useToast();
|
||||||
|
const [roles, setRoles] = useState<RoleInfo[] | null>(null);
|
||||||
|
const [loadError, setLoadError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const [targetUserId, setTargetUserId] = useState("");
|
||||||
|
const [targetRole, setTargetRole] = useState<Role>("user");
|
||||||
|
const [assignError, setAssignError] = useState<string | null>(null);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
const [historyUserId, setHistoryUserId] = useState("");
|
||||||
|
const [history, setHistory] = useState<Assignment[] | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchRoles()
|
||||||
|
.then(setRoles)
|
||||||
|
.catch(() => setLoadError("Rollen konnten nicht geladen werden. Sind Sie als Tenant-Admin angemeldet?"));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
async function onAssign(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setAssignError(null);
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
await assignRole(targetUserId, targetRole);
|
||||||
|
push("Rolle zugewiesen.", "success");
|
||||||
|
} catch (err) {
|
||||||
|
// Akzeptanzkriterium 2: die Backend-Meldung bei Selbst-Eskalation wird
|
||||||
|
// unveraendert angezeigt, keine eigene Interpretation im Frontend.
|
||||||
|
setAssignError(err instanceof ApiError ? err.message : "Rolle konnte nicht zugewiesen werden.");
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onLoadHistory(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
try {
|
||||||
|
setHistory(await fetchRoleHistory(historyUserId));
|
||||||
|
} catch {
|
||||||
|
setHistory([]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const historyColumns: TableColumn<Assignment>[] = [
|
||||||
|
{ key: "role", header: "Rolle", render: (a) => a.Role },
|
||||||
|
{ key: "grantedBy", header: "Vergeben von", render: (a) => a.GrantedBy },
|
||||||
|
];
|
||||||
|
|
||||||
|
if (loadError) {
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<p role="alert">{loadError}</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Rollen & Rechte</h1>
|
||||||
|
|
||||||
|
<section aria-labelledby="rollen-heading">
|
||||||
|
<h2 id="rollen-heading">Rollen und Grundrechte</h2>
|
||||||
|
{roles?.map((r) => (
|
||||||
|
<div key={r.role} style={{ marginBottom: 12 }}>
|
||||||
|
<strong>{roleLabel(r.role)}</strong>
|
||||||
|
<ul>
|
||||||
|
{r.permissions.map((p) => (
|
||||||
|
<li key={p}>{p}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section aria-labelledby="zuweisen-heading">
|
||||||
|
<h2 id="zuweisen-heading">Rolle zuweisen</h2>
|
||||||
|
<form onSubmit={onAssign} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Benutzer-ID"
|
||||||
|
required
|
||||||
|
value={targetUserId}
|
||||||
|
onChange={(e) => setTargetUserId(e.target.value)}
|
||||||
|
/>
|
||||||
|
<SelectField label="Rolle" value={targetRole} onChange={(e) => setTargetRole(e.target.value as Role)}>
|
||||||
|
<option value="user">Benutzer</option>
|
||||||
|
<option value="tenant_admin">Tenant-Admin</option>
|
||||||
|
</SelectField>
|
||||||
|
{assignError && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{assignError}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? "Wird zugewiesen…" : "Zuweisen"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section aria-labelledby="verlauf-heading">
|
||||||
|
<h2 id="verlauf-heading">Nachvollziehbarkeit (Audit-Verlauf)</h2>
|
||||||
|
<p>Zeigt jede Rollenzuweisung eines Benutzers chronologisch — wer wann welche Rolle vergeben hat.</p>
|
||||||
|
<form onSubmit={onLoadHistory} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Benutzer-ID"
|
||||||
|
required
|
||||||
|
value={historyUserId}
|
||||||
|
onChange={(e) => setHistoryUserId(e.target.value)}
|
||||||
|
/>
|
||||||
|
<button type="submit">Verlauf anzeigen</button>
|
||||||
|
</form>
|
||||||
|
{history && (
|
||||||
|
<Table
|
||||||
|
columns={historyColumns}
|
||||||
|
rows={history}
|
||||||
|
rowKey={(a) => `${a.UserID}-${a.Role}-${a.GrantedBy}`}
|
||||||
|
caption="Rollenzuweisungs-Verlauf"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function roleLabel(role: Role): string {
|
||||||
|
return role === "tenant_admin" ? "Tenant-Admin" : "Benutzer";
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
const API_BASE = process.env.NEXT_PUBLIC_CORE_API_BASE ?? "";
|
||||||
|
|
||||||
|
export class ApiError extends Error {}
|
||||||
|
|
||||||
|
async function req<T>(path: string, init?: RequestInit): Promise<T> {
|
||||||
|
const res = await fetch(`${API_BASE}${path}`, {
|
||||||
|
credentials: "include",
|
||||||
|
headers: init?.body ? { "Content-Type": "application/json" } : undefined,
|
||||||
|
...init,
|
||||||
|
});
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new ApiError(data.error ?? data.message ?? "Unbekannter Fehler");
|
||||||
|
}
|
||||||
|
return data as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type Role = "user" | "tenant_admin";
|
||||||
|
|
||||||
|
export interface RoleInfo {
|
||||||
|
role: Role;
|
||||||
|
permissions: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchRoles(): Promise<RoleInfo[]> {
|
||||||
|
return req("/rbac/roles");
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Assignment {
|
||||||
|
UserID: string;
|
||||||
|
Role: Role;
|
||||||
|
GrantedBy: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assignRole(userId: string, role: Role): Promise<Assignment> {
|
||||||
|
return req("/rbac/users/role", { method: "POST", body: JSON.stringify({ user_id: userId, role }) });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchRoleHistory(userId: string): Promise<Assignment[]> {
|
||||||
|
return req(`/rbac/users/${userId}/history`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Group {
|
||||||
|
ID: string;
|
||||||
|
Name: string;
|
||||||
|
Role: Role | "";
|
||||||
|
members: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchGroups(): Promise<Group[]> {
|
||||||
|
return req("/rbac/groups");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createGroup(name: string): Promise<Group> {
|
||||||
|
return req("/rbac/groups", { method: "POST", body: JSON.stringify({ name }) });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setGroupRole(groupId: string, role: Role): Promise<void> {
|
||||||
|
return req("/rbac/groups/role", { method: "POST", body: JSON.stringify({ group_id: groupId, role }) });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addGroupMember(groupId: string, userId: string): Promise<void> {
|
||||||
|
return req("/rbac/groups/members", { method: "POST", body: JSON.stringify({ group_id: groupId, user_id: userId }) });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function removeGroupMember(groupId: string, userId: string): Promise<void> {
|
||||||
|
return req("/rbac/groups/members/remove", { method: "POST", body: JSON.stringify({ group_id: groupId, user_id: userId }) });
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/** @type {import('next').NextConfig} */
|
||||||
|
const nextConfig = {
|
||||||
|
transpilePackages: ["@nexarch/shl"],
|
||||||
|
};
|
||||||
|
export default nextConfig;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "nexarch-rbac-admin",
|
||||||
|
"private": true,
|
||||||
|
"scripts": {
|
||||||
|
"dev": "next dev",
|
||||||
|
"build": "next build",
|
||||||
|
"start": "next start",
|
||||||
|
"lint": "next lint"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nexarch/shl": "file:../shl",
|
||||||
|
"next": "14.2.35",
|
||||||
|
"react": "18.3.1",
|
||||||
|
"react-dom": "18.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "20.14.9",
|
||||||
|
"@types/react": "18.3.3",
|
||||||
|
"@types/react-dom": "18.3.0",
|
||||||
|
"typescript": "5.5.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "ES2017",
|
||||||
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
|
"allowJs": false,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strict": true,
|
||||||
|
"noEmit": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"module": "esnext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"jsx": "preserve",
|
||||||
|
"incremental": true,
|
||||||
|
"plugins": [{ "name": "next" }],
|
||||||
|
"paths": { "@/*": ["./*"] }
|
||||||
|
},
|
||||||
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
|
"exclude": ["node_modules"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "NEXARCH Systemstatus",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function RootLayout({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<html lang="de">
|
||||||
|
<body
|
||||||
|
style={{
|
||||||
|
fontFamily: typography.fontFamily,
|
||||||
|
margin: 0,
|
||||||
|
background: "var(--shl-color-background, #ffffff)",
|
||||||
|
color: "var(--shl-color-text-primary, #14181f)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ThemeProvider>
|
||||||
|
<I18nProvider initialLocale="de">
|
||||||
|
<ToastProvider>{children}</ToastProvider>
|
||||||
|
</I18nProvider>
|
||||||
|
</ThemeProvider>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user