Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4be7853611 | ||
|
|
b1601c578a | ||
|
|
1e1a8359cb | ||
|
|
b27a640116 | ||
|
|
81ff8c18c3 | ||
|
|
22b3349b8e | ||
|
|
2df3f93373 | ||
|
|
034865f5a0 | ||
|
|
6f532d8350 | ||
|
|
4180a26c6e |
@@ -159,29 +159,31 @@ Keine Commits in dieser Session.
|
|||||||
- web/shl/vitest.setup.ts | 1 +
|
- web/shl/vitest.setup.ts | 1 +
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-28 23:37 – 23:43 (5m)
|
## 2026-08-28 23:45 – 23:51 (5m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** nexarch
|
**Projekt:** code
|
||||||
|
|
||||||
### Commits
|
### Commits
|
||||||
- fbcc9db RBAC-05: web/rbac-admin next.js-frontend (rollen+gruppen-verwaltung, audit-verlauf) auf shl-01
|
- b27a640 CFG-04: benachrichtigungs-einstellungen-oberflaeche (handler+tests fuer notifyprefs, web/notifications next.js-frontend auf shl-01)
|
||||||
- bd80f0c Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/rbac-05-rechte-administrationsoberflaeche
|
- 81ff8c1 Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
||||||
- 051af43 RBAC-05: backend — handler.go (rollen-/gruppenverwaltung, selbst-eskalationsschutz), group.go ListGroups/Members
|
- 22b3349 Merge branch 'feature/iam-02-login-session-jwt-grundgeruest' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
||||||
- 9de9005 Merge branch 'feature/iam-02-login-session-jwt-grundgeruest' into feature/rbac-05-rechte-administrationsoberflaeche
|
- 2df3f93 CFG-04: backend teil 1 — internal/notifyprefs (praeferenz-store + enqueueifallowed-filter vor dispatcher)
|
||||||
- 1b6a159 Merge branch 'feature/rbac-03-gruppen-abteilungen' into feature/rbac-05-rechte-administrationsoberflaeche
|
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- web/rbac-admin/app/groups/page.tsx | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/page.tsx | 5 +++++
|
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/roles/page.tsx | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/lib/api.ts | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/next.config.mjs | 5 +++++
|
- web/notifications/app/page.tsx | 5 +++++
|
||||||
- web/rbac-admin/package.json | 22 ++++++++++++++++++++++
|
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/tsconfig.json | 21 +++++++++++++++++++++
|
- 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:44 – 23:44 (0m)
|
## 2026-08-28 23:51 – 23:51 (0m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
|
|
||||||
@@ -189,13 +191,37 @@ Keine Commits in dieser Session.
|
|||||||
Keine Commits in dieser Session.
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- web/rbac-admin/app/groups/page.tsx | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/page.tsx | 5 +++++
|
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/app/roles/page.tsx | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/lib/api.ts | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/next.config.mjs | 5 +++++
|
- web/notifications/app/page.tsx | 5 +++++
|
||||||
- web/rbac-admin/package.json | 22 ++++++++++++++++++++++
|
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/rbac-admin/tsconfig.json | 21 +++++++++++++++++++++
|
- 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,59 @@
|
|||||||
|
// notifyprefs-api ist der Aufrufpunkt fuer CFG-06: startet den bereits
|
||||||
|
// fertigen CFG-04-Handler (internal/notifyprefs) als eigenstaendigen
|
||||||
|
// HTTP-Dienst, hinter derselben Session-Auth wie IAM-16 (account-api) —
|
||||||
|
// GLEICHER JWT-Secret. REINES WIRING — keine Aenderung an
|
||||||
|
// internal/notifyprefs/.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/notifyprefs"
|
||||||
|
)
|
||||||
|
|
||||||
|
func requireEnv(name string) string {
|
||||||
|
v := os.Getenv(name)
|
||||||
|
if v == "" {
|
||||||
|
log.Fatalf("%s muss gesetzt sein", name)
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
dsn := requireEnv("NEXARCH_NOTIFYPREFS_TENANT_DSN")
|
||||||
|
// MUSS identisch mit NEXARCH_ACCOUNT_JWT_SECRET (IAM-16) sein, sonst
|
||||||
|
// verwirft dieser Dienst gueltige account-api-Sessions.
|
||||||
|
jwtSecret := requireEnv("NEXARCH_NOTIFYPREFS_JWT_SECRET")
|
||||||
|
addr := os.Getenv("NEXARCH_NOTIFYPREFS_API_LISTEN_ADDR")
|
||||||
|
if addr == "" {
|
||||||
|
addr = "127.0.0.1:8101"
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pool, err := pgxpool.New(ctx, dsn)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("datenbankverbindung: %v", err)
|
||||||
|
}
|
||||||
|
defer pool.Close()
|
||||||
|
|
||||||
|
tokenIssuer := auth.NewTokenIssuer(jwtSecret)
|
||||||
|
handler := notifyprefs.NewHandler(notifyprefs.NewStore(pool))
|
||||||
|
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
|
||||||
|
mux.HandleFunc("GET /notifications/preferences", auth.RequireAuth(tokenIssuer, handler.ListMine))
|
||||||
|
mux.HandleFunc("POST /notifications/preferences", auth.RequireAuth(tokenIssuer, handler.SetPreference))
|
||||||
|
mux.HandleFunc("GET /notifications/preferences/tenant", auth.RequireAuth(tokenIssuer, handler.ListTenantOverview))
|
||||||
|
|
||||||
|
log.Printf("notifyprefs-api: listening on %s", addr)
|
||||||
|
if err := http.ListenAndServe(addr, mux); err != nil {
|
||||||
|
log.Fatalf("http server: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=NEXARCH Core - Benachrichtigungs-Einstellungen-Dienst (CFG-04/CFG-06)
|
||||||
|
After=network.target postgresql.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=nexarch
|
||||||
|
EnvironmentFile=/etc/nexarch/notifyprefs-api.env
|
||||||
|
ExecStart=__INSTALL_DIR__/bin/notifyprefs-api
|
||||||
|
Restart=on-failure
|
||||||
|
StandardOutput=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
# CFG-06 – Prüfprotokoll: Benachrichtigungs-Einstellungen-Dienst starten (CFG-04 als laufender Dienst)
|
||||||
|
|
||||||
|
Voraussetzung CFG-04, IAM-16 – beide bereits Fertig, hier UNVERÄNDERT.
|
||||||
|
|
||||||
|
## Reines Wiring, keine neue Logik
|
||||||
|
|
||||||
|
`git diff --stat internal/notifyprefs/` liefert KEINEN Diff.
|
||||||
|
`cmd/notifyprefs-api/main.go` setzt ausschließlich bestehende
|
||||||
|
Konstruktoren zusammen, jeder Endpunkt hinter `auth.RequireAuth` mit
|
||||||
|
demselben JWT-Secret wie IAM-16 (account-api) — dritter Baustein der
|
||||||
|
Core-GUI mit bewiesener Cross-Service-Session-Gültigkeit nach RBAC-07.
|
||||||
|
|
||||||
|
## Umsetzung
|
||||||
|
|
||||||
|
- `cmd/notifyprefs-api/main.go` – `GET/POST /notifications/preferences`,
|
||||||
|
`GET /notifications/preferences/tenant`, alle hinter `auth.RequireAuth`.
|
||||||
|
- `deploy/systemd/nexarch-notifyprefs-api.service.tmpl`.
|
||||||
|
|
||||||
|
## Prüfungen
|
||||||
|
|
||||||
|
| # | Prüfung | Ergebnis |
|
||||||
|
|---|---|---|
|
||||||
|
| 1 | Dienst startet und bleibt stabil (systemctl status aktiv) | **bestanden** – real auf 131: `nexarch-notifyprefs-api.service` aktiv |
|
||||||
|
| 2 | Realer Aufruf mit gültigem IAM-16-Session-Cookie setzt/liest eine echte Präferenz, ohne Cookie 401 | **bestanden** – real per `curl`: ohne Cookie → 401; mit dem bei `account-api` ausgestellten Cookie: `POST /notifications/preferences` (Kanal `email` für `invoice_ready` deaktiviert) → 200, anschließendes `GET` liefert exakt diese Zeile zurück, korrekt dem einloggten Nutzer und Tenant (`acme`) zugeordnet |
|
||||||
|
| 3 | Code-Review: keine Änderung an internal/notifyprefs/ selbst, nur main.go+systemd neu | **bestanden** – `git diff --stat internal/notifyprefs/` liefert leeren Diff |
|
||||||
|
|
||||||
|
## Echte Verdrahtung auf 192.168.1.131
|
||||||
|
|
||||||
|
- `notifyprefs-api` gebaut nach `/opt/nexarch-core/bin/`,
|
||||||
|
`/etc/nexarch/notifyprefs-api.env` (0600, `NEXARCH_NOTIFYPREFS_JWT_SECRET`
|
||||||
|
identisch zu `NEXARCH_ACCOUNT_JWT_SECRET`), Dienst installiert/aktiviert.
|
||||||
|
- Nutzt dieselbe `nexarch_registry`-DB/Tabellen (`notification_preferences`)
|
||||||
|
wie CFG-05 — Grants dort bereits aus CFG-05 vorhanden, keine neue
|
||||||
|
Grant-Lücke gefunden.
|
||||||
|
- End-zu-Ende-Beweis: Testnutzer angelegt, Login gegen `account-api`,
|
||||||
|
dasselbe Cookie gegen `notifyprefs-api` verwendet → echtes Setzen und
|
||||||
|
Lesen einer Präferenz. Testdaten anschließend entfernt.
|
||||||
|
|
||||||
|
## Build/Test-Ergebnis (192.168.1.131)
|
||||||
|
|
||||||
|
```
|
||||||
|
go build ./... -> clean
|
||||||
|
go vet ./... -> clean
|
||||||
|
golangci-lint run ./cmd/notifyprefs-api/... -> 0 issues
|
||||||
|
```
|
||||||
|
|
||||||
|
## Gesamtergebnis
|
||||||
|
|
||||||
|
**Bestanden.** CFG-04 ist jetzt ein real laufender, über systemd
|
||||||
|
verwalteter Dienst, cross-service authentifiziert über dieselbe
|
||||||
|
IAM-16-Session wie RBAC-07 — dritter erfolgreich real geprüfter
|
||||||
|
Auth-geschützter Baustein der Core-GUI.
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
# QA-03 – Prüfprotokoll: Prüfgate Rechte & Policy
|
|
||||||
|
|
||||||
Stand: 2026-08-29. Branch `feature/qa-03-pruefgate-rechte-policy` (RBAC-05 + RBAC-04 gemergt).
|
|
||||||
|
|
||||||
## 1. Akzeptanzkriterien RBAC-01 bis RBAC-05 — Testabdeckung
|
|
||||||
|
|
||||||
| Ticket | Titel | Abdeckende Tests |
|
|
||||||
|---|---|---|
|
|
||||||
| RBAC-01 | Rollenmodell & Grundrechte | `internal/rbac/role_test.go`: `TestEffectivePermissions_Inheritance`, `TestHasPermission` |
|
|
||||||
| RBAC-01 | Rollenzuweisung | `internal/rbac/store_test.go`: `TestStore_AssignAndGet`, `TestStore_RejectsSuperadminOutsideAllowedMatrix`, `TestStore_RejectsUnknownRole`, `TestStore_HistoryTracksWhoAndWhen` |
|
|
||||||
| RBAC-02 | Policy-Enforcement-Schicht (zentral) | `internal/policy` — kein eigenes `*_test.go` in diesem Merge gefunden für `enforcer.go`/`store.go` direkt (siehe Abweichungen unten); Verhalten indirekt über `TestBypass_PolicyEnforcerItselfRespectsRevocation` (dieser Branch) nachgewiesen |
|
|
||||||
| RBAC-03 | Gruppen & Abteilungen | `internal/rbac/group_test.go`: `TestGroup_CreateAndAddMember`, `TestGroup_RoleAffectsAllCurrentMembers`, `TestGroup_RemoveMemberRevokesRightsImmediately`, `TestGroup_DeleteGroupRevokesRightsWithoutDeletingUser`, `TestGroup_TenantIsolation` |
|
|
||||||
| RBAC-04 | Modul-scoped Berechtigungen | `internal/policy/module_scope_test.go`: `TestAuthorizeForTenant_DeniesWhenModuleNotActivated`, `TestAuthorizeForTenant_BecomesActiveWithoutRestart`, `TestAuthorizeForTenant_CombinationsOfRoleAndModuleScope` |
|
|
||||||
| RBAC-05 | Rechte-Administrationsoberfläche | `internal/rbac/handler_test.go`: `TestListRoles`, `TestAssignRole_RejectsSelfEscalation`, `TestAssignRole_AdminCanPromoteOtherUser`, `TestAssignRole_AdminCanDemoteOtherUser` (neu, dieser Branch), `TestRoleHistory_TracksAssignments`, `TestGroupWorkflow`, `TestRequireManageUsers_RejectsPlainUser` |
|
|
||||||
|
|
||||||
**Ergebnis Abschnitt 1:** alle 5 Tickets haben automatisierte Tests, die ihre dokumentierten Akzeptanzkriterien abdecken. RBAC-02 selbst hat keine eigene Testdatei im gemergten Stand — abgedeckt nur indirekt über den in diesem Branch neu geschriebenen `TestBypass_PolicyEnforcerItselfRespectsRevocation`. Als Abweichung festgehalten (Abschnitt 4).
|
|
||||||
|
|
||||||
## 2. Umgehungsversuch der zentralen Policy-Schicht (Akzeptanzkriterium 2 / Prüfung 1)
|
|
||||||
|
|
||||||
Getestet in `internal/rbac/bypass_test.go`:
|
|
||||||
|
|
||||||
- **`TestBypass_NoDirectWriteAPIOutsideStore`**: bestanden. `role_assignments` hat keine Schreib-API außerhalb von `Store.Assign` — Umgehungsversuch scheitert strukturell (Typsystem, kein exportierter DB-Pool).
|
|
||||||
- **`TestBypass_PolicyEnforcerItselfRespectsRevocation`**: bestanden. RBAC-02s eigentliche Policy-Tabelle (`policy_rules`) reagiert sofort auf `Revoke` — kein Cache, keine verzögerte Wirkung.
|
|
||||||
- **`TestBypass_HandlerIgnoresCentralPolicyRevocation`**: **deckt einen echten Fund auf**, siehe Abschnitt 4.
|
|
||||||
|
|
||||||
## 3. Rollenwechsel-Szenario (Akzeptanzkriterium 2 / Prüfung 2)
|
|
||||||
|
|
||||||
- Hochstufung (user → tenant_admin): `TestAssignRole_AdminCanPromoteOtherUser` — bestanden.
|
|
||||||
- Rückstufung (tenant_admin → user): `TestAssignRole_AdminCanDemoteOtherUser` (neu, dieser Branch) — bestanden, inklusive Prüfung, dass `role_assignment_history` beide Richtungen (erst `tenant_admin`, dann `user`) korrekt in chronologischer Reihenfolge festhält.
|
|
||||||
- Selbst-Eskalation bleibt weiterhin gesperrt (`TestAssignRole_RejectsSelfEscalation`, aus RBAC-05).
|
|
||||||
|
|
||||||
**Ergebnis Abschnitt 3:** bestanden, beide Richtungen automatisiert nachgewiesen.
|
|
||||||
|
|
||||||
## 4. Abweichungen (Akzeptanzkriterium 3: nicht stillschweigend ignoriert)
|
|
||||||
|
|
||||||
### 4.1 RBAC-05-Handler prüfen nicht gegen die zentrale Policy-Schicht (RBAC-02) — Schweregrad: Mittel
|
|
||||||
|
|
||||||
**Fund:** `internal/rbac/handler.go` (`requireManageUsers`) entscheidet Zugriff über `HasPermission(role, PermManageUsers)` — die **statische**, hartcodierte Rollenhierarchie aus `role.go`. Es ruft nirgends `internal/policy.Enforcer.Authorize`/`Guard` auf, die eigentliche zentrale, DB-gestützte Durchsetzungsschicht aus RBAC-02 (`policy_rules`-Tabelle, per `Store.Grant`/`Revoke` administrierbar, versioniert in `policy_rule_changes`).
|
|
||||||
|
|
||||||
**Konsequenz:** ein Administrator, der über die RBAC-02-Policy-Schicht das Recht `tenant.manage_users` von `tenant_admin` entzieht (`policy.Store.Revoke`), sperrt die RBAC-05-Endpunkte **nicht** aus — sie fragen `policy_rules` nie ab. Zwei parallele Enforcement-Pfade statt einer zentralen Schicht, verletzt die Ticket-Produkt-DNA "Rechte werden zentral entschieden, nicht in jedem Handler neu erfunden" (RBAC-05-Ticket) UND RBAC-02s eigenen Anspruch ("keine Tenant- oder Rechteprüfung verstreut in einzelnen Handlern").
|
|
||||||
|
|
||||||
**Nachweis:** `TestBypass_HandlerIgnoresCentralPolicyRevocation` in `internal/rbac/bypass_test.go`.
|
|
||||||
|
|
||||||
**Nicht in dieser Kachel behoben** (QA-03-Arbeitsweise: kein Umbau angrenzender Bereiche, RBAC-05 ist nicht Vorbedingung von QA-03) — Empfehlung: eigenes Folgeticket, das `requireManageUsers` auf `internal/policy.Guard`/`Enforcer.Authorize` umstellt.
|
|
||||||
|
|
||||||
### 4.2 RBAC-02 hat keine eigene Testdatei im gemergten Stand — Schweregrad: Niedrig
|
|
||||||
|
|
||||||
`internal/policy/enforcer.go` und `store.go` (RBAC-02 selbst) haben keine `enforcer_test.go`/`store_test.go` im Merge-Ergebnis dieses Branches — nur `module_scope_test.go` (RBAC-04) prüft sie indirekt über `AuthorizeForTenant`. Die in diesem Branch neu geschriebenen Bypass-Tests schließen die Lücke teilweise, ersetzen aber keine dedizierten RBAC-02-Unit-Tests. Empfehlung: bei Gelegenheit nachziehen, kein blockierender Fund.
|
|
||||||
|
|
||||||
## 5. RBAC-04-Zusammenspiel mit Lizenz-/Flag-Zustand (Akzeptanzkriterium 3)
|
|
||||||
|
|
||||||
`internal/flag` (aus RBAC-04-Merge) ist vorhanden. `internal/policy.Enforcer.AuthorizeForTenant` verknüpft eine Policy-Regel optional mit einem `flag.Service`-Eintrag (`ModuleScope.FlagKey`): eine sonst erlaubte Regel greift nicht, wenn das zugehörige Modul für den Tenant nicht aktiviert ist. `TestAuthorizeForTenant_DeniesWhenModuleNotActivated` und `TestAuthorizeForTenant_BecomesActiveWithoutRestart` beweisen das bereits (aus RBAC-04, unverändert übernommen).
|
|
||||||
|
|
||||||
**Ergebnis Abschnitt 5:** bestanden, Zusammenspiel vorhanden und getestet.
|
|
||||||
|
|
||||||
## 6. Gesamtergebnis
|
|
||||||
|
|
||||||
Bestanden mit einem dokumentierten Mittel-Schweregrad-Fund (4.1) und einem Niedrig-Schweregrad-Hinweis (4.2). Build-/Test-Ergebnis auf dem Testhost: siehe Abschnitt 7.
|
|
||||||
|
|
||||||
## 7. Build/Test-Ergebnis auf 131
|
|
||||||
|
|
||||||
Durchgeführt 2026-08-29 auf root@192.168.1.131 (`/root/nexarch-code-qa03`, isolierter Sync, kein Konflikt mit parallelem QA-02-Testlauf):
|
|
||||||
|
|
||||||
- `go mod tidy`, `go build ./...`, `go vet ./...` — alle sauber, keine Fehler.
|
|
||||||
- `go test ./... -v -p 1` gegen frisch zurückgesetzte Testumgebung — **alle 30 Tests grün**, über alle betroffenen Pakete (`internal/auth`, `internal/policy`, `internal/rbac`, `internal/tenant`, `internal/user`), inklusive `TestBypass_HandlerIgnoresCentralPolicyRevocation` (bestätigt den Fund aus Abschnitt 4.1 als reproduzierbar, nicht nur behauptet) und `TestAssignRole_AdminCanDemoteOtherUser` (neuer Rückstufungs-Test aus Abschnitt 3).
|
|
||||||
- Keine Regressionen in RBAC-01/02/03/04/05 durch den Merge.
|
|
||||||
|
|
||||||
**QA-03 Gesamtergebnis: bestanden**, mit einem dokumentierten Mittel-Schweregrad-Fund (4.1, Empfehlung: Folgeticket) und einem Niedrig-Schweregrad-Hinweis (4.2).
|
|
||||||
@@ -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
|
||||||
|
}
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
// Package flag implementiert Core LIC-02: einen Feature-Flag-Dienst mit
|
|
||||||
// Strategien (global an/aus, Prozentsatz, Tenant-Zielgruppe) als Kernfunktion
|
|
||||||
// des Core-Dienstes selbst — keine zusaetzliche Infrastruktur (Unleash-Server
|
|
||||||
// + eigene DB), siehe "bewusst vermeiden" im LIC-02-Ticket.
|
|
||||||
package flag
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"hash/fnv"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
var ErrNotFound = errors.New("flag: nicht gefunden")
|
|
||||||
|
|
||||||
// Flag ist die zentrale Definition — Auswertung (Evaluate) ist bewusst davon
|
|
||||||
// getrennt (Unleash-Prinzip: Flag-Verwaltung vs. Flag-Auswertung).
|
|
||||||
type Flag struct {
|
|
||||||
Key string
|
|
||||||
Enabled bool
|
|
||||||
RolloutPercentage int
|
|
||||||
TargetTenantSlugs []string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store ist die Verwaltungsseite (Admin): Flags definieren/lesen.
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) Set(ctx context.Context, f Flag) error {
|
|
||||||
if f.TargetTenantSlugs == nil {
|
|
||||||
f.TargetTenantSlugs = []string{} // pgx uebertraegt ein nil-Slice sonst als SQL NULL statt leerem Array.
|
|
||||||
}
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO feature_flags (key, enabled, rollout_percentage, target_tenant_slugs, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
ON CONFLICT (key) DO UPDATE SET
|
|
||||||
enabled = $2, rollout_percentage = $3, target_tenant_slugs = $4, updated_at = now()
|
|
||||||
`, f.Key, f.Enabled, f.RolloutPercentage, f.TargetTenantSlugs)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("flag speichern: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) Get(ctx context.Context, key string) (Flag, error) {
|
|
||||||
var f Flag
|
|
||||||
row := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT key, enabled, rollout_percentage, target_tenant_slugs
|
|
||||||
FROM feature_flags WHERE key = $1
|
|
||||||
`, key)
|
|
||||||
if err := row.Scan(&f.Key, &f.Enabled, &f.RolloutPercentage, &f.TargetTenantSlugs); err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Flag{}, ErrNotFound
|
|
||||||
}
|
|
||||||
return Flag{}, fmt.Errorf("flag lesen: %w", err)
|
|
||||||
}
|
|
||||||
return f, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// evaluate wendet die Strategien in fester Reihenfolge an: globaler
|
|
||||||
// An/Aus-Schalter zuerst, dann Tenant-Zielgruppe, dann Prozentsatz-Rollout.
|
|
||||||
// Ein unbekannter/nicht getroffener Fall ergibt false — Fail-Safe-Default,
|
|
||||||
// kein Feature wird versehentlich aktiv.
|
|
||||||
func evaluate(f Flag, tenantSlug string) bool {
|
|
||||||
if f.Enabled {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
for _, target := range f.TargetTenantSlugs {
|
|
||||||
if target == tenantSlug {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if f.RolloutPercentage > 0 {
|
|
||||||
h := fnv.New32a()
|
|
||||||
_, _ = h.Write([]byte(f.Key + "|" + tenantSlug))
|
|
||||||
return int(h.Sum32()%100) < f.RolloutPercentage
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
package flag
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"log/slog"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultCacheTTL ist die dokumentierte Cache-Invalidierungszeit
|
|
||||||
// (Akzeptanzkriterium 2/3): eine Aenderung wirkt spaetestens nach dieser
|
|
||||||
// Zeit auf allen Core-Instanzen, ohne dass ein Dienst neu gestartet werden
|
|
||||||
// muss (Akzeptanzkriterium 3).
|
|
||||||
const DefaultCacheTTL = 5 * time.Second
|
|
||||||
|
|
||||||
type cacheEntry struct {
|
|
||||||
flag Flag
|
|
||||||
expiresAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// Service ist die Auswertungsseite (SDK/Client-Analogon zu Unleash) mit
|
|
||||||
// lokalem TTL-Cache. Bewusst getrennt von Store (Verwaltung).
|
|
||||||
type Service struct {
|
|
||||||
store *Store
|
|
||||||
ttl time.Duration
|
|
||||||
|
|
||||||
mu sync.RWMutex
|
|
||||||
cache map[string]cacheEntry
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewService(store *Store, ttl time.Duration) *Service {
|
|
||||||
if ttl <= 0 {
|
|
||||||
ttl = DefaultCacheTTL
|
|
||||||
}
|
|
||||||
return &Service{store: store, ttl: ttl, cache: make(map[string]cacheEntry)}
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsEnabled wertet ein Flag fuer einen Tenant aus. Liefert IMMER einen
|
|
||||||
// bool ohne Fehlerwert — ein nicht erreichbarer Flag-Dienst darf abhaengige
|
|
||||||
// Aufrufer nicht zum Absturz bringen oder zu Fehlerbehandlungscode zwingen,
|
|
||||||
// der leicht vergessen wird (Akzeptanzkriterium 3 / Pruefung 3: dokumentiertes
|
|
||||||
// Fallback-Verhalten = false, ggf. aus dem zuletzt bekannten Zwischenspeicher).
|
|
||||||
func (s *Service) IsEnabled(ctx context.Context, tenantSlug, key string) bool {
|
|
||||||
f, ok := s.resolve(ctx, key)
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return evaluate(f, tenantSlug)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) resolve(ctx context.Context, key string) (Flag, bool) {
|
|
||||||
s.mu.RLock()
|
|
||||||
entry, exists := s.cache[key]
|
|
||||||
fresh := exists && time.Now().Before(entry.expiresAt)
|
|
||||||
s.mu.RUnlock()
|
|
||||||
if fresh {
|
|
||||||
return entry.flag, true
|
|
||||||
}
|
|
||||||
|
|
||||||
f, err := s.store.Get(ctx, key)
|
|
||||||
if err != nil {
|
|
||||||
if exists {
|
|
||||||
slog.Warn("feature-flag-dienst nicht erreichbar, nutze zwischengespeicherten stand",
|
|
||||||
"flag_key", key, "error", err)
|
|
||||||
return entry.flag, true
|
|
||||||
}
|
|
||||||
slog.Warn("feature-flag-dienst nicht erreichbar, kein zwischengespeicherter stand vorhanden, fallback: deaktiviert",
|
|
||||||
"flag_key", key, "error", err)
|
|
||||||
return Flag{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
s.mu.Lock()
|
|
||||||
s.cache[key] = cacheEntry{flag: f, expiresAt: time.Now().Add(s.ttl)}
|
|
||||||
s.mu.Unlock()
|
|
||||||
return f, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invalidate erzwingt beim naechsten IsEnabled-Aufruf ein sofortiges Neuladen
|
|
||||||
// aus der Datenbank statt auf den TTL-Ablauf zu warten — wird nach Store.Set
|
|
||||||
// auf derselben Instanz aufgerufen, damit der Schreiber die eigene Aenderung
|
|
||||||
// ohne Wartezeit sieht. Andere Core-Instanzen sehen sie spaetestens nach
|
|
||||||
// DefaultCacheTTL (siehe Akzeptanzkriterium 3).
|
|
||||||
func (s *Service) Invalidate(key string) {
|
|
||||||
s.mu.Lock()
|
|
||||||
delete(s.cache, key)
|
|
||||||
s.mu.Unlock()
|
|
||||||
}
|
|
||||||
@@ -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))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
package policy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ErrDenied wird geliefert, wenn keine Regel role+permission erlaubt —
|
|
||||||
// Default-Deny (Akzeptanzkriterium 2).
|
|
||||||
var ErrDenied = errors.New("policy: zugriff verweigert")
|
|
||||||
|
|
||||||
// Enforcer ist die EINE zentrale Entscheidungs- und Durchsetzungsschicht
|
|
||||||
// (Akzeptanzkriterium 1). Repository-/Query-Code ruft ausschliesslich Guard
|
|
||||||
// bzw. GuardTenantScoped auf, nie eine Rohabfrage direkt.
|
|
||||||
type Enforcer struct {
|
|
||||||
store *Store
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewEnforcer(store *Store) *Enforcer {
|
|
||||||
return &Enforcer{store: store}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Authorize entscheidet erlaubt/verboten — unabhaengig von jeder konkreten
|
|
||||||
// Query, rein anhand der deklarativen Regeln (Akzeptanzkriterium 2: fuer
|
|
||||||
// sich genommen testbar, ohne Anwendungslogik).
|
|
||||||
func (e *Enforcer) Authorize(ctx context.Context, role rbac.Role, perm rbac.Permission) error {
|
|
||||||
allowed, err := e.store.IsAllowed(ctx, role, perm)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if !allowed {
|
|
||||||
return fmt.Errorf("%w: rolle %q hat kein recht %q", ErrDenied, role, perm)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Guard ist die zentrale Enforcement-Funktion (Akzeptanzkriterium 1): query
|
|
||||||
// wird NUR aufgerufen, wenn Authorize zustimmt. Es gibt keinen Weg, query
|
|
||||||
// ausserhalb von Guard aufzurufen und trotzdem den Aufrufer als autorisiert
|
|
||||||
// zu behandeln — die Autorisierungsentscheidung steht immer VOR dem
|
|
||||||
// Datenzugriff, nie danach.
|
|
||||||
func Guard[T any](ctx context.Context, e *Enforcer, role rbac.Role, perm rbac.Permission, query func(ctx context.Context) (T, error)) (T, error) {
|
|
||||||
var zero T
|
|
||||||
if err := e.Authorize(ctx, role, perm); err != nil {
|
|
||||||
return zero, err
|
|
||||||
}
|
|
||||||
return query(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GuardTenantScoped erzwingt zusaetzlich, dass tenantSlug TEIL der Query-
|
|
||||||
// Funktion selbst ist (Akzeptanzkriterium 3): der Funktionstyp verlangt,
|
|
||||||
// dass die Repository-Implementierung tenantSlug in ihre eigene WHERE-
|
|
||||||
// Klausel einbaut — ein nachgelagerter Filter auf dem Ergebnis (der
|
|
||||||
// archivmail-Fehler aus "Bekannte Fehler vermeiden") ist mit dieser
|
|
||||||
// Signatur nicht moeglich, da die Query-Funktion tenantSlug selbst
|
|
||||||
// entgegennimmt und dafuer verantwortlich ist, statt ihn hinterher
|
|
||||||
// anzuwenden.
|
|
||||||
func GuardTenantScoped[T any](ctx context.Context, e *Enforcer, role rbac.Role, perm rbac.Permission, tenantSlug string, query func(ctx context.Context, tenantSlug string) (T, error)) (T, error) {
|
|
||||||
var zero T
|
|
||||||
if err := e.Authorize(ctx, role, perm); err != nil {
|
|
||||||
return zero, err
|
|
||||||
}
|
|
||||||
return query(ctx, tenantSlug)
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
package policy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/flag"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ModuleScope verknuepft eine Policy-Regel mit einem Feature-Flag: existiert
|
|
||||||
// ein ModuleScope fuer (role, permission), gilt die Regel nur zusaetzlich zur
|
|
||||||
// Grundberechtigung, wenn FlagKey fuer den jeweiligen Tenant aktiv ist
|
|
||||||
// (Akzeptanzkriterium 1: Rechte folgen der Lizenz).
|
|
||||||
type ModuleScope struct {
|
|
||||||
Role rbac.Role
|
|
||||||
Permission rbac.Permission
|
|
||||||
Module string
|
|
||||||
FlagKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetModuleScope verknuepft eine bestehende Policy-Regel mit einem Modul/
|
|
||||||
// Feature-Flag. Die Regel selbst (Store.Grant) muss unabhaengig davon
|
|
||||||
// existieren — ModuleScope schraenkt sie nur zusaetzlich ein.
|
|
||||||
func (s *Store) SetModuleScope(ctx context.Context, role rbac.Role, perm rbac.Permission, module, flagKey string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO policy_module_scopes (role, permission, module, flag_key)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
ON CONFLICT (role, permission) DO UPDATE SET module = $3, flag_key = $4
|
|
||||||
`, string(role), string(perm), module, flagKey)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("modul-scope setzen: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) GetModuleScope(ctx context.Context, role rbac.Role, perm rbac.Permission) (ModuleScope, bool, error) {
|
|
||||||
var ms ModuleScope
|
|
||||||
ms.Role, ms.Permission = role, perm
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT module, flag_key FROM policy_module_scopes WHERE role = $1 AND permission = $2
|
|
||||||
`, string(role), string(perm)).Scan(&ms.Module, &ms.FlagKey)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return ModuleScope{}, false, nil
|
|
||||||
}
|
|
||||||
return ModuleScope{}, false, fmt.Errorf("modul-scope lesen: %w", err)
|
|
||||||
}
|
|
||||||
return ms, true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// AuthorizeForTenant ist dieselbe zentrale Entscheidungsfunktion wie
|
|
||||||
// Authorize (Akzeptanzkriterium 3: keine zweite Enforcement-Schicht),
|
|
||||||
// erweitert um die Modul-Scoping-Pruefung: eine sonst passende Regel greift
|
|
||||||
// NICHT, wenn das zugehoerige Modul fuer den Tenant nicht aktiviert ist
|
|
||||||
// (Akzeptanzkriterium 1). Feature-Flag-Aenderungen wirken ohne Neustart
|
|
||||||
// (Akzeptanzkriterium 2), da flag.Service dieselbe TTL-Cache-Instanz der
|
|
||||||
// aufrufenden Core-Instanz nutzt.
|
|
||||||
func (e *Enforcer) AuthorizeForTenant(ctx context.Context, flags *flag.Service, tenantSlug string, role rbac.Role, perm rbac.Permission) error {
|
|
||||||
if err := e.Authorize(ctx, role, perm); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
scope, found, err := e.store.GetModuleScope(ctx, role, perm)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
return nil // keine Modul-Bindung fuer diese Regel — Grundberechtigung reicht.
|
|
||||||
}
|
|
||||||
|
|
||||||
if !flags.IsEnabled(ctx, tenantSlug, scope.FlagKey) {
|
|
||||||
return fmt.Errorf("%w: modul %q ist fuer diesen mandanten nicht aktiviert", ErrDenied, scope.Module)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GuardModuleScoped ist Guard mit zusaetzlicher Modul-Scoping-Pruefung —
|
|
||||||
// dieselbe zentrale Enforcement-Funktion, kein paralleler Mechanismus
|
|
||||||
// (Akzeptanzkriterium 3).
|
|
||||||
func GuardModuleScoped[T any](ctx context.Context, e *Enforcer, flags *flag.Service, tenantSlug string, role rbac.Role, perm rbac.Permission, query func(ctx context.Context) (T, error)) (T, error) {
|
|
||||||
var zero T
|
|
||||||
if err := e.AuthorizeForTenant(ctx, flags, tenantSlug, role, perm); err != nil {
|
|
||||||
return zero, err
|
|
||||||
}
|
|
||||||
return query(ctx)
|
|
||||||
}
|
|
||||||
@@ -1,170 +0,0 @@
|
|||||||
package policy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/flag"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupModuleScopeTest(t *testing.T) (*Store, *Enforcer, *flag.Store, *flag.Service, 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 policy_rules (
|
|
||||||
role TEXT NOT NULL, permission TEXT NOT NULL,
|
|
||||||
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS policy_rule_changes (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), role TEXT NOT NULL, permission TEXT NOT NULL,
|
|
||||||
action TEXT NOT NULL CHECK (action IN ('grant','revoke')), actor TEXT NOT NULL,
|
|
||||||
version INT NOT NULL, changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS policy_module_scopes (
|
|
||||||
role TEXT NOT NULL, permission TEXT NOT NULL, module TEXT NOT NULL, flag_key TEXT NOT NULL,
|
|
||||||
PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
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()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
store := NewStore(pool)
|
|
||||||
flagStore := flag.NewStore(pool)
|
|
||||||
flagService := flag.NewService(flagStore, 10*time.Millisecond) // kurze TTL fuer testbare invalidierung
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM policy_module_scopes WHERE role LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM policy_rule_changes WHERE role LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM policy_rules WHERE role LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM feature_flags WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return store, NewEnforcer(store), flagStore, flagService, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Berechtigung fuer nicht aktiviertes
|
|
||||||
// Modul greift nicht, selbst bei sonst passender Rolle.
|
|
||||||
func TestAuthorizeForTenant_DeniesWhenModuleNotActivated(t *testing.T) {
|
|
||||||
store, enforcer, _, flagService, cleanup := setupModuleScopeTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
role := rbac.Role("test_dms_nutzer")
|
|
||||||
perm := rbac.Permission("test_dokumente_lesen")
|
|
||||||
if err := store.Grant(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant: %v", err)
|
|
||||||
}
|
|
||||||
if err := store.SetModuleScope(ctx, role, perm, "dms", "test_dms_enabled"); err != nil {
|
|
||||||
t.Fatalf("set module scope: %v", err)
|
|
||||||
}
|
|
||||||
// Flag existiert nicht/ist nicht gesetzt -> IsEnabled liefert false (Fail-Safe-Default).
|
|
||||||
|
|
||||||
queryCalled := false
|
|
||||||
_, err := GuardModuleScoped(ctx, enforcer, flagService, "acme", role, perm, func(ctx context.Context) (string, error) {
|
|
||||||
queryCalled = true
|
|
||||||
return "daten", nil
|
|
||||||
})
|
|
||||||
if !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("erwartet ErrDenied bei deaktiviertem modul, habe %v", err)
|
|
||||||
}
|
|
||||||
if queryCalled {
|
|
||||||
t.Fatal("query haette bei deaktiviertem modul nicht aufgerufen werden duerfen")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Aktivierung des Moduls macht die
|
|
||||||
// Berechtigung ohne Neustart wirksam.
|
|
||||||
func TestAuthorizeForTenant_BecomesActiveWithoutRestart(t *testing.T) {
|
|
||||||
store, enforcer, flagStore, flagService, cleanup := setupModuleScopeTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
role := rbac.Role("test_dms_nutzer2")
|
|
||||||
perm := rbac.Permission("test_dokumente_schreiben")
|
|
||||||
if err := store.Grant(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant: %v", err)
|
|
||||||
}
|
|
||||||
if err := store.SetModuleScope(ctx, role, perm, "dms", "test_dms_enabled2"); err != nil {
|
|
||||||
t.Fatalf("set module scope: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", role, perm); !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("vor aktivierung: erwartet ErrDenied, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Modul "im laufenden Betrieb" aktivieren — derselbe Prozess, kein Neustart.
|
|
||||||
if err := flagStore.Set(ctx, flag.Flag{Key: "test_dms_enabled2", Enabled: true}); err != nil {
|
|
||||||
t.Fatalf("flag setzen: %v", err)
|
|
||||||
}
|
|
||||||
time.Sleep(20 * time.Millisecond) // TTL abwarten statt Neustart
|
|
||||||
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", role, perm); err != nil {
|
|
||||||
t.Fatalf("nach aktivierung sollte erlaubt sein: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: Zusammenspiel Modul-Scope + Rollenscope
|
|
||||||
// in Kombinationsfaellen.
|
|
||||||
func TestAuthorizeForTenant_CombinationsOfRoleAndModuleScope(t *testing.T) {
|
|
||||||
store, enforcer, flagStore, flagService, cleanup := setupModuleScopeTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
scopedRole := rbac.Role("test_scoped_rolle")
|
|
||||||
unscopedRole := rbac.Role("test_unscoped_rolle")
|
|
||||||
perm := rbac.Permission("test_kombiniert")
|
|
||||||
|
|
||||||
// Fall 1: Rolle ohne jegliche Regel -> verboten, unabhaengig vom Flag.
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", rbac.Role("test_unbekannt"), perm); !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("fall 1: erwartet ErrDenied (keine regel), habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall 2: Regel vorhanden, KEIN Modul-Scope -> immer erlaubt (Grundrecht ohne Lizenzbindung).
|
|
||||||
if err := store.Grant(ctx, unscopedRole, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant unscoped: %v", err)
|
|
||||||
}
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", unscopedRole, perm); err != nil {
|
|
||||||
t.Fatalf("fall 2: erwartet erlaubt ohne modul-scope, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall 3: Regel + Modul-Scope, Flag aus -> verboten.
|
|
||||||
if err := store.Grant(ctx, scopedRole, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant scoped: %v", err)
|
|
||||||
}
|
|
||||||
if err := store.SetModuleScope(ctx, scopedRole, perm, "mail", "test_mail_enabled"); err != nil {
|
|
||||||
t.Fatalf("set module scope: %v", err)
|
|
||||||
}
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", scopedRole, perm); !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("fall 3: erwartet ErrDenied (modul aus), habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall 4: Regel + Modul-Scope, Flag an -> erlaubt.
|
|
||||||
if err := flagStore.Set(ctx, flag.Flag{Key: "test_mail_enabled", Enabled: true}); err != nil {
|
|
||||||
t.Fatalf("flag setzen: %v", err)
|
|
||||||
}
|
|
||||||
time.Sleep(20 * time.Millisecond)
|
|
||||||
if err := enforcer.AuthorizeForTenant(ctx, flagService, "acme", scopedRole, perm); err != nil {
|
|
||||||
t.Fatalf("fall 4: erwartet erlaubt (modul an), habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
package policy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*Store, *Enforcer, 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 policy_rules (
|
|
||||||
role TEXT NOT NULL, permission TEXT NOT NULL,
|
|
||||||
granted_by TEXT NOT NULL, granted_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS policy_rule_changes (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), role TEXT NOT NULL, permission TEXT NOT NULL,
|
|
||||||
action TEXT NOT NULL CHECK (action IN ('grant','revoke')), actor TEXT NOT NULL,
|
|
||||||
version INT NOT NULL, changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
store := NewStore(pool)
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM policy_rule_changes WHERE role LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM policy_rules WHERE role LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return store, NewEnforcer(store), cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Anfrage ohne passende Policy wird
|
|
||||||
// zuverlaessig abgewiesen (Default-Deny), nicht standardmaessig erlaubt.
|
|
||||||
func TestAuthorize_DefaultDeny(t *testing.T) {
|
|
||||||
_, enforcer, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
err := enforcer.Authorize(ctx, rbac.Role("test_niemand"), rbac.Permission("test_irgendwas"))
|
|
||||||
if !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("erwartet ErrDenied ohne konfigurierte regel, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Guard ruft query NUR bei Autorisierung
|
|
||||||
// auf — kein Datenzugriffs-Pfad umgeht die Enforcement-Schicht.
|
|
||||||
func TestGuard_NeverCallsQueryWithoutAuthorization(t *testing.T) {
|
|
||||||
store, enforcer, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
role := rbac.Role("test_rolle_guard")
|
|
||||||
perm := rbac.Permission("test_lesen")
|
|
||||||
|
|
||||||
queryCalled := false
|
|
||||||
_, err := Guard(ctx, enforcer, role, perm, func(ctx context.Context) (string, error) {
|
|
||||||
queryCalled = true
|
|
||||||
return "geheime-daten", nil
|
|
||||||
})
|
|
||||||
if !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("erwartet ErrDenied, habe %v", err)
|
|
||||||
}
|
|
||||||
if queryCalled {
|
|
||||||
t.Fatal("query haette bei fehlender autorisierung NICHT aufgerufen werden duerfen")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := store.Grant(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := Guard(ctx, enforcer, role, perm, func(ctx context.Context) (string, error) {
|
|
||||||
queryCalled = true
|
|
||||||
return "geheime-daten", nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("guard nach grant: %v", err)
|
|
||||||
}
|
|
||||||
if !queryCalled || result != "geheime-daten" {
|
|
||||||
t.Fatalf("erwartet query-aufruf mit ergebnis nach autorisierung, habe queryCalled=%v result=%q", queryCalled, result)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + 3: Policy-Entscheidungen deklarativ und unabhaengig
|
|
||||||
// von Anwendungslogik testbar — Regelwechsel wirkt ohne Codeaenderung,
|
|
||||||
// Historie ist versioniert nachvollziehbar.
|
|
||||||
func TestGrantRevoke_ChangesBehaviorWithoutCodeChange(t *testing.T) {
|
|
||||||
store, enforcer, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
role := rbac.Role("test_rolle_history")
|
|
||||||
perm := rbac.Permission("test_schreiben")
|
|
||||||
|
|
||||||
allowed, err := store.IsAllowed(ctx, role, perm)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is allowed (vorher): %v", err)
|
|
||||||
}
|
|
||||||
if allowed {
|
|
||||||
t.Fatal("erwartet nicht erlaubt vor grant")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := store.Grant(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant: %v", err)
|
|
||||||
}
|
|
||||||
if err := enforcer.Authorize(ctx, role, perm); err != nil {
|
|
||||||
t.Fatalf("authorize nach grant sollte erlauben: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := store.Revoke(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("revoke: %v", err)
|
|
||||||
}
|
|
||||||
if err := enforcer.Authorize(ctx, role, perm); !errors.Is(err, ErrDenied) {
|
|
||||||
t.Fatalf("authorize nach revoke sollte verweigern, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := store.History(ctx, role, perm)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 historieneintraege (grant, revoke), habe %d", len(history))
|
|
||||||
}
|
|
||||||
if history[0].Action != "grant" || history[0].Version != 1 {
|
|
||||||
t.Fatalf("history[0] unerwartet: %+v", history[0])
|
|
||||||
}
|
|
||||||
if history[1].Action != "revoke" || history[1].Version != 2 {
|
|
||||||
t.Fatalf("history[1] unerwartet: %+v", history[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3 (Tenant-Scoping): GuardTenantScoped
|
|
||||||
// zwingt tenantSlug in die Query-Funktion selbst, kein Post-Filter moeglich.
|
|
||||||
func TestGuardTenantScoped_IsolatesDataBetweenTenants(t *testing.T) {
|
|
||||||
_, enforcer, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
// Simuliertes Repository: die WHERE-Klausel (hier: Map-Lookup) liegt
|
|
||||||
// INNERHALB der Query-Funktion, nicht als nachgelagerter Filter.
|
|
||||||
data := map[string][]string{
|
|
||||||
"acme": {"dokument-a1", "dokument-a2"},
|
|
||||||
"globex": {"dokument-b1"},
|
|
||||||
}
|
|
||||||
repoQuery := func(ctx context.Context, tenantSlug string) ([]string, error) {
|
|
||||||
return data[tenantSlug], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
role := rbac.Role("test_tenant_rolle")
|
|
||||||
perm := rbac.Permission("test_dokumente_lesen")
|
|
||||||
if err := enforcer.store.Grant(ctx, role, perm, "admin@example.com"); err != nil {
|
|
||||||
t.Fatalf("grant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
gotAcme, err := GuardTenantScoped(ctx, enforcer, role, perm, "acme", repoQuery)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("guard tenant scoped (acme): %v", err)
|
|
||||||
}
|
|
||||||
if len(gotAcme) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 dokumente fuer acme, habe %d", len(gotAcme))
|
|
||||||
}
|
|
||||||
|
|
||||||
gotGlobex, err := GuardTenantScoped(ctx, enforcer, role, perm, "globex", repoQuery)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("guard tenant scoped (globex): %v", err)
|
|
||||||
}
|
|
||||||
if len(gotGlobex) != 1 {
|
|
||||||
t.Fatalf("erwartet 1 dokument fuer globex, habe %d", len(gotGlobex))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
// Package policy implementiert Core RBAC-02: die zentrale Policy-
|
|
||||||
// Entscheidungs- und Durchsetzungsschicht. Regeln liegen deklarativ in der
|
|
||||||
// Datenbank (Casbin-Prinzip: Policy als Modell+Regeln getrennt vom Code),
|
|
||||||
// versioniert und auditierbar — anders als Casbin-Dateien im Dateisystem
|
|
||||||
// (siehe "bewusst vermeiden" im Ticket).
|
|
||||||
package policy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/rbac"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Rule ist eine gewaehrte Regel: role darf permission.
|
|
||||||
type Rule struct {
|
|
||||||
Role rbac.Role
|
|
||||||
Permission rbac.Permission
|
|
||||||
}
|
|
||||||
|
|
||||||
// RuleChange ist ein Eintrag der Aenderungshistorie (Akzeptanzkriterium 3).
|
|
||||||
type RuleChange struct {
|
|
||||||
Role rbac.Role
|
|
||||||
Permission rbac.Permission
|
|
||||||
Action string // "grant" oder "revoke"
|
|
||||||
Actor string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store verwaltet den deklarativen Regelsatz. IsAllowed schaut NUR in die
|
|
||||||
// Datenbank — es gibt keinen hartcodierten Go-Fallback, ein Regelwechsel
|
|
||||||
// wirkt sich ohne Codeaenderung sofort aus (Akzeptanzkriterium 2 / 3).
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsAllowed prueft, ob role das Recht permission besitzt. Default-Deny:
|
|
||||||
// existiert keine passende Regel, ist der Zugriff verboten
|
|
||||||
// (Akzeptanzkriterium 2 / Pruefung 2) — es gibt keinen impliziten
|
|
||||||
// "erlaubt, wenn nichts anderes gesagt"-Pfad.
|
|
||||||
func (s *Store) IsAllowed(ctx context.Context, role rbac.Role, perm rbac.Permission) (bool, error) {
|
|
||||||
var exists bool
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT EXISTS(SELECT 1 FROM policy_rules WHERE role = $1 AND permission = $2)
|
|
||||||
`, string(role), string(perm)).Scan(&exists)
|
|
||||||
if err != nil {
|
|
||||||
return false, fmt.Errorf("policy pruefen: %w", err)
|
|
||||||
}
|
|
||||||
return exists, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Grant gewaehrt role das Recht permission — deklarativ, ohne Codeaenderung
|
|
||||||
// wirksam. actor wird fuer die Aenderungshistorie festgehalten.
|
|
||||||
func (s *Store) Grant(ctx context.Context, role rbac.Role, perm rbac.Permission, actor string) error {
|
|
||||||
return s.change(ctx, role, perm, "grant", actor, `
|
|
||||||
INSERT INTO policy_rules (role, permission, granted_by, granted_at)
|
|
||||||
VALUES ($1, $2, $3, now())
|
|
||||||
ON CONFLICT (role, permission) DO UPDATE SET granted_by = $3, granted_at = now()
|
|
||||||
`, string(role), string(perm), actor)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Revoke entzieht role das Recht permission.
|
|
||||||
func (s *Store) Revoke(ctx context.Context, role rbac.Role, perm rbac.Permission, actor string) error {
|
|
||||||
return s.change(ctx, role, perm, "revoke", actor, `
|
|
||||||
DELETE FROM policy_rules WHERE role = $1 AND permission = $2
|
|
||||||
`, string(role), string(perm))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) change(ctx context.Context, role rbac.Role, perm rbac.Permission, action, actor, sql string, args ...any) error {
|
|
||||||
tx, err := s.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, sql, args...); err != nil {
|
|
||||||
return fmt.Errorf("regel aendern: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var version int
|
|
||||||
if err := tx.QueryRow(ctx, `
|
|
||||||
SELECT COALESCE(MAX(version), 0) + 1 FROM policy_rule_changes WHERE role = $1 AND permission = $2
|
|
||||||
`, string(role), string(perm)).Scan(&version); err != nil {
|
|
||||||
return fmt.Errorf("naechste version ermitteln: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO policy_rule_changes (role, permission, action, actor, version, changed_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, now())
|
|
||||||
`, string(role), string(perm), action, actor, version); err != nil {
|
|
||||||
return fmt.Errorf("historie schreiben: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return tx.Commit(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// History liefert die vollstaendige, versionierte Aenderungshistorie einer
|
|
||||||
// Regel (Akzeptanzkriterium 3).
|
|
||||||
func (s *Store) History(ctx context.Context, role rbac.Role, perm rbac.Permission) ([]RuleChange, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT action, actor, version FROM policy_rule_changes
|
|
||||||
WHERE role = $1 AND permission = $2 ORDER BY version
|
|
||||||
`, string(role), string(perm))
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("historie abfragen: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []RuleChange
|
|
||||||
for rows.Next() {
|
|
||||||
c := RuleChange{Role: role, Permission: perm}
|
|
||||||
if err := rows.Scan(&c.Action, &c.Actor, &c.Version); err != nil {
|
|
||||||
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, c)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
package rbac
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
// QA-03 Akzeptanzkriterium 2 / Pruefung 1: gezielter Umgehungsversuch der
|
|
||||||
// zentralen Policy-Schicht (RBAC-02, internal/policy.Enforcer) — direkter
|
|
||||||
// Zugriff auf role_assignments ohne den Store/Handler-Umweg.
|
|
||||||
//
|
|
||||||
// Ergebnis: erfolglos abgewiesen. Store.Assign ist die einzige Schreib-API,
|
|
||||||
// es gibt keine andere exportierte Funktion, die role_assignments direkt
|
|
||||||
// beschreibt — ein Aufrufer ausserhalb dieses Packages kann die Tabelle
|
|
||||||
// nicht ohne SQL-Zugriff auf den Pool selbst manipulieren, und dieser Pool
|
|
||||||
// ist nicht exportiert (Store.pool ist ein unexportiertes Feld).
|
|
||||||
func TestBypass_NoDirectWriteAPIOutsideStore(t *testing.T) {
|
|
||||||
// Kompilierzeit-Beleg: es gibt keinen Weg, role_assignments ausserhalb
|
|
||||||
// dieser Datei zu schreiben, ohne *Store zu benutzen — der Test dient
|
|
||||||
// als dokumentierter Nachweis, dass dieser Umgehungsversuch bereits am
|
|
||||||
// Typsystem scheitert, nicht erst zur Laufzeit.
|
|
||||||
var _ = (*Store)(nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// QA-03 Akzeptanzkriterium 2 (Kern-Fund, siehe docs/QA-03-PRUEFPROTOKOLL.md
|
|
||||||
// "Abweichungen"): internal/rbac/handler.go (RBAC-05) entscheidet
|
|
||||||
// Zugriffsrechte ueber requireManageUsers() -> HasPermission() — die
|
|
||||||
// STATISCHE, hartcodierte Rollenhierarchie aus role.go. Es ruft NICHT
|
|
||||||
// internal/policy.Enforcer.Authorize()/Guard() auf, die eigentliche
|
|
||||||
// zentrale, DB-gestuetzte Policy-Durchsetzungsschicht aus RBAC-02
|
|
||||||
// (policy_rules-Tabelle, per Store.Grant/Revoke administrierbar).
|
|
||||||
//
|
|
||||||
// Konsequenz: ein Tenant-Admin, der ueber policy.Store.Revoke() das Recht
|
|
||||||
// tenant.manage_users von der Rolle tenant_admin entzieht, sperrt die
|
|
||||||
// RBAC-05-Handler NICHT aus — sie fragen diese Tabelle nie ab. Dieser Test
|
|
||||||
// beweist die tatsaechliche (fehlerhafte) Realitaet, NICHT das gewuenschte
|
|
||||||
// Verhalten — siehe Pruefprotokoll fuer die Einordnung als Abweichung statt
|
|
||||||
// stillschweigend behoben (Arbeitsweise-Regel: kein Umbau angrenzender
|
|
||||||
// Bereiche in dieser Kachel, RBAC-05 gehoert nicht zu QA-03s Vorbedingungen).
|
|
||||||
func TestBypass_HandlerIgnoresCentralPolicyRevocation(t *testing.T) {
|
|
||||||
_, roles, users, _ := setupHandlerTest(t, "qa03_bypass_policy_ignored")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
admin, err := users.Create(ctx, "admin-bypass@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)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Simuliert: ueber die zentrale Policy-Schicht (RBAC-02) wuerde
|
|
||||||
// tenant.manage_users der Rolle tenant_admin entzogen. Da RBAC-05s
|
|
||||||
// Handler diese Tabelle nie liest, hat der Entzug HIER keine Wirkung —
|
|
||||||
// requireManageUsers() erlaubt weiterhin, weil es nur HasPermission()
|
|
||||||
// (statische Hierarchie) fragt, nicht policy.Store.IsAllowed()
|
|
||||||
// (dynamische, gerade entzogene Regel).
|
|
||||||
stillAllowedByStaticHierarchy := HasPermission(RoleTenantAdmin, PermManageUsers)
|
|
||||||
if !stillAllowedByStaticHierarchy {
|
|
||||||
t.Fatal("erwartungsgemaess (fuer den Beweis): statische Hierarchie erlaubt weiterhin tenant.manage_users fuer tenant_admin")
|
|
||||||
}
|
|
||||||
|
|
||||||
// requireManageUsers() nutzt ausschliesslich diese statische Pruefung —
|
|
||||||
// ein Entzug ueber policy.Store haette hier KEINE Wirkung. Das ist der
|
|
||||||
// dokumentierte Fund: zwei parallele Enforcement-Pfade statt einer
|
|
||||||
// zentralen Schicht (verletzt die Ticket-Produkt-DNA "Rechte werden
|
|
||||||
// zentral entschieden, nicht in jedem Handler neu erfunden").
|
|
||||||
t.Log("FUND: internal/rbac/handler.go prueft HasPermission() (statisch), nicht internal/policy.Enforcer (RBAC-02, dynamisch) — ein Entzug ueber policy.Store.Revoke() wuerde RBAC-05-Endpunkte nicht sperren. Siehe docs/QA-03-PRUEFPROTOKOLL.md.")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gegenprobe: RBAC-02s eigene Enforcer/Guard-Schicht IST korrekt
|
|
||||||
// zentralisiert und respektiert Revoke sofort — der Fund oben betrifft
|
|
||||||
// ausschliesslich RBAC-05s Handler, nicht RBAC-02 selbst.
|
|
||||||
func TestBypass_PolicyEnforcerItselfRespectsRevocation(t *testing.T) {
|
|
||||||
_, roles, users, pool := setupHandlerTest(t, "qa03_bypass_enforcer_ok")
|
|
||||||
ctx := context.Background()
|
|
||||||
_ = roles
|
|
||||||
_ = users
|
|
||||||
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS policy_rules (
|
|
||||||
role TEXT NOT NULL, permission TEXT NOT NULL, granted_by TEXT NOT NULL,
|
|
||||||
granted_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS policy_rule_changes (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), role TEXT NOT NULL, permission TEXT NOT NULL,
|
|
||||||
action TEXT NOT NULL, actor TEXT NOT NULL, version INT NOT NULL, changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("policy-schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Diese Tabellen/Typen leben im Package internal/policy — hier nur
|
|
||||||
// strukturell nachgebaut, um den Unterschied zu belegen, ohne einen
|
|
||||||
// Importzyklus zu riskieren (internal/policy importiert bereits
|
|
||||||
// internal/rbac, nicht umgekehrt).
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
INSERT INTO policy_rules (role, permission, granted_by) VALUES ('tenant_admin', 'tenant.manage_users', 'system')
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("regel gewaehren: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var allowedBefore bool
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT EXISTS(SELECT 1 FROM policy_rules WHERE role='tenant_admin' AND permission='tenant.manage_users')`).Scan(&allowedBefore); err != nil {
|
|
||||||
t.Fatalf("pruefen vor entzug: %v", err)
|
|
||||||
}
|
|
||||||
if !allowedBefore {
|
|
||||||
t.Fatal("erwartet: regel ist zunaechst gewaehrt")
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := pool.Exec(ctx, `DELETE FROM policy_rules WHERE role='tenant_admin' AND permission='tenant.manage_users'`); err != nil {
|
|
||||||
t.Fatalf("regel entziehen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var allowedAfter bool
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT EXISTS(SELECT 1 FROM policy_rules WHERE role='tenant_admin' AND permission='tenant.manage_users')`).Scan(&allowedAfter); err != nil {
|
|
||||||
t.Fatalf("pruefen nach entzug: %v", err)
|
|
||||||
}
|
|
||||||
if allowedAfter {
|
|
||||||
t.Fatal("regel haette nach entzug nicht mehr existieren duerfen")
|
|
||||||
}
|
|
||||||
// RBAC-02s Enforcer.Authorize fragt exakt diese Tabelle live ab (siehe
|
|
||||||
// internal/policy/store.go IsAllowed) — der Entzug wirkt dort sofort,
|
|
||||||
// im Gegensatz zu RBAC-05s Handler (siehe Test oben).
|
|
||||||
}
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,250 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,358 +0,0 @@
|
|||||||
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())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// QA-03 Akzeptanzkriterium 2: Rueckstufung (tenant_admin -> user) durch
|
|
||||||
// einen Admin funktioniert ebenso wie die bereits getestete Hochstufung —
|
|
||||||
// Rollenwechsel-Szenario in beide Richtungen, History haelt beide fest.
|
|
||||||
func TestAssignRole_AdminCanDemoteOtherUser(t *testing.T) {
|
|
||||||
h, roles, users, _ := setupHandlerTest(t, "qa03_demote_other")
|
|
||||||
ctx := context.Background()
|
|
||||||
admin, err := users.Create(ctx, "admin-demote@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, "wird-zurueckgestuft@acme.example", "Wird zurueckgestuft")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("anderen nutzer anlegen: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := roles.Assign(ctx, other.ID, RoleTenantAdmin, admin.ID); err != nil {
|
|
||||||
t.Fatalf("ausgangsrolle (tenant_admin) setzen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret")
|
|
||||||
body, _ := json.Marshal(assignRoleRequest{UserID: other.ID, Role: RoleUser})
|
|
||||||
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())
|
|
||||||
}
|
|
||||||
|
|
||||||
assignment, err := roles.Get(ctx, other.ID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("rolle laden: %v", err)
|
|
||||||
}
|
|
||||||
if assignment.Role != RoleUser {
|
|
||||||
t.Fatalf("rolle = %q, want user (rueckgestuft)", assignment.Role)
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := roles.History(ctx, other.ID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history laden: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 2 || history[0].Role != RoleTenantAdmin || history[1].Role != RoleUser {
|
|
||||||
t.Fatalf("erwartet history [tenant_admin, user] (hoch- dann rueckgestuft), habe %+v", history)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
// Package rbac implementiert Core RBAC-01: das Rollenmodell mit
|
|
||||||
// Grundrollen/-rechten, Hierarchie und Zuweisung. Die eigentliche
|
|
||||||
// Durchsetzung (erlaubt/verboten je Request) ist RBAC-02, dieses Paket
|
|
||||||
// liefert nur Modell + Zuweisung (Casbin-Prinzip: Policy-Modell getrennt
|
|
||||||
// von der Entscheidungsfunktion).
|
|
||||||
package rbac
|
|
||||||
|
|
||||||
// Role ist eine der drei Grundrollen. Superadmin lebt mandantenuebergreifend
|
|
||||||
// (siehe internal/user.SuperadminStore aus IAM-01) und wird deshalb NICHT
|
|
||||||
// ueber Store (tenant-gescoped) zugewiesen — die Existenz eines Superadmin-
|
|
||||||
// Kontos IST die Rollenzuweisung.
|
|
||||||
type Role string
|
|
||||||
|
|
||||||
const (
|
|
||||||
RoleSuperadmin Role = "superadmin"
|
|
||||||
RoleTenantAdmin Role = "tenant_admin"
|
|
||||||
RoleUser Role = "user"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Permission string
|
|
||||||
|
|
||||||
const (
|
|
||||||
PermSelfRead Permission = "self.read"
|
|
||||||
PermSelfUpdate Permission = "self.update"
|
|
||||||
PermManageUsers Permission = "tenant.manage_users"
|
|
||||||
PermManageSettings Permission = "tenant.manage_settings"
|
|
||||||
PermManageTenants Permission = "platform.manage_tenants"
|
|
||||||
)
|
|
||||||
|
|
||||||
// parent bildet die Rollenhierarchie ab (Akzeptanzkriterium 2): eine Rolle
|
|
||||||
// erbt alle Rechte ihrer Elternrolle. tenant_admin erbt von user,
|
|
||||||
// superadmin erbt von tenant_admin.
|
|
||||||
var parent = map[Role]Role{
|
|
||||||
RoleTenantAdmin: RoleUser,
|
|
||||||
RoleSuperadmin: RoleTenantAdmin,
|
|
||||||
}
|
|
||||||
|
|
||||||
// direct sind die einer Rolle direkt (ohne Vererbung) zugeordneten Rechte.
|
|
||||||
var direct = map[Role][]Permission{
|
|
||||||
RoleUser: {PermSelfRead, PermSelfUpdate},
|
|
||||||
RoleTenantAdmin: {PermManageUsers, PermManageSettings},
|
|
||||||
RoleSuperadmin: {PermManageTenants},
|
|
||||||
}
|
|
||||||
|
|
||||||
// EffectivePermissions liefert die vollstaendige, ueber die Hierarchie
|
|
||||||
// aufgeloeste Rechtemenge einer Rolle (Akzeptanzkriterium 2 / Pruefung 2).
|
|
||||||
func EffectivePermissions(role Role) []Permission {
|
|
||||||
seen := make(map[Permission]bool)
|
|
||||||
var out []Permission
|
|
||||||
|
|
||||||
for r, ok := role, true; ok; r, ok = parent[r] {
|
|
||||||
for _, p := range direct[r] {
|
|
||||||
if !seen[p] {
|
|
||||||
seen[p] = true
|
|
||||||
out = append(out, p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
// HasPermission prueft, ob eine Rolle (inklusive geerbter Rechte) ein
|
|
||||||
// bestimmtes Recht besitzt.
|
|
||||||
func HasPermission(role Role, perm Permission) bool {
|
|
||||||
for _, p := range EffectivePermissions(role) {
|
|
||||||
if p == perm {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
package rbac
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func contains(perms []Permission, p Permission) bool {
|
|
||||||
for _, x := range perms {
|
|
||||||
if x == p {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Rollenhierarchie liefert die erwartete
|
|
||||||
// effektive Rechtemenge.
|
|
||||||
func TestEffectivePermissions_Inheritance(t *testing.T) {
|
|
||||||
userPerms := EffectivePermissions(RoleUser)
|
|
||||||
if !contains(userPerms, PermSelfRead) || !contains(userPerms, PermSelfUpdate) {
|
|
||||||
t.Fatalf("user sollte self.read/self.update haben, habe %v", userPerms)
|
|
||||||
}
|
|
||||||
if contains(userPerms, PermManageUsers) {
|
|
||||||
t.Fatal("user sollte KEIN tenant.manage_users haben")
|
|
||||||
}
|
|
||||||
|
|
||||||
adminPerms := EffectivePermissions(RoleTenantAdmin)
|
|
||||||
if !contains(adminPerms, PermSelfRead) || !contains(adminPerms, PermManageUsers) || !contains(adminPerms, PermManageSettings) {
|
|
||||||
t.Fatalf("tenant_admin sollte geerbte user-rechte + eigene rechte haben, habe %v", adminPerms)
|
|
||||||
}
|
|
||||||
if contains(adminPerms, PermManageTenants) {
|
|
||||||
t.Fatal("tenant_admin sollte KEIN platform.manage_tenants haben")
|
|
||||||
}
|
|
||||||
|
|
||||||
superPerms := EffectivePermissions(RoleSuperadmin)
|
|
||||||
for _, want := range []Permission{PermSelfRead, PermSelfUpdate, PermManageUsers, PermManageSettings, PermManageTenants} {
|
|
||||||
if !contains(superPerms, want) {
|
|
||||||
t.Fatalf("superadmin sollte %q haben (volle vererbte kette), habe %v", want, superPerms)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHasPermission(t *testing.T) {
|
|
||||||
if !HasPermission(RoleTenantAdmin, PermSelfRead) {
|
|
||||||
t.Fatal("tenant_admin sollte geerbtes self.read haben")
|
|
||||||
}
|
|
||||||
if HasPermission(RoleUser, PermManageTenants) {
|
|
||||||
t.Fatal("user sollte platform.manage_tenants nicht haben")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
package rbac
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrRoleNotAssignableInTenantScope wird geliefert, wenn versucht wird,
|
|
||||||
// eine mandantenuebergreifende Rolle (superadmin) ueber den tenant-
|
|
||||||
// gescopten Store zu vergeben — die erlaubte Matrix laesst hier nur
|
|
||||||
// user/tenant_admin zu (Akzeptanzkriterium 1 / Pruefung 1).
|
|
||||||
ErrRoleNotAssignableInTenantScope = errors.New("rbac: rolle ist in diesem geltungsbereich nicht zuweisbar")
|
|
||||||
ErrNotFound = errors.New("rbac: keine rollenzuweisung gefunden")
|
|
||||||
)
|
|
||||||
|
|
||||||
// assignableRoles ist die erlaubte Matrix fuer Store (tenant-gescoped).
|
|
||||||
var assignableRoles = map[Role]bool{
|
|
||||||
RoleUser: true,
|
|
||||||
RoleTenantAdmin: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
type Assignment struct {
|
|
||||||
UserID string
|
|
||||||
Role Role
|
|
||||||
GrantedBy string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store verwaltet Rollenzuweisungen innerhalb GENAU EINER Tenant-Datenbank —
|
|
||||||
// analog zu internal/user.TenantUserStore (Modell C: der Pool bestimmt den
|
|
||||||
// Tenant, keine tenant_id-Spalte noetig).
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Assign vergibt eine Rolle an einen Benutzer. grantedBy identifiziert den
|
|
||||||
// Akteur, der die Zuweisung vorgenommen hat (Akzeptanzkriterium 3). Jede
|
|
||||||
// Zuweisung wird zusaetzlich in role_assignment_history festgehalten, auch
|
|
||||||
// wenn sie eine vorherige Rolle ersetzt.
|
|
||||||
func (s *Store) Assign(ctx context.Context, userID string, role Role, grantedBy string) (Assignment, error) {
|
|
||||||
if !assignableRoles[role] {
|
|
||||||
return Assignment{}, ErrRoleNotAssignableInTenantScope
|
|
||||||
}
|
|
||||||
if grantedBy == "" {
|
|
||||||
return Assignment{}, errors.New("rbac: grantedBy darf nicht leer sein")
|
|
||||||
}
|
|
||||||
|
|
||||||
tx, err := s.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return Assignment{}, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO role_assignments (user_id, role, granted_by, granted_at)
|
|
||||||
VALUES ($1, $2, $3, now())
|
|
||||||
ON CONFLICT (user_id) DO UPDATE SET role = $2, granted_by = $3, granted_at = now()
|
|
||||||
`, userID, string(role), grantedBy); err != nil {
|
|
||||||
return Assignment{}, fmt.Errorf("rolle zuweisen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO role_assignment_history (user_id, role, granted_by, granted_at)
|
|
||||||
VALUES ($1, $2, $3, now())
|
|
||||||
`, userID, string(role), grantedBy); err != nil {
|
|
||||||
return Assignment{}, fmt.Errorf("historie schreiben: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return Assignment{}, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return Assignment{UserID: userID, Role: role, GrantedBy: grantedBy}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Store) Get(ctx context.Context, userID string) (Assignment, error) {
|
|
||||||
var a Assignment
|
|
||||||
var role string
|
|
||||||
a.UserID = userID
|
|
||||||
if err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT role, granted_by FROM role_assignments WHERE user_id = $1
|
|
||||||
`, userID).Scan(&role, &a.GrantedBy); err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Assignment{}, ErrNotFound
|
|
||||||
}
|
|
||||||
return Assignment{}, fmt.Errorf("rollenzuweisung lesen: %w", err)
|
|
||||||
}
|
|
||||||
a.Role = Role(role)
|
|
||||||
return a, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// History liefert jede Rollenzuweisung eines Benutzers in chronologischer
|
|
||||||
// Reihenfolge — die Grundlage fuer "wer hat wann welche Rolle vergeben"
|
|
||||||
// (Akzeptanzkriterium 3).
|
|
||||||
func (s *Store) History(ctx context.Context, userID string) ([]Assignment, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT role, granted_by FROM role_assignment_history
|
|
||||||
WHERE user_id = $1 ORDER BY granted_at
|
|
||||||
`, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("historie abfragen: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []Assignment
|
|
||||||
for rows.Next() {
|
|
||||||
var role string
|
|
||||||
a := Assignment{UserID: userID}
|
|
||||||
if err := rows.Scan(&role, &a.GrantedBy); err != nil {
|
|
||||||
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
|
||||||
}
|
|
||||||
a.Role = Role(role)
|
|
||||||
out = append(out, a)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
package rbac
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupStoreTest(t *testing.T) (*Store, string, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
email TEXT NOT NULL UNIQUE,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
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 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()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
userStore := user.NewTenantUserStore(pool)
|
|
||||||
u, err := userStore.Create(ctx, "rbac_test@example.com", "RBAC Test")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("testuser anlegen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM role_assignment_history WHERE user_id = $1`, u.ID)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM role_assignments WHERE user_id = $1`, u.ID)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM users WHERE id = $1`, u.ID)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return NewStore(pool), u.ID, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1: Grundrollen sind einem Benutzer je Tenant zuweisbar.
|
|
||||||
func TestStore_AssignAndGet(t *testing.T) {
|
|
||||||
store, userID, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
assigned, err := store.Assign(ctx, userID, RoleTenantAdmin, "admin@acme.example")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("assign: %v", err)
|
|
||||||
}
|
|
||||||
if assigned.Role != RoleTenantAdmin {
|
|
||||||
t.Fatalf("erwartet tenant_admin, habe %q", assigned.Role)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := store.Get(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get: %v", err)
|
|
||||||
}
|
|
||||||
if got.Role != RoleTenantAdmin || got.GrantedBy != "admin@acme.example" {
|
|
||||||
t.Fatalf("zuweisung unerwartet: %+v", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Zuweisung ausserhalb der erlaubten
|
|
||||||
// Matrix (superadmin im tenant-gescopten Store) wird abgewiesen.
|
|
||||||
func TestStore_RejectsSuperadminOutsideAllowedMatrix(t *testing.T) {
|
|
||||||
store, userID, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
_, err := store.Assign(ctx, userID, RoleSuperadmin, "admin@acme.example")
|
|
||||||
if !errors.Is(err, ErrRoleNotAssignableInTenantScope) {
|
|
||||||
t.Fatalf("erwartet ErrRoleNotAssignableInTenantScope, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sicherstellen, dass der abgewiesene Versuch keine Zeile hinterlassen hat.
|
|
||||||
if _, err := store.Get(ctx, userID); !errors.Is(err, ErrNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrNotFound nach abgewiesener zuweisung, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStore_RejectsUnknownRole(t *testing.T) {
|
|
||||||
store, userID, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Assign(ctx, userID, Role("erfunden"), "admin@acme.example"); !errors.Is(err, ErrRoleNotAssignableInTenantScope) {
|
|
||||||
t.Fatalf("erwartet ErrRoleNotAssignableInTenantScope fuer unbekannte rolle, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Rollenzuweisung vollstaendig auditierbar.
|
|
||||||
func TestStore_HistoryTracksWhoAndWhen(t *testing.T) {
|
|
||||||
store, userID, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Assign(ctx, userID, RoleUser, "system"); err != nil {
|
|
||||||
t.Fatalf("assign 1: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.Assign(ctx, userID, RoleTenantAdmin, "admin@acme.example"); err != nil {
|
|
||||||
t.Fatalf("assign 2: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := store.History(ctx, userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 historieneintraege, habe %d", len(history))
|
|
||||||
}
|
|
||||||
if history[0].Role != RoleUser || history[0].GrantedBy != "system" {
|
|
||||||
t.Fatalf("history[0] unerwartet: %+v", history[0])
|
|
||||||
}
|
|
||||||
if history[1].Role != RoleTenantAdmin || history[1].GrantedBy != "admin@acme.example" {
|
|
||||||
t.Fatalf("history[1] unerwartet: %+v", history[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS policy_rule_changes;
|
|
||||||
DROP TABLE IF EXISTS policy_rules;
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
-- Zentrale, deklarative Policy-Regeln (RBAC-02, siehe core-kanban/tickets/RBAC-02.md).
|
|
||||||
-- policy_rules haelt den AKTUELLEN, gewaehrten Regelsatz (Existenz = erlaubt,
|
|
||||||
-- Default-Deny fuer alles ohne Zeile). policy_rule_changes ist die
|
|
||||||
-- versionierte Aenderungshistorie (Akzeptanzkriterium 3: Regelwechsel ohne
|
|
||||||
-- Codeaenderung nachvollziehbar).
|
|
||||||
CREATE TABLE policy_rules (
|
|
||||||
role TEXT NOT NULL,
|
|
||||||
permission TEXT NOT NULL,
|
|
||||||
granted_by TEXT NOT NULL,
|
|
||||||
granted_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE policy_rule_changes (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
role TEXT NOT NULL,
|
|
||||||
permission TEXT NOT NULL,
|
|
||||||
action TEXT NOT NULL CHECK (action IN ('grant', 'revoke')),
|
|
||||||
actor TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX policy_rule_changes_idx ON policy_rule_changes (role, permission, version);
|
|
||||||
@@ -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);
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS feature_flags;
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
-- Feature-Flags zentral je Mandant/Zielgruppe (LIC-02, siehe core-kanban/tickets/LIC-02.md).
|
|
||||||
-- Lebt in der Registry-DB, nicht pro Tenant-Datenbank — Flags sind eine
|
|
||||||
-- Core-weite Konfiguration, keine Mandanten-Geschaeftsdaten.
|
|
||||||
CREATE TABLE feature_flags (
|
|
||||||
key TEXT PRIMARY KEY,
|
|
||||||
enabled BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
rollout_percentage INT NOT NULL DEFAULT 0 CHECK (rollout_percentage BETWEEN 0 AND 100),
|
|
||||||
target_tenant_slugs TEXT[] NOT NULL DEFAULT '{}',
|
|
||||||
updated_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);
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS policy_module_scopes;
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
-- Modul-Scoping fuer Policy-Regeln (RBAC-04, siehe core-kanban/tickets/RBAC-04.md).
|
|
||||||
-- Existiert fuer eine (role, permission)-Regel ein Eintrag hier, gilt sie
|
|
||||||
-- NUR, wenn zusaetzlich das verknuepfte Feature-Flag (LIC-02) fuer den
|
|
||||||
-- Tenant aktiv ist — Rechte folgen der Lizenz, nicht umgekehrt.
|
|
||||||
CREATE TABLE policy_module_scopes (
|
|
||||||
role TEXT NOT NULL,
|
|
||||||
permission TEXT NOT NULL,
|
|
||||||
module TEXT NOT NULL,
|
|
||||||
flag_key TEXT NOT NULL,
|
|
||||||
PRIMARY KEY (role, permission)
|
|
||||||
);
|
|
||||||
@@ -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 @@
|
|||||||
|
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);
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS role_assignment_history;
|
|
||||||
DROP TABLE IF EXISTS role_assignments;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
-- Rollenzuweisung pro Benutzer (RBAC-01, siehe core-kanban/tickets/RBAC-01.md).
|
|
||||||
-- Nur 'user' und 'tenant_admin' sind hier zuweisbar — 'superadmin' lebt
|
|
||||||
-- mandantenuebergreifend in der Registry (IAM-01 SuperadminStore) und hat
|
|
||||||
-- daher bewusst KEINE Zeile in dieser tenant-lokalen Tabelle (Akzeptanz-
|
|
||||||
-- kriterium 1: nur Zuweisungen innerhalb der erlaubten Matrix).
|
|
||||||
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()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Vollstaendige Historie jeder Rollenaenderung (Akzeptanzkriterium 3: wer
|
|
||||||
-- hat wann welche Rolle vergeben).
|
|
||||||
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 INDEX role_assignment_history_user_idx ON role_assignment_history (user_id, granted_at);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS group_members;
|
|
||||||
DROP TABLE IF EXISTS groups;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
-- 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);
|
|
||||||
@@ -1,23 +1,11 @@
|
|||||||
#!/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"
|
||||||
|
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
||||||
|
|
||||||
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
||||||
for db in $dbs; do
|
for db in $dbs; do
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
||||||
|
|||||||
@@ -1,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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
||||||
|
|
||||||
export const metadata = {
|
export const metadata = {
|
||||||
title: "NEXARCH Rechteverwaltung",
|
title: "NEXARCH Benachrichtigungen",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
@@ -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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
export default function IndexPage() {
|
export default function IndexPage() {
|
||||||
redirect("/roles");
|
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");
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "nexarch-rbac-admin",
|
"name": "nexarch-notifications",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
@@ -1,183 +0,0 @@
|
|||||||
"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>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
"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";
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
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 }) });
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user