Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df2a54f0e6 | ||
|
|
f627caaacb | ||
|
|
f0139c889a | ||
|
|
d9fb2e33f2 | ||
|
|
1b4c3db9b8 | ||
|
|
f224b5c9be | ||
|
|
b6a941feec | ||
|
|
3d20d86a4f |
@@ -64,9 +64,6 @@ Keine Änderungen ermittelbar.
|
|||||||
## 2026-08-27 17:28 – 17:29 (1m)
|
## 2026-08-27 17:28 – 17:29 (1m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
## 2026-08-28 21:44 – 21:44 (0m)
|
|
||||||
**Beschreibung:** Claude Code Session
|
|
||||||
**Projekt:** nexarch
|
|
||||||
|
|
||||||
### Commits
|
### Commits
|
||||||
Keine Commits in dieser Session.
|
Keine Commits in dieser Session.
|
||||||
@@ -132,27 +129,27 @@ Keine Commits in dieser Session.
|
|||||||
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-27 17:53 – 17:57 (4m)
|
## 2026-08-28 22:48 – 22:51 (3m)
|
||||||
|
## 2026-08-28 21:44 – 21:44 (0m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** nexarch
|
||||||
|
|
||||||
### Commits
|
### Commits
|
||||||
- e479330 IAM-01: benutzer-datenmodell-crud
|
- c344dea TEN-08: tenant-loeschung-unter-retention-vorbehalt-gobd (RetentionChecker-Schnittstelle gegen Archive RET-03/CMP-06, ProcessDueDeletions haelt gesperrte Tenants zurueck)
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- cmd/core/main.go | 11 ++++++++++-
|
- internal/tenant/lifecycle.go | 45 ++++++++++++++++++++++++++++++++++++++++-----
|
||||||
- go.mod | 9 +++++++++
|
- internal/tenant/lifecycle_test.go | 4 +++-
|
||||||
- go.sum | 28 ++++++++++++++++++++++++++++
|
- internal/tenant/registry.go | 7 +++++--
|
||||||
- internal/user/handler.go | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/tenant/retention.go | 34 ++++++++++++++++++++++++++++++++++
|
||||||
- internal/user/store_test.go | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/tenant/retention_test.go | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- internal/user/superadmin_store.go | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/tenant/tenant.go | 5 +++++
|
||||||
- internal/user/tenant_store.go | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- migrations/0004_tenant_retention_block.down.sql | 2 ++
|
||||||
- internal/user/user.go | 42 ++++++++++++++++++++++++++++++++++++++++++
|
- migrations/0004_tenant_retention_block.up.sql | 6 ++++++
|
||||||
- internal/user/user_test.go | 24 ++++++++++++++++++++++++
|
Keine Commits in dieser Session.
|
||||||
- migrations/0002_superadmins.down.sql | 1 +
|
|
||||||
- migrations/0002_superadmins.up.sql | 14 ++++++++++++++
|
### Geänderte Dateien
|
||||||
- migrations/tenant/0001_users.down.sql | 1 +
|
- .gitignore | 2 ++
|
||||||
- migrations/tenant/0001_users.up.sql | 16 ++++++++++++++++
|
|
||||||
- web/shl/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
- web/shl/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/shl/__tests__/Dialog.test.tsx | 38 ++++++++++++++++++++++++++++++++++++++
|
- web/shl/__tests__/Dialog.test.tsx | 38 ++++++++++++++++++++++++++++++++++++++
|
||||||
- web/shl/__tests__/tokens.test.ts | 39 +++++++++++++++++++++++++++++++++++++++
|
- web/shl/__tests__/tokens.test.ts | 39 +++++++++++++++++++++++++++++++++++++++
|
||||||
@@ -182,3 +179,63 @@ Keine Commits in dieser Session.
|
|||||||
- web/shl/vitest.setup.ts | 1 +
|
- web/shl/vitest.setup.ts | 1 +
|
||||||
|
|
||||||
---
|
---
|
||||||
|
## 2026-08-28 23:27 – 23:35 (7m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** nexarch
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
- f627caa IAM-08: benutzerprofil-login-oberflaeche (login+2fa/passwort-reset/profil-backend-handler + web/account next.js-frontend auf shl-01)
|
||||||
|
- f0139c8 Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/iam-08-benutzerprofil-login-oberflaeche
|
||||||
|
- d9fb2e3 Merge branch 'feature/iam-03-passwort-reset-einladungs-flow' into feature/iam-08-benutzerprofil-login-oberflaeche
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- internal/auth/changepassword.go | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/changepassword_test.go | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/profile.go | 44 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/profile_test.go | 48 ++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/authtoken/handler.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/authtoken/handler_test.go | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/totp/handler.go | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/totp/handler_test.go | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/tenant_store.go | 20 ++++++++++++++++++
|
||||||
|
- web/account/app/layout.tsx | 30 ++++++++++++++++++++++++++
|
||||||
|
- web/account/app/login/page.tsx | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/page.tsx | 5 +++++
|
||||||
|
- web/account/app/password-reset/complete/page.tsx | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/password-reset/request/page.tsx | 53 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/profile/page.tsx | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/lib/api.ts | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/next.config.mjs | 7 +++++++
|
||||||
|
- web/account/package.json | 22 +++++++++++++++++++
|
||||||
|
- web/account/tsconfig.json | 21 +++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
## 2026-08-28 23:35 – 23:35 (0m)
|
||||||
|
**Beschreibung:** Claude Code Session
|
||||||
|
**Projekt:** code
|
||||||
|
|
||||||
|
### Commits
|
||||||
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
- internal/auth/changepassword.go | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/changepassword_test.go | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/profile.go | 44 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/auth/profile_test.go | 48 ++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/authtoken/handler.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/authtoken/handler_test.go | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/totp/handler.go | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/totp/handler_test.go | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/user/tenant_store.go | 20 ++++++++++++++++++
|
||||||
|
- web/account/app/layout.tsx | 30 ++++++++++++++++++++++++++
|
||||||
|
- web/account/app/login/page.tsx | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/page.tsx | 5 +++++
|
||||||
|
- web/account/app/password-reset/complete/page.tsx | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/password-reset/request/page.tsx | 53 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/app/profile/page.tsx | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/lib/api.ts | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- web/account/next.config.mjs | 7 +++++++
|
||||||
|
- web/account/package.json | 22 +++++++++++++++++++
|
||||||
|
- web/account/tsconfig.json | 21 +++++++++++++++++++
|
||||||
|
|
||||||
|
---
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ func main() {
|
|||||||
registry := tenant.NewRegistry(registryPool)
|
registry := tenant.NewRegistry(registryPool)
|
||||||
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
provisioner := tenant.NewProvisioner(adminPool, registry, cfg.TenantDSNTemplate)
|
||||||
tenantHandler := tenant.NewHandler(provisioner)
|
tenantHandler := tenant.NewHandler(provisioner)
|
||||||
onboardingService := tenant.NewOnboardingService(provisioner, cfg.TenantSchemaPath)
|
|
||||||
onboardingHandler := tenant.NewOnboardingHandler(onboardingService)
|
|
||||||
|
|
||||||
// Superadmin-Konten leben mandantenuebergreifend in der Registry-DB.
|
// Superadmin-Konten leben mandantenuebergreifend in der Registry-DB.
|
||||||
// Tenant-User-CRUD (user.TenantUserStore) braucht Connection-Routing pro
|
// Tenant-User-CRUD (user.TenantUserStore) braucht Connection-Routing pro
|
||||||
@@ -50,7 +48,6 @@ func main() {
|
|||||||
})
|
})
|
||||||
// Vorlaeufige Pfade ohne Versionierung/Auth — werden mit API-01/IAM-02 abgeloest.
|
// Vorlaeufige Pfade ohne Versionierung/Auth — werden mit API-01/IAM-02 abgeloest.
|
||||||
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
mux.HandleFunc("/internal/tenants", tenantHandler.CreateTenant)
|
||||||
mux.HandleFunc("/internal/tenants/onboard", onboardingHandler.Onboard)
|
|
||||||
mux.HandleFunc("/internal/superadmins", userHandler.CreateSuperadmin)
|
mux.HandleFunc("/internal/superadmins", userHandler.CreateSuperadmin)
|
||||||
|
|
||||||
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
log.Printf("nexarch-core listening on %s", cfg.ListenAddr)
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
// tenantadmin-devserver stellt das TEN-05-Backend-API (internal/tenantadmin)
|
|
||||||
// fuer die Next.js-Tenant-Verwaltungsoberflaeche bereit. Getrennt von
|
|
||||||
// cmd/core aus demselben Grund wie cmd/licadmin-devserver (siehe LIC-04):
|
|
||||||
// echte Auth (IAM-01/IAM-02) ist noch nicht in die zentrale Server-Topologie
|
|
||||||
// verdrahtet, dieser Server dient Entwicklung/Betrieb der Oberflaeche gegen
|
|
||||||
// eine echte Datenbank, ohne cmd/core anzufassen.
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"log"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/db"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenantadmin"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenantsettings"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
dsn := os.Getenv("NEXARCH_REGISTRY_DSN")
|
|
||||||
if dsn == "" {
|
|
||||||
log.Fatal("NEXARCH_REGISTRY_DSN nicht gesetzt")
|
|
||||||
}
|
|
||||||
addr := os.Getenv("NEXARCH_TENANTADMIN_LISTEN_ADDR")
|
|
||||||
if addr == "" {
|
|
||||||
addr = ":8082"
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.Background()
|
|
||||||
pool, err := db.Connect(ctx, dsn)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("db: %v", err)
|
|
||||||
}
|
|
||||||
defer pool.Close()
|
|
||||||
|
|
||||||
registry := tenant.NewRegistry(pool)
|
|
||||||
lifecycle := tenant.NewLifecycle(registry, pool)
|
|
||||||
settingsStore := tenantsettings.NewStore(pool)
|
|
||||||
superadmins := user.NewSuperadminStore(pool)
|
|
||||||
handler := tenantadmin.NewHandler(registry, lifecycle, settingsStore, superadmins)
|
|
||||||
|
|
||||||
mux := http.NewServeMux()
|
|
||||||
mux.HandleFunc("/admin/tenants", withCORS(handler.ListTenantsHandler))
|
|
||||||
mux.HandleFunc("/admin/tenants/detail", withCORS(handler.TenantDetailHandler))
|
|
||||||
mux.HandleFunc("/admin/tenants/settings", withCORS(handler.UpdateSettingsHandler))
|
|
||||||
mux.HandleFunc("/admin/tenants/lifecycle", withCORS(handler.LifecycleActionHandler))
|
|
||||||
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
|
||||||
|
|
||||||
log.Printf("tenantadmin-devserver listening on %s", addr)
|
|
||||||
log.Fatal(http.ListenAndServe(addr, mux))
|
|
||||||
}
|
|
||||||
|
|
||||||
func withCORS(next http.HandlerFunc) http.HandlerFunc {
|
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
|
|
||||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
next(w, r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,13 +2,16 @@ module gitea.perlbach24.de/scripte/nexarch
|
|||||||
|
|
||||||
go 1.22
|
go 1.22
|
||||||
|
|
||||||
require github.com/jackc/pgx/v5 v5.6.0
|
require (
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||||
|
github.com/jackc/pgx/v5 v5.6.0
|
||||||
|
golang.org/x/crypto v0.17.0
|
||||||
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
|
||||||
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
github.com/jackc/puddle/v2 v2.2.1 // indirect
|
||||||
golang.org/x/crypto v0.17.0 // indirect
|
|
||||||
golang.org/x/sync v0.1.0 // indirect
|
golang.org/x/sync v0.1.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.14.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangePasswordHandler stellt die Passwortaenderung fuer den bereits
|
||||||
|
// angemeldeten Benutzer bereit (IAM-08 Akzeptanzkriterium 2). Getrennt von
|
||||||
|
// Handler (Login/Logout), weil hier zusaetzlich der TenantUserStore fuer das
|
||||||
|
// Aktualisieren des Hashes gebraucht wird.
|
||||||
|
type ChangePasswordHandler struct {
|
||||||
|
users *user.TenantUserStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewChangePasswordHandler(users *user.TenantUserStore) *ChangePasswordHandler {
|
||||||
|
return &ChangePasswordHandler{users: users}
|
||||||
|
}
|
||||||
|
|
||||||
|
type changePasswordRequest struct {
|
||||||
|
CurrentPassword string `json:"current_password"`
|
||||||
|
NewPassword string `json:"new_password"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangePassword verlangt das aktuelle Passwort, bevor ein neues gesetzt wird
|
||||||
|
// — ohne diese Pruefung koennte ein gekapertes, noch gueltiges Session-Cookie
|
||||||
|
// allein zur vollstaendigen Kontoübernahme reichen (Passwort setzen, alte
|
||||||
|
// Session unbrauchbar machen). Muss hinter RequireAuth haengen.
|
||||||
|
func (h *ChangePasswordHandler) ChangePassword(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req changePasswordRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := h.users.GetByIDForAuth(r.Context(), claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Aktuelles Passwort oder neues Passwort ungültig.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !VerifyPassword(creds.PasswordHash, req.CurrentPassword) {
|
||||||
|
http.Error(w, "Aktuelles Passwort oder neues Passwort ungültig.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
newHash, err := HashPassword(req.NewPassword)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Aktuelles Passwort oder neues Passwort ungültig.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.users.SetPasswordHash(r.Context(), claims.UserID, newHash); err != nil {
|
||||||
|
http.Error(w, "Passwort konnte nicht gespeichert werden.", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2: Passwortaenderung verlangt das aktuelle Passwort.
|
||||||
|
func TestChangePassword_RequiresCurrentPassword(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "changepw_test_wrong")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
u := createUserWithPassword(t, store, "nutzer@example.com", "altes-passwort")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-session-secret")
|
||||||
|
sessionToken, err := issuer.Issue(u.ID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewChangePasswordHandler(store)
|
||||||
|
body, _ := json.Marshal(map[string]string{"current_password": "falsches-altes-passwort", "new_password": "neues-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/account/change-password", bytes.NewReader(body))
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: sessionToken})
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
RequireAuth(issuer, h.ChangePassword)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusBadRequest {
|
||||||
|
t.Fatalf("status = %d, want 400 (falsches aktuelles passwort)", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := store.GetByIDForAuth(req.Context(), u.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("credentials laden: %v", err)
|
||||||
|
}
|
||||||
|
if !VerifyPassword(creds.PasswordHash, "altes-passwort") {
|
||||||
|
t.Fatal("passwort haette NICHT geaendert werden duerfen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChangePassword_SucceedsWithCorrectCurrentPassword(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "changepw_test_ok")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
u := createUserWithPassword(t, store, "nutzer2@example.com", "altes-passwort")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-session-secret")
|
||||||
|
sessionToken, err := issuer.Issue(u.ID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewChangePasswordHandler(store)
|
||||||
|
body, _ := json.Marshal(map[string]string{"current_password": "altes-passwort", "new_password": "neues-sicheres-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/account/change-password", bytes.NewReader(body))
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: sessionToken})
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
RequireAuth(issuer, h.ChangePassword)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := store.GetByIDForAuth(req.Context(), u.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("credentials laden: %v", err)
|
||||||
|
}
|
||||||
|
if !VerifyPassword(creds.PasswordHash, "neues-sicheres-passwort") {
|
||||||
|
t.Fatal("neues passwort wurde nicht uebernommen")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt Login/Logout als HTTP-Endpunkte bereit. Registrierung,
|
||||||
|
// Passwort-Reset, 2FA, SSO/LDAP und Rate-Limiting sind ausdruecklich nicht
|
||||||
|
// Teil dieser Kachel (siehe IAM-03..07).
|
||||||
|
type Handler struct {
|
||||||
|
login *LoginService
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(login *LoginService) *Handler {
|
||||||
|
return &Handler{login: login}
|
||||||
|
}
|
||||||
|
|
||||||
|
type loginRequest struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req loginRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := h.login.Login(r.Context(), req.Email, req.Password)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, ErrInvalidCredentials.Error(), http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: CookieName,
|
||||||
|
Value: token,
|
||||||
|
Path: "/",
|
||||||
|
HttpOnly: true,
|
||||||
|
Secure: true,
|
||||||
|
SameSite: http.SameSiteStrictMode,
|
||||||
|
MaxAge: int(AccessTokenTTL.Seconds()),
|
||||||
|
})
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logout loescht das Session-Cookie. Da JWT hier bewusst zustandslos bleibt
|
||||||
|
// (kein serverseitiger Blocklist-Speicher — das waere ueber "Grundgerüst"
|
||||||
|
// hinaus und widerspraeche der projektweiten zustandslosen-JWT-Entscheidung),
|
||||||
|
// bleibt ein bereits ausgestelltes Token bis zu seinem Ablauf technisch
|
||||||
|
// gueltig, wenn es separat vom Cookie extrahiert und wiederverwendet wird.
|
||||||
|
func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: CookieName,
|
||||||
|
Value: "",
|
||||||
|
Path: "/",
|
||||||
|
HttpOnly: true,
|
||||||
|
Secure: true,
|
||||||
|
SameSite: http.SameSiteStrictMode,
|
||||||
|
MaxAge: -1,
|
||||||
|
Expires: time.Unix(0, 0),
|
||||||
|
})
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrInvalidCredentials = errors.New("auth: E-Mail oder Passwort falsch")
|
||||||
|
|
||||||
|
// LoginService arbeitet gegen GENAU EINE Tenant-Datenbank (uebergeben ueber
|
||||||
|
// den TenantUserStore-Pool) — das Login ist damit strukturell auf den
|
||||||
|
// richtigen Tenant gescopt, siehe user.TenantUserStore.GetByEmailForAuth.
|
||||||
|
type LoginService struct {
|
||||||
|
users *user.TenantUserStore
|
||||||
|
issuer *TokenIssuer
|
||||||
|
// tenantSlug identifiziert im ausgestellten Token, gegen welchen Mandanten
|
||||||
|
// eingeloggt wurde (fuer nachgelagerte Pruefungen, z.B. Middleware-Logs).
|
||||||
|
tenantSlug string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLoginService(users *user.TenantUserStore, issuer *TokenIssuer, tenantSlug string) *LoginService {
|
||||||
|
return &LoginService{users: users, issuer: issuer, tenantSlug: tenantSlug}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Login liefert bei falscher E-Mail UND bei falschem Passwort denselben
|
||||||
|
// Fehler (ErrInvalidCredentials), um keine Rueckschluesse auf die Existenz
|
||||||
|
// eines Kontos zuzulassen (User-Enumeration-Schutz).
|
||||||
|
func (s *LoginService) Login(ctx context.Context, email, password string) (string, error) {
|
||||||
|
creds, err := s.users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
// Trotzdem einen bcrypt-Vergleich gegen einen Dummy-Hash ausfuehren,
|
||||||
|
// damit die Antwortzeit bei unbekannter E-Mail nicht messbar kuerzer
|
||||||
|
// ist als bei falschem Passwort (Timing-Seitenkanal).
|
||||||
|
VerifyPassword(dummyHash, password)
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
if creds.User.Status != user.StatusActive {
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
if !VerifyPassword(creds.PasswordHash, password) {
|
||||||
|
return "", ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.issuer.Issue(creds.User.ID, s.tenantSlug)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dummyHash ist ein echter bcrypt-Hash (Kostenfaktor BcryptCost) eines
|
||||||
|
// beliebigen Platzhalter-Klartexts — bewusst KEIN kaputtes Format, da
|
||||||
|
// bcrypt.CompareHashAndPassword bei ungueltigem Hash sofort ohne den
|
||||||
|
// eigentlichen Kostenfaktor-Vergleich zurueckkehrt und die
|
||||||
|
// Timing-Angleichung damit wirkungslos waere.
|
||||||
|
const dummyHash = "$2a$12$cmwiETrG9DK5/uTM2fg4uetngYUspKjME5P8fNpk0QYTaO64N0r3C"
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
const usersSchema = `
|
||||||
|
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',
|
||||||
|
password_hash TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);`
|
||||||
|
|
||||||
|
func setupTenantDB(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, usersSchema); 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 createUserWithPassword(t *testing.T, store *user.TenantUserStore, email, password string) user.User {
|
||||||
|
t.Helper()
|
||||||
|
ctx := context.Background()
|
||||||
|
u, err := store.Create(ctx, email, "Test User")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create user: %v", err)
|
||||||
|
}
|
||||||
|
hash, err := HashPassword(password)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash password: %v", err)
|
||||||
|
}
|
||||||
|
if err := store.SetPasswordHash(ctx, u.ID, hash); err != nil {
|
||||||
|
t.Fatalf("set password: %v", err)
|
||||||
|
}
|
||||||
|
return u
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoginService_SuccessAndWrongPassword(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "test_iam02_login")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
createUserWithPassword(t, store, "alice@example.com", "korrektes-passwort")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
login := NewLoginService(store, issuer, "acme")
|
||||||
|
|
||||||
|
token, err := login.Login(context.Background(), "alice@example.com", "korrektes-passwort")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("login: %v", err)
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
t.Fatal("erwartet nicht-leeres token")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := login.Login(context.Background(), "alice@example.com", "falsches-passwort"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := login.Login(context.Background(), "unbekannt@example.com", "irgendwas"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials bei unbekannter email, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 1: kein Cross-Tenant-Login moeglich, obwohl dieselbe E-Mail in
|
||||||
|
// zwei unterschiedlichen Tenant-Datenbanken mit unterschiedlichen Passwoertern
|
||||||
|
// existiert.
|
||||||
|
func TestLoginService_NoCrossTenantLogin(t *testing.T) {
|
||||||
|
poolA := setupTenantDB(t, "test_iam02_tenant_a")
|
||||||
|
poolB := setupTenantDB(t, "test_iam02_tenant_b")
|
||||||
|
|
||||||
|
storeA := user.NewTenantUserStore(poolA)
|
||||||
|
storeB := user.NewTenantUserStore(poolB)
|
||||||
|
createUserWithPassword(t, storeA, "shared@example.com", "passwort-tenant-a")
|
||||||
|
createUserWithPassword(t, storeB, "shared@example.com", "passwort-tenant-b")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
loginA := NewLoginService(storeA, issuer, "tenant-a")
|
||||||
|
|
||||||
|
// Login gegen Tenant A mit dem Passwort von Tenant B darf nicht klappen,
|
||||||
|
// obwohl die E-Mail-Adresse identisch ist — die Store-Instanz kennt
|
||||||
|
// strukturell nur die Zeilen ihrer eigenen Datenbank.
|
||||||
|
if _, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-b"); !errors.Is(err, ErrInvalidCredentials) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidCredentials fuer fremdes tenant-passwort, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := loginA.Login(context.Background(), "shared@example.com", "passwort-tenant-a")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("login gegen eigenen tenant sollte klappen: %v", err)
|
||||||
|
}
|
||||||
|
claims, err := issuer.Verify(token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.TenantSlug != "tenant-a" {
|
||||||
|
t.Fatalf("token tenant = %q, want tenant-a", claims.TenantSlug)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: geschuetzte Route ohne gueltige Session nicht erreichbar.
|
||||||
|
func TestRequireAuth_BlocksWithoutValidCookie(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
protected := RequireAuth(issuer, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Kein Cookie.
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("ohne cookie: status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Manipuliertes Cookie.
|
||||||
|
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: "kaputt.token.hier"})
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("mit kaputtem cookie: status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gueltiges Token.
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
req = httptest.NewRequest(http.MethodGet, "/geschuetzt", nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: token})
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
protected(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("mit gueltigem cookie: status = %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
const CookieName = "nexarch_session"
|
||||||
|
|
||||||
|
type contextKey int
|
||||||
|
|
||||||
|
const claimsContextKey contextKey = iota
|
||||||
|
|
||||||
|
// RequireAuth schuetzt eine Route: ohne gueltiges, nicht abgelaufenes Token
|
||||||
|
// im Session-Cookie wird 401 zurueckgegeben und der Handler nicht aufgerufen
|
||||||
|
// (IAM-02 Akzeptanzkriterium 3).
|
||||||
|
func RequireAuth(issuer *TokenIssuer, next http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
cookie, err := r.Cookie(CookieName)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := issuer.Verify(cookie.Value)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.WithValue(r.Context(), claimsContextKey, claims)
|
||||||
|
next(w, r.WithContext(ctx))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClaimsFromContext liest die Claims, die RequireAuth in den Request-Context
|
||||||
|
// gelegt hat.
|
||||||
|
func ClaimsFromContext(ctx context.Context) (*Claims, bool) {
|
||||||
|
c, ok := ctx.Value(claimsContextKey).(*Claims)
|
||||||
|
return c, ok
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Package auth implementiert Core IAM-02: Login/Logout, Passwort-Hashing und
|
||||||
|
// die Middleware zum Schutz von Routen. Autorisierung (was ein Benutzer darf)
|
||||||
|
// ist ausdruecklich NICHT Teil dieses Pakets, siehe RBAC-01 — auth prueft nur
|
||||||
|
// "wer bin ich" (Casbin-Architekturprinzip, siehe IAM-02-Ticket).
|
||||||
|
package auth
|
||||||
|
|
||||||
|
import "golang.org/x/crypto/bcrypt"
|
||||||
|
|
||||||
|
// BcryptCost ist bewusst explizit festgelegt statt bcrypt.DefaultCost (10)
|
||||||
|
// unreflektiert zu uebernehmen (IAM-02 Akzeptanzkriterium 4). Kostenfaktor 12
|
||||||
|
// wurde gegen die Ziel-Login-Latenz benchmarkt, siehe password_bench_test.go
|
||||||
|
// und den Pruefungs-Eintrag in der Commit-Nachricht.
|
||||||
|
const BcryptCost = 12
|
||||||
|
|
||||||
|
func HashPassword(plain string) (string, error) {
|
||||||
|
hash, err := bcrypt.GenerateFromPassword([]byte(plain), BcryptCost)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(hash), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// VerifyPassword ist timing-safe: bcrypt.CompareHashAndPassword vergleicht
|
||||||
|
// konstant in der Zeit bzgl. des Hash-Inhalts (Referenzimplementierung fuer
|
||||||
|
// die projektweite Timing-safe-Vergleich-Konvention aus IAM-02).
|
||||||
|
func VerifyPassword(hash, plain string) bool {
|
||||||
|
return bcrypt.CompareHashAndPassword([]byte(hash), []byte(plain)) == nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TargetLoginLatency ist der Zielwert aus IAM-02 Akzeptanzkriterium 4: der
|
||||||
|
// bcrypt-Vergleich allein darf die Login-Latenz nicht dominieren. 400ms ist
|
||||||
|
// grosszuegig genug, um auf unterschiedlicher Hardware stabil zu sein, aber
|
||||||
|
// eng genug, um eine versehentliche Kostenfaktor-Explosion (z.B. 16 statt 12)
|
||||||
|
// zuverlaessig aufzudecken.
|
||||||
|
const TargetLoginLatency = 400 * time.Millisecond
|
||||||
|
|
||||||
|
// TestBcryptCostAgainstLatencyTarget misst die tatsaechliche Dauer eines
|
||||||
|
// Passwort-Vergleichs mit dem festgelegten BcryptCost und dokumentiert das
|
||||||
|
// Ergebnis (IAM-02 Pruefung 4).
|
||||||
|
func TestBcryptCostAgainstLatencyTarget(t *testing.T) {
|
||||||
|
hash, err := HashPassword("benchmark-passwort")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
if !VerifyPassword(hash, "benchmark-passwort") {
|
||||||
|
t.Fatal("verifikation haette erfolgreich sein muessen")
|
||||||
|
}
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
|
||||||
|
t.Logf("bcrypt-vergleich mit cost=%d dauerte %s (ziel: unter %s)", BcryptCost, elapsed, TargetLoginLatency)
|
||||||
|
if elapsed > TargetLoginLatency {
|
||||||
|
t.Fatalf("bcrypt-vergleich zu langsam: %s > ziel %s", elapsed, TargetLoginLatency)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func BenchmarkVerifyPassword(b *testing.B) {
|
||||||
|
hash, _ := HashPassword("benchmark-passwort")
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
VerifyPassword(hash, "benchmark-passwort")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestHashAndVerifyPassword(t *testing.T) {
|
||||||
|
hash, err := HashPassword("s3hr-geheim!")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash: %v", err)
|
||||||
|
}
|
||||||
|
if hash == "s3hr-geheim!" {
|
||||||
|
t.Fatal("passwort wurde nicht gehasht")
|
||||||
|
}
|
||||||
|
if !VerifyPassword(hash, "s3hr-geheim!") {
|
||||||
|
t.Fatal("erwartet erfolgreiche verifikation")
|
||||||
|
}
|
||||||
|
if VerifyPassword(hash, "falsches-passwort") {
|
||||||
|
t.Fatal("erwartet fehlgeschlagene verifikation")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDummyHashIsValidBcryptHash(t *testing.T) {
|
||||||
|
// Stellt sicher, dass der Timing-Angleichs-Hash in login.go tatsaechlich
|
||||||
|
// ein gueltiges bcrypt-Format hat und den vollen Kostenfaktor durchlaeuft
|
||||||
|
// (siehe Kommentar dort) statt sofort mit einem Format-Fehler abzubrechen.
|
||||||
|
if VerifyPassword(dummyHash, "irgendein-text") {
|
||||||
|
t.Fatal("dummyHash sollte fuer beliebigen text nicht passen")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ProfileHandler liefert die eigenen Stammdaten fuer die Profilseite
|
||||||
|
// (IAM-08). Getrennt von ChangePasswordHandler, da unterschiedliche
|
||||||
|
// Lesbarkeitsanforderungen (nur GET, kein Nebeneffekt).
|
||||||
|
type ProfileHandler struct {
|
||||||
|
users *user.TenantUserStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewProfileHandler(users *user.TenantUserStore) *ProfileHandler {
|
||||||
|
return &ProfileHandler{users: users}
|
||||||
|
}
|
||||||
|
|
||||||
|
type meResponse struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Me liefert die Stammdaten des angemeldeten Benutzers. Muss hinter
|
||||||
|
// RequireAuth haengen.
|
||||||
|
func (h *ProfileHandler) Me(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := h.users.Get(r.Context(), claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "benutzer nicht gefunden", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(meResponse{ID: u.ID, Email: u.Email, Name: u.Name})
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestProfileMe_ReturnsOwnData(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "profile_test_me")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
u := createUserWithPassword(t, store, "profil@example.com", "irgendein-passwort")
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-session-secret")
|
||||||
|
sessionToken, err := issuer.Issue(u.ID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewProfileHandler(store)
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/account/me", nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: CookieName, Value: sessionToken})
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
RequireAuth(issuer, h.Me)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestProfileMe_RejectsWithoutSession(t *testing.T) {
|
||||||
|
pool := setupTenantDB(t, "profile_test_noauth")
|
||||||
|
store := user.NewTenantUserStore(pool)
|
||||||
|
|
||||||
|
issuer := NewTokenIssuer("test-session-secret")
|
||||||
|
h := NewProfileHandler(store)
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/account/me", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
RequireAuth(issuer, h.Me)(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("status = %d, want 401 ohne session-cookie", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AccessTokenTTL ist bewusst kurz gehalten (Session-Ablauf statt langlebiger
|
||||||
|
// Tokens), passend zur "so vertrauenswuerdig wie noetig"-Produkt-DNA.
|
||||||
|
const AccessTokenTTL = 30 * time.Minute
|
||||||
|
|
||||||
|
var ErrInvalidToken = errors.New("auth: ungueltiges oder abgelaufenes token")
|
||||||
|
|
||||||
|
type Claims struct {
|
||||||
|
UserID string `json:"uid"`
|
||||||
|
TenantSlug string `json:"tenant"`
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// TokenIssuer signiert/verifiziert JWTs mit einem HMAC-Secret. Das
|
||||||
|
// asymmetrische Core-weite Signaturschema (API-05, kid-Rotation) ist
|
||||||
|
// ausdruecklich nicht Teil dieser Kachel — hier geht es nur um das
|
||||||
|
// Login-Grundgerüst innerhalb eines einzelnen Core-Prozesses.
|
||||||
|
type TokenIssuer struct {
|
||||||
|
secret []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTokenIssuer(secret string) *TokenIssuer {
|
||||||
|
return &TokenIssuer{secret: []byte(secret)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *TokenIssuer) Issue(userID, tenantSlug string) (string, error) {
|
||||||
|
now := time.Now()
|
||||||
|
claims := Claims{
|
||||||
|
UserID: userID,
|
||||||
|
TenantSlug: tenantSlug,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(now.Add(AccessTokenTTL)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||||
|
return token.SignedString(i.secret)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft Signatur UND Ablauf (jwt.ParseWithClaims lehnt abgelaufene
|
||||||
|
// Tokens automatisch ab) — der Signaturvergleich in golang-jwt ist
|
||||||
|
// timing-safe (hmac.Equal).
|
||||||
|
func (i *TokenIssuer) Verify(tokenString string) (*Claims, error) {
|
||||||
|
claims := &Claims{}
|
||||||
|
token, err := jwt.ParseWithClaims(tokenString, claims, func(t *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return i.secret, nil
|
||||||
|
})
|
||||||
|
if err != nil || !token.Valid {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestTokenIssueAndVerify(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := issuer.Verify(token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.UserID != "user-1" || claims.TenantSlug != "acme" {
|
||||||
|
t.Fatalf("claims unerwartet: %+v", claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 2: Token-Manipulationstest.
|
||||||
|
func TestTokenVerify_RejectsManipulatedPayload(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.Split(token, ".")
|
||||||
|
if len(parts) != 3 {
|
||||||
|
t.Fatalf("unerwartetes token-format: %d teile", len(parts))
|
||||||
|
}
|
||||||
|
// Payload-Segment leicht veraendern (Signatur passt danach nicht mehr).
|
||||||
|
tampered := parts[0] + "." + parts[1] + "x" + "." + parts[2]
|
||||||
|
|
||||||
|
if _, err := issuer.Verify(tampered); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei manipuliertem token, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTokenVerify_RejectsWrongSecret(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("secret-a")
|
||||||
|
other := NewTokenIssuer("secret-b")
|
||||||
|
|
||||||
|
token, err := issuer.Issue("user-1", "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := other.Verify(token); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei falschem secret, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 3: abgelaufenes Token erzwingt Neuanmeldung.
|
||||||
|
func TestTokenVerify_RejectsExpiredToken(t *testing.T) {
|
||||||
|
issuer := NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
|
||||||
|
claims := Claims{
|
||||||
|
UserID: "user-1",
|
||||||
|
TenantSlug: "acme",
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(time.Now().Add(-2 * AccessTokenTTL)),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(time.Now().Add(-time.Minute)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||||
|
expired, err := tok.SignedString([]byte("test-secret-nur-fuer-tests"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("signieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := issuer.Verify(expired); err == nil {
|
||||||
|
t.Fatal("erwartet fehler bei abgelaufenem token, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package authtoken
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompletePasswordReset loest ein Reset-Token ein und setzt das neue
|
||||||
|
// Passwort — komplett OHNE bestehende Session (Akzeptanzkriterium 2 gilt
|
||||||
|
// analog fuer Reset wie fuer Invite: der Vorgang ersetzt eine Anmeldung).
|
||||||
|
func CompletePasswordReset(ctx context.Context, tokens *Store, users *user.TenantUserStore, token, newPassword string) error {
|
||||||
|
return completeWithToken(ctx, tokens, users, token, PurposeReset, newPassword)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteInvitation loest ein Einladungs-Token ein und setzt das
|
||||||
|
// Erstpasswort eines neu angelegten Benutzers — ohne bestehende Session
|
||||||
|
// (Akzeptanzkriterium 2).
|
||||||
|
func CompleteInvitation(ctx context.Context, tokens *Store, users *user.TenantUserStore, token, initialPassword string) error {
|
||||||
|
return completeWithToken(ctx, tokens, users, token, PurposeInvite, initialPassword)
|
||||||
|
}
|
||||||
|
|
||||||
|
func completeWithToken(ctx context.Context, tokens *Store, users *user.TenantUserStore, token string, purpose Purpose, newPassword string) error {
|
||||||
|
userID, err := tokens.Consume(ctx, token, purpose)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
hash, err := auth.HashPassword(newPassword)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("passwort hashen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := users.SetPasswordHash(ctx, userID, hash); err != nil {
|
||||||
|
return fmt.Errorf("passwort setzen: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package authtoken
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ResetTokenTTL: 1 Stunde ist der uebliche Kompromiss zwischen Nutzbarkeit
|
||||||
|
// und Angriffsflaeche fuer Passwort-Reset-Links.
|
||||||
|
const ResetTokenTTL = time.Hour
|
||||||
|
|
||||||
|
// Notifier verschickt das Reset-Token an den Benutzer. Core CFG-02
|
||||||
|
// (Benachrichtigungs-Dispatcher) ist noch nicht in diesem Branch verfuegbar
|
||||||
|
// (siehe SICHERHEITSKONZEPT.md / Core-Board-Konvention: Versand laeuft
|
||||||
|
// grundsaetzlich ueber CFG-02, kein eigener E-Mail-Versand je Modul) — bis
|
||||||
|
// zur Anbindung protokolliert LogNotifier den Vorgang nur, statt eine E-Mail
|
||||||
|
// zu verschicken. Produktionsreif ist erst der Austausch gegen einen
|
||||||
|
// CFG-02-Client, keine neue eigene Versandlogik hier.
|
||||||
|
type Notifier interface {
|
||||||
|
NotifyPasswordReset(ctx context.Context, email, token string) error
|
||||||
|
}
|
||||||
|
|
||||||
|
type LogNotifier struct{}
|
||||||
|
|
||||||
|
func (LogNotifier) NotifyPasswordReset(_ context.Context, email, _ string) error {
|
||||||
|
// Token wird bewusst NICHT geloggt (gleiche Regel wie Store.Create).
|
||||||
|
slog.Info("passwort-reset angefordert (kein CFG-02 in diesem branch, nur protokolliert)", "email_domain_hint", domainHint(email))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func domainHint(email string) string {
|
||||||
|
for i := len(email) - 1; i >= 0; i-- {
|
||||||
|
if email[i] == '@' {
|
||||||
|
return email[i:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler stellt Passwort-Reset als HTTP-Endpunkte bereit (IAM-08).
|
||||||
|
type Handler struct {
|
||||||
|
tokens *Store
|
||||||
|
users *user.TenantUserStore
|
||||||
|
notifier Notifier
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(tokens *Store, users *user.TenantUserStore, notifier Notifier) *Handler {
|
||||||
|
if notifier == nil {
|
||||||
|
notifier = LogNotifier{}
|
||||||
|
}
|
||||||
|
return &Handler{tokens: tokens, users: users, notifier: notifier}
|
||||||
|
}
|
||||||
|
|
||||||
|
type requestResetRequest struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequestReset liefert IMMER dieselbe Erfolgsmeldung, unabhaengig davon, ob
|
||||||
|
// die E-Mail-Adresse existiert (Akzeptanzkriterium 3 / Pruefung 1,
|
||||||
|
// User-Enumeration-Schutz — gleiches Prinzip wie auth.LoginService.Login).
|
||||||
|
func (h *Handler) RequestReset(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req requestResetRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Absichtlich: Fehler (unbekannte E-Mail) fuehrt NICHT zu einer anderen
|
||||||
|
// HTTP-Antwort als der Erfolgsfall — nur der interne Pfad unterscheidet sich.
|
||||||
|
creds, err := h.users.GetByEmailForAuth(r.Context(), req.Email)
|
||||||
|
if err == nil {
|
||||||
|
token, tokenErr := h.tokens.Create(r.Context(), creds.User.ID, PurposeReset, ResetTokenTTL)
|
||||||
|
if tokenErr == nil {
|
||||||
|
_ = h.notifier.NotifyPasswordReset(r.Context(), req.Email, token)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_ = json.NewEncoder(w).Encode(map[string]string{
|
||||||
|
"message": "Falls ein Konto mit dieser E-Mail-Adresse existiert, wurde eine Nachricht mit weiteren Schritten verschickt.",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
type completeResetRequest struct {
|
||||||
|
Token string `json:"token"`
|
||||||
|
NewPassword string `json:"new_password"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteReset schliesst den Reset ab (Akzeptanzkriterium 3: generische
|
||||||
|
// Fehlermeldung bei ungueltigem/abgelaufenem Token, siehe ErrInvalidToken).
|
||||||
|
func (h *Handler) CompleteReset(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req completeResetRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := CompletePasswordReset(r.Context(), h.tokens, h.users, req.Token, req.NewPassword); err != nil {
|
||||||
|
http.Error(w, "Link ungültig oder abgelaufen.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package authtoken
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeNotifier zeichnet auf, ob/mit welchem Token benachrichtigt wurde —
|
||||||
|
// ersetzt LogNotifier im Test, damit der Test pruefen kann, OB ein Token
|
||||||
|
// erzeugt wurde, ohne die HTTP-Antwort danach zu unterscheiden
|
||||||
|
// (Akzeptanzkriterium 3: die Antwort selbst bleibt in beiden Faellen gleich).
|
||||||
|
type fakeNotifier struct {
|
||||||
|
calls []string // e-mail-adressen, fuer die notifiziert wurde
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeNotifier) NotifyPasswordReset(_ context.Context, email, _ string) error {
|
||||||
|
f.calls = append(f.calls, email)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 1: Antwort ist IDENTISCH, egal ob die
|
||||||
|
// E-Mail-Adresse existiert — nur intern (Notifier-Aufruf) unterscheidet sich.
|
||||||
|
func TestRequestReset_SameResponseRegardlessOfExistence(t *testing.T) {
|
||||||
|
tokens, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
_ = userID
|
||||||
|
|
||||||
|
u, err := users.Get(context.Background(), userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("benutzer laden: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
notifier := &fakeNotifier{}
|
||||||
|
h := NewHandler(tokens, users, notifier)
|
||||||
|
|
||||||
|
// Fall 1: existierende E-Mail.
|
||||||
|
body1, _ := json.Marshal(requestResetRequest{Email: u.Email})
|
||||||
|
req1 := httptest.NewRequest(http.MethodPost, "/auth/password-reset/request", bytes.NewReader(body1))
|
||||||
|
rec1 := httptest.NewRecorder()
|
||||||
|
h.RequestReset(rec1, req1)
|
||||||
|
|
||||||
|
// Fall 2: nicht existierende E-Mail.
|
||||||
|
body2, _ := json.Marshal(requestResetRequest{Email: "gibt-es-nicht@example.com"})
|
||||||
|
req2 := httptest.NewRequest(http.MethodPost, "/auth/password-reset/request", bytes.NewReader(body2))
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.RequestReset(rec2, req2)
|
||||||
|
|
||||||
|
if rec1.Code != rec2.Code {
|
||||||
|
t.Fatalf("status codes unterscheiden sich: %d vs %d — verraet Konto-Existenz", rec1.Code, rec2.Code)
|
||||||
|
}
|
||||||
|
if rec1.Body.String() != rec2.Body.String() {
|
||||||
|
t.Fatalf("antwort-body unterscheidet sich: %q vs %q — verraet Konto-Existenz", rec1.Body.String(), rec2.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Intern wurde aber nur fuer die existierende Adresse tatsaechlich benachrichtigt.
|
||||||
|
if len(notifier.calls) != 1 || notifier.calls[0] != u.Email {
|
||||||
|
t.Fatalf("erwartet genau 1 benachrichtigung fuer %q, habe %v", u.Email, notifier.calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3: vollstaendiger Reset-Flow ueber HTTP.
|
||||||
|
func TestCompleteReset_Works(t *testing.T) {
|
||||||
|
tokens, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
token, err := tokens.Create(ctx, userID, PurposeReset, ResetTokenTTL)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("token erzeugen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewHandler(tokens, users, &fakeNotifier{})
|
||||||
|
body, _ := json.Marshal(completeResetRequest{Token: token, NewPassword: "neues-sicheres-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/auth/password-reset/complete", bytes.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.CompleteReset(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Token ist jetzt verbraucht — zweiter Versuch schlaegt fehl.
|
||||||
|
body2, _ := json.Marshal(completeResetRequest{Token: token, NewPassword: "noch-ein-passwort"})
|
||||||
|
req2 := httptest.NewRequest(http.MethodPost, "/auth/password-reset/complete", bytes.NewReader(body2))
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.CompleteReset(rec2, req2)
|
||||||
|
if rec2.Code != http.StatusBadRequest {
|
||||||
|
t.Fatalf("wiederverwendung: status = %d, want 400", rec2.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
// Package authtoken implementiert Core IAM-03: einmal-verwendbare Tokens fuer
|
||||||
|
// Passwort-Reset und Einladung neuer Benutzer, mit Ablaufzeit — bewusst
|
||||||
|
// getrennt von internal/auth (Sessions/JWT), da es hier um einen
|
||||||
|
// vorgelagerten, session-losen Vorgang geht (Akzeptanzkriterium 2: Einladung
|
||||||
|
// setzt das Erstpasswort OHNE bestehende Session).
|
||||||
|
package authtoken
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Purpose string
|
||||||
|
|
||||||
|
const (
|
||||||
|
PurposeReset Purpose = "reset"
|
||||||
|
PurposeInvite Purpose = "invite"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrInvalidToken deckt sowohl unbekannte als auch bereits verwendete oder
|
||||||
|
// abgelaufene Tokens ab (Akzeptanzkriterium 3) — bewusst EIN Fehler, damit
|
||||||
|
// ein Angreifer aus der Antwort nicht ableiten kann, welcher der drei Faelle
|
||||||
|
// vorliegt.
|
||||||
|
var ErrInvalidToken = errors.New("authtoken: token ungueltig, bereits verwendet oder abgelaufen")
|
||||||
|
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create erzeugt ein neues Einmal-Token und liefert es NUR im Klartext an
|
||||||
|
// den Aufrufer zurueck (zum Versand per E-Mail, siehe IAM-08) — gespeichert
|
||||||
|
// wird ausschliesslich der Hash. Es wird niemals geloggt (Akzeptanzkriterium
|
||||||
|
// 3 / Pruefung 3): das Log-Statement unten enthaelt bewusst nur user_id und
|
||||||
|
// purpose, nicht token.
|
||||||
|
func (s *Store) Create(ctx context.Context, userID string, purpose Purpose, ttl time.Duration) (token string, err error) {
|
||||||
|
token, err = randomToken()
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("token erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
hash := hashToken(token)
|
||||||
|
expiresAt := time.Now().Add(ttl)
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO password_tokens (user_id, token_hash, purpose, expires_at)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
`, userID, hash, string(purpose), expiresAt)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("token speichern: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Info("passwort-token erzeugt", "user_id", userID, "purpose", purpose, "laeuft_ab", expiresAt)
|
||||||
|
return token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume loest ein Token ein: gueltig nur, wenn es existiert, noch nicht
|
||||||
|
// verwendet und nicht abgelaufen ist. Das Markieren als verwendet geschieht
|
||||||
|
// atomar ueber die WHERE-Klausel (used_at IS NULL) — zwei gleichzeitige
|
||||||
|
// Einloesungsversuche koennen sich nicht gegenseitig ueberholen
|
||||||
|
// (Akzeptanzkriterium 1 / Pruefung 1: nur EINE Einloesung gelingt).
|
||||||
|
func (s *Store) Consume(ctx context.Context, token string, purpose Purpose) (userID string, err error) {
|
||||||
|
hash := hashToken(token)
|
||||||
|
|
||||||
|
err = s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE password_tokens
|
||||||
|
SET used_at = now()
|
||||||
|
WHERE token_hash = $1 AND purpose = $2 AND used_at IS NULL AND expires_at > now()
|
||||||
|
RETURNING user_id
|
||||||
|
`, hash, string(purpose)).Scan(&userID)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
slog.Warn("token-einloesung abgewiesen", "purpose", purpose, "grund", "ungueltig, bereits verwendet oder abgelaufen")
|
||||||
|
return "", ErrInvalidToken
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("token einloesen: %w", err)
|
||||||
|
}
|
||||||
|
return userID, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func randomToken() (string, error) {
|
||||||
|
buf := make([]byte, 32)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(buf), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func hashToken(token string) []byte {
|
||||||
|
sum := sha256.Sum256([]byte(token))
|
||||||
|
return sum[:]
|
||||||
|
}
|
||||||
@@ -0,0 +1,187 @@
|
|||||||
|
package authtoken
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*Store, *user.TenantUserStore, string, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), email TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active', password_hash TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS password_tokens (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
token_hash BYTEA NOT NULL UNIQUE, purpose TEXT NOT NULL CHECK (purpose IN ('reset','invite')),
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL, used_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
userStore := user.NewTenantUserStore(pool)
|
||||||
|
email := fmt.Sprintf("reset-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
u, err := userStore.Create(ctx, email, "Reset Test")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("testuser anlegen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewStore(pool), userStore, u.ID, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: Wiederverwendung eines bereits
|
||||||
|
// eingeloesten Tokens wird abgewiesen.
|
||||||
|
func TestConsume_RejectsReuse(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
token, err := store.Create(ctx, userID, PurposeReset, time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
gotUserID, err := store.Consume(ctx, token, PurposeReset)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("erste einloesung: %v", err)
|
||||||
|
}
|
||||||
|
if gotUserID != userID {
|
||||||
|
t.Fatalf("user id = %q, want %q", gotUserID, userID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Consume(ctx, token, PurposeReset); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken bei zweiter einloesung, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + 3 + Pruefung 2: Ablaufzeit wird serverseitig
|
||||||
|
// durchgesetzt.
|
||||||
|
func TestConsume_RejectsExpiredToken(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
token, err := store.Create(ctx, userID, PurposeReset, -1*time.Second) // sofort abgelaufen
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := store.Consume(ctx, token, PurposeReset); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken bei abgelaufenem token, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsume_RejectsUnknownToken(t *testing.T) {
|
||||||
|
store, _, _, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if _, err := store.Consume(ctx, "niemals-ausgestelltes-token", PurposeReset); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsume_RejectsWrongPurpose(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
token, err := store.Create(ctx, userID, PurposeInvite, time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.Consume(ctx, token, PurposeReset); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken bei falschem purpose, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2: Einladungs-Link setzt das Erstpasswort ohne
|
||||||
|
// bestehende Session — der Ablauf braucht keinerlei Auth-Middleware/Cookie.
|
||||||
|
func TestCompleteInvitation_SetsPasswordWithoutSession(t *testing.T) {
|
||||||
|
store, userStore, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
token, err := store.Create(ctx, userID, PurposeInvite, time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := CompleteInvitation(ctx, store, userStore, token, "neues-erstpasswort-123"); err != nil {
|
||||||
|
t.Fatalf("complete invitation: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := userStore.Get(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("user lesen: %v", err)
|
||||||
|
}
|
||||||
|
creds, err := userStore.GetByEmailForAuth(ctx, u.Email)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("credentials lesen: %v", err)
|
||||||
|
}
|
||||||
|
if !auth.VerifyPassword(creds.PasswordHash, "neues-erstpasswort-123") {
|
||||||
|
t.Fatal("erwartet, dass das gesetzte erstpasswort verifizierbar ist")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Token ist danach verbraucht, kann nicht doppelt eingeloest werden.
|
||||||
|
if err := CompleteInvitation(ctx, store, userStore, token, "irgendwas"); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken bei erneuter einloesung, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Token werden nicht im Klartext geloggt.
|
||||||
|
func TestCreateAndConsume_NeverLogTokenPlaintext(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
prevLogger := slog.Default()
|
||||||
|
slog.SetDefault(slog.New(slog.NewTextHandler(&buf, nil)))
|
||||||
|
defer slog.SetDefault(prevLogger)
|
||||||
|
|
||||||
|
token, err := store.Create(ctx, userID, PurposeReset, time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.Consume(ctx, "falsches-token-zum-testen-des-log-pfads", PurposeReset); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("consume (ungueltig): %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.Consume(ctx, token, PurposeReset); err != nil {
|
||||||
|
t.Fatalf("consume (gueltig): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logOutput := buf.String()
|
||||||
|
if strings.Contains(logOutput, token) {
|
||||||
|
t.Fatalf("log enthaelt das klartext-token — verstoss gegen akzeptanzkriterium 3:\n%s", logOutput)
|
||||||
|
}
|
||||||
|
if logOutput == "" {
|
||||||
|
t.Fatal("erwartet ueberhaupt log-ausgabe fuer diesen stichprobentest")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,9 +19,6 @@ type Config struct {
|
|||||||
// TenantDSNTemplate enthaelt genau ein "%s" als Platzhalter fuer den
|
// TenantDSNTemplate enthaelt genau ein "%s" als Platzhalter fuer den
|
||||||
// Datenbanknamen einer neu provisionierten Tenant-Datenbank.
|
// Datenbanknamen einer neu provisionierten Tenant-Datenbank.
|
||||||
TenantDSNTemplate string
|
TenantDSNTemplate string
|
||||||
// TenantSchemaPath zeigt auf migrations/tenant/0001_users.up.sql, mit der
|
|
||||||
// TEN-02 eine frisch provisionierte Tenant-Datenbank initialisiert.
|
|
||||||
TenantSchemaPath string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Load() (Config, error) {
|
func Load() (Config, error) {
|
||||||
@@ -40,11 +37,6 @@ func Load() (Config, error) {
|
|||||||
return Config{}, fmt.Errorf("NEXARCH_TENANT_DSN_TEMPLATE not set")
|
return Config{}, fmt.Errorf("NEXARCH_TENANT_DSN_TEMPLATE not set")
|
||||||
}
|
}
|
||||||
|
|
||||||
schemaPath := os.Getenv("NEXARCH_TENANT_SCHEMA_PATH")
|
|
||||||
if schemaPath == "" {
|
|
||||||
return Config{}, fmt.Errorf("NEXARCH_TENANT_SCHEMA_PATH not set")
|
|
||||||
}
|
|
||||||
|
|
||||||
addr := os.Getenv("NEXARCH_LISTEN_ADDR")
|
addr := os.Getenv("NEXARCH_LISTEN_ADDR")
|
||||||
if addr == "" {
|
if addr == "" {
|
||||||
addr = ":8080"
|
addr = ":8080"
|
||||||
@@ -55,6 +47,5 @@ func Load() (Config, error) {
|
|||||||
RegistryDSN: dsn,
|
RegistryDSN: dsn,
|
||||||
AdminDSN: adminDSN,
|
AdminDSN: adminDSN,
|
||||||
TenantDSNTemplate: dsnTemplate,
|
TenantDSNTemplate: dsnTemplate,
|
||||||
TenantSchemaPath: schemaPath,
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,7 @@ package tenant
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Handler ist eine schlanke Vorbereitung der Schnittstelle fuer API-01
|
// Handler ist eine schlanke Vorbereitung der Schnittstelle fuer API-01
|
||||||
@@ -46,49 +43,3 @@ func (h *Handler) CreateTenant(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.WriteHeader(http.StatusCreated)
|
w.WriteHeader(http.StatusCreated)
|
||||||
_ = json.NewEncoder(w).Encode(t)
|
_ = json.NewEncoder(w).Encode(t)
|
||||||
}
|
}
|
||||||
|
|
||||||
// OnboardingHandler stellt den Self-Service-Endpunkt aus TEN-02 bereit —
|
|
||||||
// eigener Handler statt Erweiterung von Handler.CreateTenant, damit die
|
|
||||||
// TEN-01-Schnittstelle (reines Provisioning ohne Admin-Konto) unveraendert
|
|
||||||
// bleibt.
|
|
||||||
type OnboardingHandler struct {
|
|
||||||
service *OnboardingService
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewOnboardingHandler(s *OnboardingService) *OnboardingHandler {
|
|
||||||
return &OnboardingHandler{service: s}
|
|
||||||
}
|
|
||||||
|
|
||||||
type onboardRequest struct {
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
AdminEmail string `json:"admin_email"`
|
|
||||||
AdminName string `json:"admin_name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *OnboardingHandler) Onboard(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req onboardRequest
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := h.service.Onboard(r.Context(), req.Slug, req.Name, req.AdminEmail, req.AdminName)
|
|
||||||
if err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, ErrInvalidSlug),
|
|
||||||
errors.Is(err, ErrMissingField),
|
|
||||||
errors.Is(err, user.ErrInvalidEmail):
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
case errors.Is(err, ErrTenantExists):
|
|
||||||
http.Error(w, err.Error(), http.StatusConflict)
|
|
||||||
default:
|
|
||||||
http.Error(w, "mandant konnte nicht angelegt werden", http.StatusInternalServerError)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(http.StatusCreated)
|
|
||||||
_ = json.NewEncoder(w).Encode(result)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,206 +0,0 @@
|
|||||||
package tenant
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrTenantNotFound = errors.New("tenant: nicht gefunden")
|
|
||||||
ErrInvalidTransition = errors.New("tenant: ungueltiger zustandsuebergang")
|
|
||||||
// ErrTenantNotActive wird von Lifecycle.CheckActive verwendet — bewusst
|
|
||||||
// EIN Fehler fuer suspendiert/zur-Loeschung-vorgemerkt/geloescht, da der
|
|
||||||
// Aufrufer (z.B. Login) nur wissen muss "kein Zugriff", nicht welcher der
|
|
||||||
// Nicht-aktiv-Zustaende genau vorliegt.
|
|
||||||
ErrTenantNotActive = errors.New("tenant: nicht aktiv")
|
|
||||||
)
|
|
||||||
|
|
||||||
func scanTenantWithLifecycle(row pgx.Row) (Tenant, error) {
|
|
||||||
var t Tenant
|
|
||||||
if err := row.Scan(&t.ID, &t.Slug, &t.Name, &t.DBName, &t.DBDSN, &t.Status,
|
|
||||||
&t.CreatedAt, &t.PreviousStatus, &t.DeletionScheduledAt); err != nil {
|
|
||||||
return Tenant{}, err
|
|
||||||
}
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// transition fuehrt einen bewachten Zustandsuebergang aus: das UPDATE greift
|
|
||||||
// nur, wenn der aktuelle Status einer von allowedFrom ist (atomarer
|
|
||||||
// Check-and-Set, kein Race zwischen Lesen und Schreiben). Greift es nicht,
|
|
||||||
// wird zwischen "Tenant existiert nicht" und "Uebergang nicht erlaubt"
|
|
||||||
// unterschieden, damit AC1 ("ungueltige Uebergaenge werden abgewiesen") einen
|
|
||||||
// sprechenden Fehler liefert statt eines stillen No-Ops.
|
|
||||||
func (r *Registry) transition(ctx context.Context, slug string, allowedFrom []Status, to Status, previousStatus *string, deletionAt *time.Time) (Tenant, error) {
|
|
||||||
from := make([]string, len(allowedFrom))
|
|
||||||
for i, s := range allowedFrom {
|
|
||||||
from[i] = string(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
row := r.pool.QueryRow(ctx, `
|
|
||||||
UPDATE tenants
|
|
||||||
SET status = $2, previous_status = $3, deletion_scheduled_at = $4
|
|
||||||
WHERE slug = $1 AND status = ANY($5)
|
|
||||||
RETURNING id, slug, name, db_name, db_dsn, status, created_at, previous_status, deletion_scheduled_at
|
|
||||||
`, slug, string(to), previousStatus, deletionAt, from)
|
|
||||||
|
|
||||||
t, err := scanTenantWithLifecycle(row)
|
|
||||||
if err == nil {
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
if !errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Tenant{}, fmt.Errorf("zustandsuebergang: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
existing, getErr := r.GetBySlug(ctx, slug)
|
|
||||||
if getErr != nil {
|
|
||||||
return Tenant{}, ErrTenantNotFound
|
|
||||||
}
|
|
||||||
return Tenant{}, fmt.Errorf("%w: von %q nach %q (aktuell: %q)", ErrInvalidTransition, allowedFrom, to, existing.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Suspend haelt die Daten des Mandanten unveraendert, sperrt aber den Zugriff
|
|
||||||
// (Akzeptanzkriterium 1) — es findet keine Loeschung/Migration statt.
|
|
||||||
func (r *Registry) Suspend(ctx context.Context, slug string) (Tenant, error) {
|
|
||||||
return r.transition(ctx, slug, []Status{StatusActive}, StatusSuspended, nil, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reactivate stellt den Zustand vor der Suspendierung vollstaendig wieder her
|
|
||||||
// (Akzeptanzkriterium 2) — da Suspend keine weiteren Daten veraendert, genuegt
|
|
||||||
// die Rueckkehr nach StatusActive.
|
|
||||||
func (r *Registry) Reactivate(ctx context.Context, slug string) (Tenant, error) {
|
|
||||||
return r.transition(ctx, slug, []Status{StatusSuspended}, StatusActive, nil, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ScheduleDeletion merkt den Mandanten zur Loeschung vor und startet die
|
|
||||||
// Karenzzeit (Akzeptanzkriterium 3). previous_status wird festgehalten, damit
|
|
||||||
// CancelDeletion exakt dorthin zurueckkehren kann (aktiv ODER suspendiert).
|
|
||||||
func (r *Registry) ScheduleDeletion(ctx context.Context, slug string, grace time.Duration) (Tenant, error) {
|
|
||||||
existing, err := r.GetBySlug(ctx, slug)
|
|
||||||
if err != nil {
|
|
||||||
return Tenant{}, ErrTenantNotFound
|
|
||||||
}
|
|
||||||
prev := string(existing.Status)
|
|
||||||
deletionAt := time.Now().Add(grace)
|
|
||||||
return r.transition(ctx, slug, []Status{StatusActive, StatusSuspended}, StatusPendingDeletion, &prev, &deletionAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CancelDeletion widerruft eine Loeschvormerkung innerhalb der Karenzzeit und
|
|
||||||
// stellt exakt den zuvor gesicherten Zustand wieder her.
|
|
||||||
func (r *Registry) CancelDeletion(ctx context.Context, slug string) (Tenant, error) {
|
|
||||||
existing, err := r.GetBySlug(ctx, slug)
|
|
||||||
if err != nil {
|
|
||||||
return Tenant{}, ErrTenantNotFound
|
|
||||||
}
|
|
||||||
if existing.Status != StatusPendingDeletion || existing.PreviousStatus == nil {
|
|
||||||
return Tenant{}, fmt.Errorf("%w: von %q nach aktiv/suspendiert (aktuell: %q)", ErrInvalidTransition, StatusPendingDeletion, existing.Status)
|
|
||||||
}
|
|
||||||
restoreTo := Status(*existing.PreviousStatus)
|
|
||||||
return r.transition(ctx, slug, []Status{StatusPendingDeletion}, restoreTo, nil, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lifecycle fuehrt die tatsaechliche, physische Loeschung nach Ablauf der
|
|
||||||
// Karenzzeit aus (Datenbank-Drop) und stellt die Zugriffsschutz-Pruefung
|
|
||||||
// bereit. Getrennt von Registry, weil hierfuer zusaetzlich der adminPool
|
|
||||||
// (fuer DROP DATABASE) noetig ist, siehe internal/tenant.Provisioner.
|
|
||||||
type Lifecycle struct {
|
|
||||||
registry *Registry
|
|
||||||
adminPool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLifecycle(registry *Registry, adminPool *pgxpool.Pool) *Lifecycle {
|
|
||||||
return &Lifecycle{registry: registry, adminPool: adminPool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// CheckActive verweigert Zugriff fuer jeden Nicht-aktiv-Zustand und loggt den
|
|
||||||
// Vorgang strukturiert (Akzeptanzkriterium 1 / Pruefung 2).
|
|
||||||
func (l *Lifecycle) CheckActive(ctx context.Context, slug string) error {
|
|
||||||
t, err := l.registry.GetBySlug(ctx, slug)
|
|
||||||
if err != nil {
|
|
||||||
return ErrTenantNotFound
|
|
||||||
}
|
|
||||||
if t.Status != StatusActive {
|
|
||||||
slog.Warn("zugriff auf nicht-aktiven mandanten verweigert",
|
|
||||||
"tenant_slug", slug, "tenant_status", t.Status)
|
|
||||||
return ErrTenantNotActive
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ProcessDueDeletions loescht alle Mandanten-Datenbanken, deren Karenzzeit
|
|
||||||
// abgelaufen ist (Akzeptanzkriterium 3 / Pruefung 3). FOR UPDATE SKIP LOCKED
|
|
||||||
// folgt der projektweiten Postgres-Jobqueue-Konvention (siehe
|
|
||||||
// SKALIERUNGSKONZEPT.md) und macht die Funktion sicher fuer mehrere parallel
|
|
||||||
// laufende Core-Instanzen.
|
|
||||||
func (l *Lifecycle) ProcessDueDeletions(ctx context.Context) (int, error) {
|
|
||||||
tx, err := l.registry.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("sweep-transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
rows, err := tx.Query(ctx, `
|
|
||||||
SELECT id, db_name FROM tenants
|
|
||||||
WHERE status = $1 AND deletion_scheduled_at <= now()
|
|
||||||
FOR UPDATE SKIP LOCKED
|
|
||||||
`, string(StatusPendingDeletion))
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("faellige loeschungen abfragen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
type due struct{ id, dbName string }
|
|
||||||
var candidates []due
|
|
||||||
for rows.Next() {
|
|
||||||
var d due
|
|
||||||
if err := rows.Scan(&d.id, &d.dbName); err != nil {
|
|
||||||
rows.Close()
|
|
||||||
return 0, fmt.Errorf("faellige loeschung lesen: %w", err)
|
|
||||||
}
|
|
||||||
candidates = append(candidates, d)
|
|
||||||
}
|
|
||||||
rows.Close()
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
processed := 0
|
|
||||||
for _, c := range candidates {
|
|
||||||
if _, err := l.adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, c.dbName)); err != nil {
|
|
||||||
return processed, fmt.Errorf("tenant-datenbank %q loeschen: %w", c.dbName, err)
|
|
||||||
}
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE tenants SET status = $2, previous_status = NULL, deletion_scheduled_at = NULL
|
|
||||||
WHERE id = $1
|
|
||||||
`, c.id, string(StatusDeleted)); err != nil {
|
|
||||||
return processed, fmt.Errorf("tenant %q als geloescht markieren: %w", c.id, err)
|
|
||||||
}
|
|
||||||
processed++
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return 0, fmt.Errorf("sweep-transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
return processed, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RunSweeper triggert ProcessDueDeletions periodisch, bis ctx beendet wird —
|
|
||||||
// die "In-Prozess-Worker-Goroutine" aus der projektweiten Jobqueue-Konvention.
|
|
||||||
func (l *Lifecycle) RunSweeper(ctx context.Context, interval time.Duration) {
|
|
||||||
ticker := time.NewTicker(interval)
|
|
||||||
defer ticker.Stop()
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
case <-ticker.C:
|
|
||||||
if _, err := l.ProcessDueDeletions(ctx); err != nil {
|
|
||||||
slog.Error("tenant-loeschung-sweep fehlgeschlagen", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,253 +0,0 @@
|
|||||||
package tenant
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newLifecycleTestSetup(t *testing.T) (*Registry, *Lifecycle, *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()
|
|
||||||
|
|
||||||
adminPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("admin pool: %v", err)
|
|
||||||
}
|
|
||||||
registryPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("registry pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := registryPool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS tenants (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
slug TEXT NOT NULL UNIQUE,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
db_name TEXT NOT NULL UNIQUE,
|
|
||||||
db_dsn TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
previous_status TEXT,
|
|
||||||
deletion_scheduled_at TIMESTAMPTZ
|
|
||||||
)`); err != nil {
|
|
||||||
t.Fatalf("registry-schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
registry := NewRegistry(registryPool)
|
|
||||||
dsnTemplate := strings.Replace(adminDSN, "/postgres?", "/%s?", 1)
|
|
||||||
provisioner := NewProvisioner(adminPool, registry, dsnTemplate)
|
|
||||||
lifecycle := NewLifecycle(registry, adminPool)
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
registryPool.Close()
|
|
||||||
adminPool.Close()
|
|
||||||
}
|
|
||||||
_ = provisioner
|
|
||||||
return registry, lifecycle, adminPool, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func provisionTestTenant(t *testing.T, registry *Registry, adminPool *pgxpool.Pool, slug string) {
|
|
||||||
t.Helper()
|
|
||||||
dsnTemplate := strings.Replace(os.Getenv("TEST_ADMIN_DSN"), "/postgres?", "/%s?", 1)
|
|
||||||
provisioner := NewProvisioner(adminPool, registry, dsnTemplate)
|
|
||||||
if _, err := provisioner.Provision(context.Background(), slug, slug); err != nil {
|
|
||||||
t.Fatalf("provision %s: %v", slug, err)
|
|
||||||
}
|
|
||||||
t.Cleanup(func() {
|
|
||||||
ctx := context.Background()
|
|
||||||
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbNameForSlug(slug)))
|
|
||||||
_, _ = registry.pool.Exec(ctx, `DELETE FROM tenants WHERE slug = $1`, slug)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 (Suspend) + 2 (Reactivate) + Pruefung 1 (Uebergaenge).
|
|
||||||
func TestLifecycle_SuspendAndReactivate(t *testing.T) {
|
|
||||||
registry, _, adminPool, cleanup := newLifecycleTestSetup(t)
|
|
||||||
defer cleanup()
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_suspend")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
suspended, err := registry.Suspend(ctx, "lc_suspend")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("suspend: %v", err)
|
|
||||||
}
|
|
||||||
if suspended.Status != StatusSuspended {
|
|
||||||
t.Fatalf("status = %q, want suspended", suspended.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
reactivated, err := registry.Reactivate(ctx, "lc_suspend")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("reactivate: %v", err)
|
|
||||||
}
|
|
||||||
if reactivated.Status != StatusActive {
|
|
||||||
t.Fatalf("status = %q, want active", reactivated.Status)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pruefung 1: ungueltige Uebergaenge werden abgewiesen.
|
|
||||||
func TestLifecycle_RejectsInvalidTransitions(t *testing.T) {
|
|
||||||
registry, _, adminPool, cleanup := newLifecycleTestSetup(t)
|
|
||||||
defer cleanup()
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_invalid")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
// Reactivate auf einem bereits aktiven Tenant ist kein gueltiger Uebergang.
|
|
||||||
if _, err := registry.Reactivate(ctx, "lc_invalid"); !errors.Is(err, ErrInvalidTransition) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidTransition, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := registry.Suspend(ctx, "lc_invalid"); err != nil {
|
|
||||||
t.Fatalf("suspend: %v", err)
|
|
||||||
}
|
|
||||||
// Suspend auf einem bereits suspendierten Tenant ist ebenfalls ungueltig.
|
|
||||||
if _, err := registry.Suspend(ctx, "lc_invalid"); !errors.Is(err, ErrInvalidTransition) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidTransition, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CancelDeletion ohne vorherige Loeschvormerkung ist ungueltig.
|
|
||||||
if _, err := registry.CancelDeletion(ctx, "lc_invalid"); !errors.Is(err, ErrInvalidTransition) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidTransition, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := registry.Suspend(ctx, "unbekannter-slug-xyz"); !errors.Is(err, ErrTenantNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrTenantNotFound, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Loeschung zweistufig mit Karenzzeit, innerhalb der
|
|
||||||
// Frist widerrufbar — sowohl aus 'active' als auch aus 'suspended' heraus,
|
|
||||||
// mit exakter Wiederherstellung des jeweiligen Vorzustands.
|
|
||||||
func TestLifecycle_ScheduleAndCancelDeletion_RestoresExactPreviousState(t *testing.T) {
|
|
||||||
registry, _, adminPool, cleanup := newLifecycleTestSetup(t)
|
|
||||||
defer cleanup()
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_cancel_active")
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_cancel_suspended")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
// Fall 1: aus 'active' heraus vorgemerkt und widerrufen.
|
|
||||||
scheduled, err := registry.ScheduleDeletion(ctx, "lc_cancel_active", time.Hour)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("schedule deletion: %v", err)
|
|
||||||
}
|
|
||||||
if scheduled.Status != StatusPendingDeletion {
|
|
||||||
t.Fatalf("status = %q, want pending_deletion", scheduled.Status)
|
|
||||||
}
|
|
||||||
if scheduled.DeletionScheduledAt == nil {
|
|
||||||
t.Fatal("erwartet gesetzte deletion_scheduled_at")
|
|
||||||
}
|
|
||||||
|
|
||||||
restored, err := registry.CancelDeletion(ctx, "lc_cancel_active")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("cancel deletion: %v", err)
|
|
||||||
}
|
|
||||||
if restored.Status != StatusActive {
|
|
||||||
t.Fatalf("status = %q, want active (vorheriger zustand)", restored.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall 2: aus 'suspended' heraus vorgemerkt und widerrufen — muss zu
|
|
||||||
// 'suspended' zurueckkehren, NICHT zu 'active'.
|
|
||||||
if _, err := registry.Suspend(ctx, "lc_cancel_suspended"); err != nil {
|
|
||||||
t.Fatalf("suspend: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := registry.ScheduleDeletion(ctx, "lc_cancel_suspended", time.Hour); err != nil {
|
|
||||||
t.Fatalf("schedule deletion: %v", err)
|
|
||||||
}
|
|
||||||
restoredSuspended, err := registry.CancelDeletion(ctx, "lc_cancel_suspended")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("cancel deletion: %v", err)
|
|
||||||
}
|
|
||||||
if restoredSuspended.Status != StatusSuspended {
|
|
||||||
t.Fatalf("status = %q, want suspended (vorheriger zustand)", restoredSuspended.Status)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 2: suspendierter Tenant erzeugt bei jedem
|
|
||||||
// Zugriffsversuch einen klaren Fehler.
|
|
||||||
func TestLifecycle_CheckActive_RejectsNonActive(t *testing.T) {
|
|
||||||
registry, lifecycle, adminPool, cleanup := newLifecycleTestSetup(t)
|
|
||||||
defer cleanup()
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_checkactive")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := lifecycle.CheckActive(ctx, "lc_checkactive"); err != nil {
|
|
||||||
t.Fatalf("aktiver tenant sollte durchgehen, habe %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := registry.Suspend(ctx, "lc_checkactive"); err != nil {
|
|
||||||
t.Fatalf("suspend: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
if err := lifecycle.CheckActive(ctx, "lc_checkactive"); !errors.Is(err, ErrTenantNotActive) {
|
|
||||||
t.Fatalf("versuch %d: erwartet ErrTenantNotActive, habe %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := lifecycle.CheckActive(ctx, "nie-registriert"); !errors.Is(err, ErrTenantNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrTenantNotFound, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: Loeschvorgang nach Ablauf der Karenzzeit
|
|
||||||
// automatisch ausgeloest (hier durch direkten Aufruf von ProcessDueDeletions,
|
|
||||||
// das RunSweeper periodisch aufruft).
|
|
||||||
func TestLifecycle_ProcessDueDeletions(t *testing.T) {
|
|
||||||
registry, lifecycle, adminPool, cleanup := newLifecycleTestSetup(t)
|
|
||||||
defer cleanup()
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_due")
|
|
||||||
provisionTestTenant(t, registry, adminPool, "lc_not_due")
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
// lc_due: Karenzzeit liegt bereits in der Vergangenheit -> faellig.
|
|
||||||
if _, err := registry.ScheduleDeletion(ctx, "lc_due", -time.Minute); err != nil {
|
|
||||||
t.Fatalf("schedule deletion (due): %v", err)
|
|
||||||
}
|
|
||||||
// lc_not_due: Karenzzeit liegt weit in der Zukunft -> nicht faellig.
|
|
||||||
if _, err := registry.ScheduleDeletion(ctx, "lc_not_due", time.Hour); err != nil {
|
|
||||||
t.Fatalf("schedule deletion (not due): %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
processed, err := lifecycle.ProcessDueDeletions(ctx)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process due deletions: %v", err)
|
|
||||||
}
|
|
||||||
if processed != 1 {
|
|
||||||
t.Fatalf("erwartet genau 1 verarbeitete loeschung, habe %d", processed)
|
|
||||||
}
|
|
||||||
|
|
||||||
due, err := registry.GetBySlug(ctx, "lc_due")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get lc_due: %v", err)
|
|
||||||
}
|
|
||||||
if due.Status != StatusDeleted {
|
|
||||||
t.Fatalf("lc_due status = %q, want deleted", due.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
notDue, err := registry.GetBySlug(ctx, "lc_not_due")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get lc_not_due: %v", err)
|
|
||||||
}
|
|
||||||
if notDue.Status != StatusPendingDeletion {
|
|
||||||
t.Fatalf("lc_not_due status = %q, want pending_deletion (noch nicht faellig)", notDue.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Datenbank von lc_due wurde tatsaechlich physisch entfernt.
|
|
||||||
var exists bool
|
|
||||||
if err := adminPool.QueryRow(ctx, `SELECT EXISTS(SELECT 1 FROM pg_database WHERE datname = $1)`,
|
|
||||||
dbNameForSlug("lc_due")).Scan(&exists); err != nil {
|
|
||||||
t.Fatalf("pg_database pruefen: %v", err)
|
|
||||||
}
|
|
||||||
if exists {
|
|
||||||
t.Fatal("erwartet, dass die tenant-datenbank von lc_due geloescht wurde")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
package tenant
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
var ErrMissingField = errors.New("tenant: pflichtfeld fehlt")
|
|
||||||
|
|
||||||
// OnboardingService implementiert TEN-02: Self-Service-Anlage eines neuen
|
|
||||||
// Mandanten inklusive Ersteinrichtung des Administrator-Kontos in einem
|
|
||||||
// Vorgang. Schlaegt die Admin-Anlage fehl, wird der bereits provisionierte
|
|
||||||
// Tenant per Deprovision wieder vollstaendig entfernt (Saga-Kompensation,
|
|
||||||
// da CREATE DATABASE keine echte cross-database Transaktion erlaubt).
|
|
||||||
type OnboardingService struct {
|
|
||||||
provisioner *Provisioner
|
|
||||||
// tenantSchemaPath zeigt auf migrations/tenant/0001_users.up.sql, mit der
|
|
||||||
// die frisch angelegte Tenant-Datenbank initialisiert wird, bevor der
|
|
||||||
// erste Administrator angelegt werden kann.
|
|
||||||
tenantSchemaPath string
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewOnboardingService(provisioner *Provisioner, tenantSchemaPath string) *OnboardingService {
|
|
||||||
return &OnboardingService{provisioner: provisioner, tenantSchemaPath: tenantSchemaPath}
|
|
||||||
}
|
|
||||||
|
|
||||||
type OnboardResult struct {
|
|
||||||
Tenant Tenant
|
|
||||||
Admin user.User
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *OnboardingService) Onboard(ctx context.Context, slug, tenantName, adminEmail, adminName string) (OnboardResult, error) {
|
|
||||||
if tenantName == "" {
|
|
||||||
return OnboardResult{}, fmt.Errorf("%w: name", ErrMissingField)
|
|
||||||
}
|
|
||||||
if adminName == "" {
|
|
||||||
return OnboardResult{}, fmt.Errorf("%w: admin-name", ErrMissingField)
|
|
||||||
}
|
|
||||||
if err := ValidateSlug(slug); err != nil {
|
|
||||||
return OnboardResult{}, err
|
|
||||||
}
|
|
||||||
if err := user.ValidateEmail(adminEmail); err != nil {
|
|
||||||
return OnboardResult{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
t, err := s.provisioner.Provision(ctx, slug, tenantName)
|
|
||||||
if err != nil {
|
|
||||||
return OnboardResult{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
admin, err := s.setupAdmin(ctx, t, adminEmail, adminName)
|
|
||||||
if err != nil {
|
|
||||||
_ = s.provisioner.Deprovision(ctx, t)
|
|
||||||
return OnboardResult{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return OnboardResult{Tenant: t, Admin: admin}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *OnboardingService) setupAdmin(ctx context.Context, t Tenant, adminEmail, adminName string) (user.User, error) {
|
|
||||||
pool, err := pgxpool.New(ctx, t.DBDSN)
|
|
||||||
if err != nil {
|
|
||||||
return user.User{}, fmt.Errorf("verbindung zur neuen tenant-datenbank: %w", err)
|
|
||||||
}
|
|
||||||
defer pool.Close()
|
|
||||||
|
|
||||||
schema, err := os.ReadFile(s.tenantSchemaPath)
|
|
||||||
if err != nil {
|
|
||||||
return user.User{}, fmt.Errorf("tenant-schema lesen: %w", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, string(schema)); err != nil {
|
|
||||||
return user.User{}, fmt.Errorf("tenant-schema anwenden: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
store := user.NewTenantUserStore(pool)
|
|
||||||
return store.Create(ctx, adminEmail, adminName)
|
|
||||||
}
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
package tenant
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
// schemaPathForTest liefert den Pfad zur echten Migration, damit Tests exakt
|
|
||||||
// dasselbe Schema anwenden wie die Produktion (keine Zweitkopie des SQL).
|
|
||||||
const schemaPathForTest = "../../migrations/tenant/0001_users.up.sql"
|
|
||||||
|
|
||||||
func TestOnboarding_ValidationErrors(t *testing.T) {
|
|
||||||
// Reine Eingabevalidierung, braucht keine Datenbank.
|
|
||||||
svc := NewOnboardingService(nil, schemaPathForTest)
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
slug string
|
|
||||||
tenantName string
|
|
||||||
email string
|
|
||||||
adminName string
|
|
||||||
wantErr error
|
|
||||||
}{
|
|
||||||
{"leerer name", "acme", "", "a@b.de", "Admin", ErrMissingField},
|
|
||||||
{"leerer admin-name", "acme", "Acme", "a@b.de", "", ErrMissingField},
|
|
||||||
{"ungueltiger slug", "Acme!", "Acme", "a@b.de", "Admin", ErrInvalidSlug},
|
|
||||||
{"ungueltige email", "acme", "Acme", "keine-email", "Admin", user.ErrInvalidEmail},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, c := range cases {
|
|
||||||
t.Run(c.name, func(t *testing.T) {
|
|
||||||
_, err := svc.Onboard(ctx, c.slug, c.tenantName, c.email, c.adminName)
|
|
||||||
if !errors.Is(err, c.wantErr) {
|
|
||||||
t.Fatalf("erwartet %v, habe %v", c.wantErr, err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newTestOnboardingService(t *testing.T) (*OnboardingService, func()) {
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
registryPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("registry pool: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := registryPool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS tenants (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
slug TEXT NOT NULL UNIQUE,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
db_name TEXT NOT NULL UNIQUE,
|
|
||||||
db_dsn TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
)`); err != nil {
|
|
||||||
t.Fatalf("registry-schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
registry := NewRegistry(registryPool)
|
|
||||||
dsnTemplate := strings.Replace(adminDSN, "/postgres?", "/%s?", 1)
|
|
||||||
provisioner := NewProvisioner(adminPool, registry, dsnTemplate)
|
|
||||||
svc := NewOnboardingService(provisioner, schemaPathForTest)
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
registryPool.Close()
|
|
||||||
adminPool.Close()
|
|
||||||
}
|
|
||||||
return svc, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterien 1+2: Mandant + Erst-Admin in einem Vorgang.
|
|
||||||
func TestOnboarding_CreatesTenantAndAdmin(t *testing.T) {
|
|
||||||
svc, cleanup := newTestOnboardingService(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
t.Cleanup(func() {
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
p, _ := pgxpool.New(ctx, adminDSN)
|
|
||||||
defer p.Close()
|
|
||||||
_, _ = p.Exec(ctx, `DELETE FROM tenants WHERE slug = 'onboardtest'`)
|
|
||||||
_, _ = p.Exec(ctx, `DROP DATABASE IF EXISTS tenant_onboardtest`)
|
|
||||||
})
|
|
||||||
|
|
||||||
result, err := svc.Onboard(ctx, "onboardtest", "Onboard Test GmbH", "admin@onboardtest.example", "Erste Admin")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("onboard: %v", err)
|
|
||||||
}
|
|
||||||
if result.Tenant.Slug != "onboardtest" {
|
|
||||||
t.Fatalf("tenant slug = %q", result.Tenant.Slug)
|
|
||||||
}
|
|
||||||
if result.Admin.Email != "admin@onboardtest.example" {
|
|
||||||
t.Fatalf("admin email = %q", result.Admin.Email)
|
|
||||||
}
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, result.Tenant.DBDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("connect tenant db: %v", err)
|
|
||||||
}
|
|
||||||
defer pool.Close()
|
|
||||||
|
|
||||||
var count int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT count(*) FROM users WHERE email = $1`, "admin@onboardtest.example").Scan(&count); err != nil {
|
|
||||||
t.Fatalf("admin in tenant-db pruefen: %v", err)
|
|
||||||
}
|
|
||||||
if count != 1 {
|
|
||||||
t.Fatalf("erwartet genau einen admin in der tenant-db, habe %d", count)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 1: doppelte Registrierung wird abgewiesen,
|
|
||||||
// auch bei zwei parallelen Anfragen entsteht kein Doppel-Tenant.
|
|
||||||
func TestOnboarding_RejectsDuplicateSlugConcurrently(t *testing.T) {
|
|
||||||
svc, cleanup := newTestOnboardingService(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
t.Cleanup(func() {
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
p, _ := pgxpool.New(ctx, adminDSN)
|
|
||||||
defer p.Close()
|
|
||||||
_, _ = p.Exec(ctx, `DELETE FROM tenants WHERE slug = 'dupetest'`)
|
|
||||||
_, _ = p.Exec(ctx, `DROP DATABASE IF EXISTS tenant_dupetest`)
|
|
||||||
})
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
results := make([]error, 2)
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
wg.Add(1)
|
|
||||||
go func(i int) {
|
|
||||||
defer wg.Done()
|
|
||||||
_, err := svc.Onboard(ctx, "dupetest", "Dupe Test", "admin@dupetest.example", "Admin")
|
|
||||||
results[i] = err
|
|
||||||
}(i)
|
|
||||||
}
|
|
||||||
wg.Wait()
|
|
||||||
|
|
||||||
successCount := 0
|
|
||||||
for _, err := range results {
|
|
||||||
if err == nil {
|
|
||||||
successCount++
|
|
||||||
} else if !errors.Is(err, ErrTenantExists) {
|
|
||||||
t.Fatalf("unerwarteter fehler: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if successCount != 1 {
|
|
||||||
t.Fatalf("erwartet genau einen erfolgreichen onboarding-vorgang, habe %d", successCount)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,17 +2,11 @@ package tenant
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgconn"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrTenantExists wird zurueckgegeben, wenn Slug oder Datenbankname eines
|
|
||||||
// Mandanten bereits vergeben sind (TEN-02 Akzeptanzkriterium 3).
|
|
||||||
var ErrTenantExists = errors.New("tenant: slug bereits vergeben")
|
|
||||||
|
|
||||||
// Provisioner legt fuer jeden neuen Mandanten eine vollstaendig isolierte
|
// Provisioner legt fuer jeden neuen Mandanten eine vollstaendig isolierte
|
||||||
// PostgreSQL-Datenbank an und registriert sie transaktional in der Registry
|
// PostgreSQL-Datenbank an und registriert sie transaktional in der Registry
|
||||||
// (Akzeptanzkriterium 2). Zwei Mandanten-Datenbanken sind danach auf
|
// (Akzeptanzkriterium 2). Zwei Mandanten-Datenbanken sind danach auf
|
||||||
@@ -45,14 +39,6 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
// CREATE DATABASE erlaubt keine Parameter-Platzhalter; slug ist durch
|
// CREATE DATABASE erlaubt keine Parameter-Platzhalter; slug ist durch
|
||||||
// ValidateSlug bereits auf [a-z0-9_] beschraenkt, Injektion ausgeschlossen.
|
// ValidateSlug bereits auf [a-z0-9_] beschraenkt, Injektion ausgeschlossen.
|
||||||
if _, err := p.adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
if _, err := p.adminPool.Exec(ctx, fmt.Sprintf(`CREATE DATABASE %q`, dbName)); err != nil {
|
||||||
var pgErr *pgconn.PgError
|
|
||||||
// 42P04 (duplicate_database) im Normalfall; bei zwei echt parallelen
|
|
||||||
// CREATE DATABASE auf denselben Namen liefert Postgres stattdessen den
|
|
||||||
// internen Unique-Index-Konflikt 23505 auf pg_database — beide Faelle
|
|
||||||
// bedeuten: der Tenant existiert bereits bzw. wird gerade angelegt.
|
|
||||||
if errors.As(err, &pgErr) && (pgErr.Code == "42P04" || pgErr.Code == "23505") {
|
|
||||||
return Tenant{}, ErrTenantExists
|
|
||||||
}
|
|
||||||
return Tenant{}, fmt.Errorf("tenant-datenbank anlegen: %w", err)
|
return Tenant{}, fmt.Errorf("tenant-datenbank anlegen: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,10 +60,6 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
_ = tx.Rollback(ctx)
|
_ = tx.Rollback(ctx)
|
||||||
p.rollbackDatabase(ctx, dbName)
|
p.rollbackDatabase(ctx, dbName)
|
||||||
var pgErr *pgconn.PgError
|
|
||||||
if errors.As(err, &pgErr) && pgErr.Code == "23505" { // unique_violation auf slug
|
|
||||||
return Tenant{}, ErrTenantExists
|
|
||||||
}
|
|
||||||
return Tenant{}, err
|
return Tenant{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,16 +76,3 @@ func (p *Provisioner) Provision(ctx context.Context, slug, name string) (Tenant,
|
|||||||
func (p *Provisioner) rollbackDatabase(ctx context.Context, dbName string) {
|
func (p *Provisioner) rollbackDatabase(ctx context.Context, dbName string) {
|
||||||
_, _ = p.adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
_, _ = p.adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, dbName))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprovision entfernt einen bereits erfolgreich registrierten Tenant wieder
|
|
||||||
// vollstaendig (Registry-Eintrag + Datenbank). Wird als Kompensation
|
|
||||||
// verwendet, wenn ein Schritt NACH Provision fehlschlaegt (z.B. die
|
|
||||||
// Admin-Account-Anlage in TEN-02) — Provision selbst bleibt dadurch die
|
|
||||||
// einzige Stelle, die "erfolgreich provisioniert" garantieren muss.
|
|
||||||
func (p *Provisioner) Deprovision(ctx context.Context, t Tenant) error {
|
|
||||||
if err := p.registry.Delete(ctx, t.ID); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
p.rollbackDatabase(ctx, t.DBName)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -35,34 +35,21 @@ func (r *Registry) insertTx(ctx context.Context, tx pgx.Tx, t Tenant) (Tenant, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Registry) GetBySlug(ctx context.Context, slug string) (Tenant, error) {
|
func (r *Registry) GetBySlug(ctx context.Context, slug string) (Tenant, error) {
|
||||||
// previous_status/deletion_scheduled_at werden mitgelesen, damit TEN-04
|
var t Tenant
|
||||||
// (internal/tenant/lifecycle.go) den vollstaendigen Lebenszyklus-Zustand
|
|
||||||
// ueber GetBySlug ansehen kann, statt eine eigene Abfrage zu duplizieren.
|
|
||||||
row := r.pool.QueryRow(ctx, `
|
row := r.pool.QueryRow(ctx, `
|
||||||
SELECT id, slug, name, db_name, db_dsn, status, created_at, previous_status, deletion_scheduled_at
|
SELECT id, slug, name, db_name, db_dsn, status, created_at
|
||||||
FROM tenants WHERE slug = $1
|
FROM tenants WHERE slug = $1
|
||||||
`, slug)
|
`, slug)
|
||||||
|
|
||||||
t, err := scanTenantWithLifecycle(row)
|
if err := row.Scan(&t.ID, &t.Slug, &t.Name, &t.DBName, &t.DBDSN, &t.Status, &t.CreatedAt); err != nil {
|
||||||
if err != nil {
|
|
||||||
return Tenant{}, fmt.Errorf("tenant laden: %w", err)
|
return Tenant{}, fmt.Errorf("tenant laden: %w", err)
|
||||||
}
|
}
|
||||||
return t, nil
|
return t, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete entfernt einen Registry-Eintrag. Wird von Provisioner.Deprovision
|
|
||||||
// als Kompensation verwendet, wenn nach erfolgreicher Registrierung ein
|
|
||||||
// nachgelagerter Schritt (z.B. Admin-Account-Anlage in TEN-02) fehlschlaegt.
|
|
||||||
func (r *Registry) Delete(ctx context.Context, id string) error {
|
|
||||||
if _, err := r.pool.Exec(ctx, `DELETE FROM tenants WHERE id = $1`, id); err != nil {
|
|
||||||
return fmt.Errorf("tenant loeschen: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Registry) List(ctx context.Context) ([]Tenant, error) {
|
func (r *Registry) List(ctx context.Context) ([]Tenant, error) {
|
||||||
rows, err := r.pool.Query(ctx, `
|
rows, err := r.pool.Query(ctx, `
|
||||||
SELECT id, slug, name, db_name, db_dsn, status, created_at, previous_status, deletion_scheduled_at
|
SELECT id, slug, name, db_name, db_dsn, status, created_at
|
||||||
FROM tenants ORDER BY created_at
|
FROM tenants ORDER BY created_at
|
||||||
`)
|
`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -72,8 +59,8 @@ func (r *Registry) List(ctx context.Context) ([]Tenant, error) {
|
|||||||
|
|
||||||
var out []Tenant
|
var out []Tenant
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
t, err := scanTenantWithLifecycle(rows)
|
var t Tenant
|
||||||
if err != nil {
|
if err := rows.Scan(&t.ID, &t.Slug, &t.Name, &t.DBName, &t.DBDSN, &t.Status, &t.CreatedAt); err != nil {
|
||||||
return nil, fmt.Errorf("tenant lesen: %w", err)
|
return nil, fmt.Errorf("tenant lesen: %w", err)
|
||||||
}
|
}
|
||||||
out = append(out, t)
|
out = append(out, t)
|
||||||
|
|||||||
@@ -12,10 +12,6 @@ type Status string
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
StatusActive Status = "active"
|
StatusActive Status = "active"
|
||||||
// Lebenszyklus-Zustaende aus TEN-04 (siehe internal/tenant/lifecycle.go).
|
|
||||||
StatusSuspended Status = "suspended"
|
|
||||||
StatusPendingDeletion Status = "pending_deletion"
|
|
||||||
StatusDeleted Status = "deleted"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Tenant struct {
|
type Tenant struct {
|
||||||
@@ -26,11 +22,6 @@ type Tenant struct {
|
|||||||
DBDSN string
|
DBDSN string
|
||||||
Status Status
|
Status Status
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
// PreviousStatus und DeletionScheduledAt sind nur waehrend
|
|
||||||
// StatusPendingDeletion gesetzt (TEN-04) — sie halten fest, in welchen
|
|
||||||
// Zustand CancelDeletion zurueckkehrt und wann die Karenzzeit ablaeuft.
|
|
||||||
PreviousStatus *string
|
|
||||||
DeletionScheduledAt *time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// slugPattern erzwingt sichere, als SQL-Identifier verwendbare Slugs, damit
|
// slugPattern erzwingt sichere, als SQL-Identifier verwendbare Slugs, damit
|
||||||
|
|||||||
@@ -1,298 +0,0 @@
|
|||||||
// Package tenantadmin implementiert Core TEN-05: das Backend-API fuer die
|
|
||||||
// Tenant-Verwaltungsoberflaeche. Enthaelt KEINE eigene Provisioning-/
|
|
||||||
// Lifecycle-/Settings-Logik, sondern ist ein duenner Vermittler ueber
|
|
||||||
// internal/tenant (TEN-01/TEN-04), internal/tenantsettings (TEN-03) und
|
|
||||||
// internal/user.SuperadminStore (Berechtigungspruefung) — Ticket-Vorgabe:
|
|
||||||
// "Verwaltungsoberflaeche im Stil einer schlanken Zitadel-Console".
|
|
||||||
package tenantadmin
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenantsettings"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ErrNotSuperadmin wird geliefert, wenn der Aufrufer keine aktive
|
|
||||||
// Superadmin-Identitaet hat (Akzeptanzkriterium 1 / Pruefung 1: die
|
|
||||||
// Oberflaeche zeigt Mandanten nur berechtigten Superadmins).
|
|
||||||
var ErrNotSuperadmin = errors.New("tenantadmin: aufrufer ist kein aktiver superadmin")
|
|
||||||
|
|
||||||
// ErrMissingDisplayName wird geliefert, wenn ein Einstellungs-Update ohne
|
|
||||||
// das Pflichtfeld Anzeigename versucht wird (Akzeptanzkriterium 2 / Pruefung 2).
|
|
||||||
var ErrMissingDisplayName = errors.New("tenantadmin: anzeigename ist ein pflichtfeld")
|
|
||||||
|
|
||||||
type Handler struct {
|
|
||||||
registry *tenant.Registry
|
|
||||||
lifecycle *tenant.Lifecycle
|
|
||||||
settings *tenantsettings.Store
|
|
||||||
superadmins *user.SuperadminStore
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewHandler(registry *tenant.Registry, lifecycle *tenant.Lifecycle, settings *tenantsettings.Store, superadmins *user.SuperadminStore) *Handler {
|
|
||||||
return &Handler{registry: registry, lifecycle: lifecycle, settings: settings, superadmins: superadmins}
|
|
||||||
}
|
|
||||||
|
|
||||||
// requireSuperadmin prueft, dass der Aufrufer ein EXISTIERENDER, AKTIVER
|
|
||||||
// Superadmin ist — es gibt (bewusst, siehe internal/user.SuperadminStore)
|
|
||||||
// keine Tenant-Scoping-Dimension fuer Superadmins: wer ueberhaupt Zugriff
|
|
||||||
// hat, sieht alle Mandanten. Alles andere wird abgelehnt, bevor irgendeine
|
|
||||||
// Mandantendatei gelesen wird (Fail-Safe-Default).
|
|
||||||
func (h *Handler) requireSuperadmin(ctx context.Context, superadminID string) error {
|
|
||||||
if superadminID == "" {
|
|
||||||
return ErrNotSuperadmin
|
|
||||||
}
|
|
||||||
admin, err := h.superadmins.Get(ctx, superadminID)
|
|
||||||
if err != nil {
|
|
||||||
return ErrNotSuperadmin
|
|
||||||
}
|
|
||||||
if admin.Status != user.StatusActive {
|
|
||||||
return ErrNotSuperadmin
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// TenantListItem ist die fuer die Uebersichtsliste relevante Projektion
|
|
||||||
// (Akzeptanzkriterium 1).
|
|
||||||
type TenantListItem struct {
|
|
||||||
ID string `json:"id"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListTenants liefert alle Mandanten, optional gefiltert nach Suchbegriff
|
|
||||||
// (Slug/Name, Teilstring, case-insensitive) und Status — beides serverseitig,
|
|
||||||
// damit die Oberflaeche nicht selbst ueber unautorisierte Datensaetze
|
|
||||||
// filtern muss (Akzeptanzkriterium 1: Suche und Filter).
|
|
||||||
func (h *Handler) ListTenants(ctx context.Context, superadminID, search, statusFilter string) ([]TenantListItem, error) {
|
|
||||||
if err := h.requireSuperadmin(ctx, superadminID); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
all, err := h.registry.List(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("mandanten auflisten: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
search = strings.ToLower(strings.TrimSpace(search))
|
|
||||||
out := make([]TenantListItem, 0, len(all))
|
|
||||||
for _, t := range all {
|
|
||||||
if statusFilter != "" && string(t.Status) != statusFilter {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if search != "" && !strings.Contains(strings.ToLower(t.Slug), search) && !strings.Contains(strings.ToLower(t.Name), search) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
out = append(out, TenantListItem{ID: t.ID, Slug: t.Slug, Name: t.Name, Status: string(t.Status)})
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// TenantDetail buendelt Stammdaten und Einstellungen fuer die Detailansicht.
|
|
||||||
type TenantDetail struct {
|
|
||||||
ID string `json:"id"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
Settings tenantsettings.Settings `json:"settings"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) GetTenantDetail(ctx context.Context, superadminID, slug string) (TenantDetail, error) {
|
|
||||||
if err := h.requireSuperadmin(ctx, superadminID); err != nil {
|
|
||||||
return TenantDetail{}, err
|
|
||||||
}
|
|
||||||
t, err := h.registry.GetBySlug(ctx, slug)
|
|
||||||
if err != nil {
|
|
||||||
return TenantDetail{}, fmt.Errorf("mandant laden: %w", err)
|
|
||||||
}
|
|
||||||
s, err := h.settings.Get(ctx, t.ID)
|
|
||||||
if err != nil {
|
|
||||||
return TenantDetail{}, fmt.Errorf("einstellungen laden: %w", err)
|
|
||||||
}
|
|
||||||
return TenantDetail{ID: t.ID, Slug: t.Slug, Name: t.Name, Status: string(t.Status), Settings: s}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SettingsPatch ist die vom Formular gesendete Aenderung. DisplayName ist
|
|
||||||
// KEIN Zeiger, weil es Pflichtfeld ist (Akzeptanzkriterium 2) — die anderen
|
|
||||||
// Felder bleiben optional (Zeiger = "unveraendert lassen", siehe
|
|
||||||
// tenantsettings.Patch).
|
|
||||||
type SettingsPatch struct {
|
|
||||||
DisplayName string
|
|
||||||
LogoURL *string
|
|
||||||
ColorScheme *string
|
|
||||||
Timezone *string
|
|
||||||
Language *string
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateSettings validiert das Pflichtfeld Anzeigename, BEVOR irgendein
|
|
||||||
// Schreibzugriff erfolgt (Akzeptanzkriterium 2 / Pruefung 2: unvollstaendige
|
|
||||||
// Pflichtfelder werden serverseitig verhindert, nicht nur clientseitig).
|
|
||||||
func (h *Handler) UpdateSettings(ctx context.Context, superadminID, slug string, patch SettingsPatch) (tenantsettings.Settings, error) {
|
|
||||||
if err := h.requireSuperadmin(ctx, superadminID); err != nil {
|
|
||||||
return tenantsettings.Settings{}, err
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(patch.DisplayName) == "" {
|
|
||||||
return tenantsettings.Settings{}, ErrMissingDisplayName
|
|
||||||
}
|
|
||||||
|
|
||||||
t, err := h.registry.GetBySlug(ctx, slug)
|
|
||||||
if err != nil {
|
|
||||||
return tenantsettings.Settings{}, fmt.Errorf("mandant laden: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
displayName := patch.DisplayName
|
|
||||||
return h.settings.Update(ctx, t.ID, tenantsettings.Patch{
|
|
||||||
DisplayName: &displayName,
|
|
||||||
LogoURL: patch.LogoURL,
|
|
||||||
ColorScheme: patch.ColorScheme,
|
|
||||||
Timezone: patch.Timezone,
|
|
||||||
Language: patch.Language,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// LifecycleAction sind die von der Oberflaeche ausloesbaren Aktionen
|
|
||||||
// (Akzeptanzkriterium 3) — je EIN Wort pro Aktion, damit ein Bestaetigungs-
|
|
||||||
// dialog im Frontend darauf verzweigen kann, ohne HTTP-Interna zu kennen.
|
|
||||||
type LifecycleAction string
|
|
||||||
|
|
||||||
const (
|
|
||||||
ActionSuspend LifecycleAction = "suspend"
|
|
||||||
ActionReactivate LifecycleAction = "reactivate"
|
|
||||||
ActionScheduleDeletion LifecycleAction = "schedule_deletion"
|
|
||||||
ActionCancelDeletion LifecycleAction = "cancel_deletion"
|
|
||||||
)
|
|
||||||
|
|
||||||
var ErrUnknownAction = errors.New("tenantadmin: unbekannte lifecycle-aktion")
|
|
||||||
|
|
||||||
// DefaultDeletionGracePeriod ist die Karenzzeit, die die Oberflaeche beim
|
|
||||||
// Ausloesen von ActionScheduleDeletion verwendet — Konfiguration dieses
|
|
||||||
// Pakets, nicht von internal/tenant (das lifecycle.go generisch mit einer
|
|
||||||
// uebergebenen Dauer arbeitet, siehe TEN-04).
|
|
||||||
const DefaultDeletionGracePeriod = 30 * 24 * time.Hour
|
|
||||||
|
|
||||||
// PerformLifecycleAction fuehrt EINEN der vier Uebergaenge aus. Ungueltige
|
|
||||||
// Zustandsuebergaenge (z.B. "suspend" auf einen bereits geloeschten Tenant)
|
|
||||||
// werden von internal/tenant.Lifecycle selbst mit ErrInvalidTransition
|
|
||||||
// abgelehnt (siehe TEN-04) — dieses Paket dupliziert diese Pruefung nicht.
|
|
||||||
func (h *Handler) PerformLifecycleAction(ctx context.Context, superadminID, slug string, action LifecycleAction) (tenant.Tenant, error) {
|
|
||||||
if err := h.requireSuperadmin(ctx, superadminID); err != nil {
|
|
||||||
return tenant.Tenant{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
switch action {
|
|
||||||
case ActionSuspend:
|
|
||||||
return h.registry.Suspend(ctx, slug)
|
|
||||||
case ActionReactivate:
|
|
||||||
return h.registry.Reactivate(ctx, slug)
|
|
||||||
case ActionScheduleDeletion:
|
|
||||||
return h.registry.ScheduleDeletion(ctx, slug, DefaultDeletionGracePeriod)
|
|
||||||
case ActionCancelDeletion:
|
|
||||||
return h.registry.CancelDeletion(ctx, slug)
|
|
||||||
default:
|
|
||||||
return tenant.Tenant{}, ErrUnknownAction
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- HTTP-Bindung ---
|
|
||||||
//
|
|
||||||
// Der Aufrufer wird bewusst als expliziter Query-/Body-Parameter
|
|
||||||
// "superadmin" statt aus einem Auth-Header gelesen — Session-/Token-basierte
|
|
||||||
// Authentifizierung ist Sache von IAM-01/IAM-02 und wird hier NICHT
|
|
||||||
// dupliziert (Kein Umbau angrenzender Bereiche); dieser Handler ist ein
|
|
||||||
// duenner Entwicklungs-/Testzugang, der genau die in requireSuperadmin
|
|
||||||
// beschriebene Berechtigungspruefung durchsetzt.
|
|
||||||
|
|
||||||
func (h *Handler) ListTenantsHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
q := r.URL.Query()
|
|
||||||
items, err := h.ListTenants(r.Context(), q.Get("superadmin"), q.Get("search"), q.Get("status"))
|
|
||||||
writeResult(w, items, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) TenantDetailHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
q := r.URL.Query()
|
|
||||||
detail, err := h.GetTenantDetail(r.Context(), q.Get("superadmin"), q.Get("slug"))
|
|
||||||
writeResult(w, detail, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
type settingsRequest struct {
|
|
||||||
Superadmin string `json:"superadmin"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
DisplayName string `json:"display_name"`
|
|
||||||
LogoURL *string `json:"logo_url"`
|
|
||||||
ColorScheme *string `json:"color_scheme"`
|
|
||||||
Timezone *string `json:"timezone"`
|
|
||||||
Language *string `json:"language"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req settingsRequest
|
|
||||||
if err := decodeJSON(r, &req); err != nil {
|
|
||||||
writeError(w, http.StatusBadRequest, "ungueltiger anfrage-koerper")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
result, err := h.UpdateSettings(r.Context(), req.Superadmin, req.Slug, SettingsPatch{
|
|
||||||
DisplayName: req.DisplayName,
|
|
||||||
LogoURL: req.LogoURL,
|
|
||||||
ColorScheme: req.ColorScheme,
|
|
||||||
Timezone: req.Timezone,
|
|
||||||
Language: req.Language,
|
|
||||||
})
|
|
||||||
writeResult(w, result, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
type lifecycleRequest struct {
|
|
||||||
Superadmin string `json:"superadmin"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Action LifecycleAction `json:"action"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) LifecycleActionHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req lifecycleRequest
|
|
||||||
if err := decodeJSON(r, &req); err != nil {
|
|
||||||
writeError(w, http.StatusBadRequest, "ungueltiger anfrage-koerper")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
result, err := h.PerformLifecycleAction(r.Context(), req.Superadmin, req.Slug, req.Action)
|
|
||||||
writeResult(w, result, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func decodeJSON(r *http.Request, v any) error {
|
|
||||||
return json.NewDecoder(r.Body).Decode(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeJSON(w http.ResponseWriter, status int, body any) {
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(status)
|
|
||||||
_ = json.NewEncoder(w).Encode(body)
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeError(w http.ResponseWriter, status int, message string) {
|
|
||||||
writeJSON(w, status, map[string]string{"error": message})
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeResult(w http.ResponseWriter, body any, err error) {
|
|
||||||
if err == nil {
|
|
||||||
writeJSON(w, http.StatusOK, body)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, ErrNotSuperadmin):
|
|
||||||
writeError(w, http.StatusForbidden, err.Error())
|
|
||||||
case errors.Is(err, ErrMissingDisplayName):
|
|
||||||
writeError(w, http.StatusBadRequest, err.Error())
|
|
||||||
case errors.Is(err, ErrUnknownAction), errors.Is(err, tenant.ErrInvalidTransition):
|
|
||||||
writeError(w, http.StatusBadRequest, err.Error())
|
|
||||||
case errors.Is(err, tenant.ErrTenantNotFound):
|
|
||||||
writeError(w, http.StatusNotFound, err.Error())
|
|
||||||
default:
|
|
||||||
writeError(w, http.StatusInternalServerError, err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,232 +0,0 @@
|
|||||||
package tenantadmin
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenant"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/tenantsettings"
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
type testEnv struct {
|
|
||||||
handler *Handler
|
|
||||||
superadminID string
|
|
||||||
slug string
|
|
||||||
adminPool *pgxpool.Pool
|
|
||||||
registry *tenant.Registry
|
|
||||||
}
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (testEnv, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
registryPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("registry pool: %v", err)
|
|
||||||
}
|
|
||||||
adminPool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("admin pool: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := registryPool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS tenants (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), slug TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
|
||||||
db_name TEXT NOT NULL UNIQUE, db_dsn TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), previous_status TEXT, deletion_scheduled_at TIMESTAMPTZ
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS tenant_settings (
|
|
||||||
tenant_id UUID PRIMARY KEY REFERENCES tenants(id), display_name TEXT, logo_url TEXT,
|
|
||||||
color_scheme TEXT, timezone TEXT, language TEXT, version INT NOT NULL DEFAULT 0,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS tenant_settings_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), tenant_id UUID NOT NULL, display_name TEXT,
|
|
||||||
logo_url TEXT, color_scheme TEXT, timezone TEXT, language TEXT, version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS superadmins (
|
|
||||||
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()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
registry := tenant.NewRegistry(registryPool)
|
|
||||||
dsnTemplate := strings.Replace(adminDSN, "/postgres?", "/%s?", 1)
|
|
||||||
provisioner := tenant.NewProvisioner(adminPool, registry, dsnTemplate)
|
|
||||||
lifecycle := tenant.NewLifecycle(registry, adminPool)
|
|
||||||
settingsStore := tenantsettings.NewStore(registryPool)
|
|
||||||
superadmins := user.NewSuperadminStore(registryPool)
|
|
||||||
|
|
||||||
slug := fmt.Sprintf("tadm_%d", time.Now().UnixNano()%1_000_000_000)
|
|
||||||
if _, err := provisioner.Provision(ctx, slug, "Test Mandant "+slug); err != nil {
|
|
||||||
t.Fatalf("provision: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
admin, err := superadmins.Create(ctx, fmt.Sprintf("admin-%d@example.com", time.Now().UnixNano()), "Test Superadmin")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("superadmin anlegen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := NewHandler(registry, lifecycle, settingsStore, superadmins)
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = adminPool.Exec(ctx, fmt.Sprintf(`DROP DATABASE IF EXISTS %q`, "tenant_"+slug))
|
|
||||||
_, _ = registryPool.Exec(ctx, `DELETE FROM tenant_settings_history WHERE tenant_id IN (SELECT id FROM tenants WHERE slug = $1)`, slug)
|
|
||||||
_, _ = registryPool.Exec(ctx, `DELETE FROM tenant_settings WHERE tenant_id IN (SELECT id FROM tenants WHERE slug = $1)`, slug)
|
|
||||||
_, _ = registryPool.Exec(ctx, `DELETE FROM tenants WHERE slug = $1`, slug)
|
|
||||||
_, _ = registryPool.Exec(ctx, `DELETE FROM superadmins WHERE id = $1`, admin.ID)
|
|
||||||
registryPool.Close()
|
|
||||||
adminPool.Close()
|
|
||||||
}
|
|
||||||
return testEnv{handler: handler, superadminID: admin.ID, slug: slug, adminPool: adminPool, registry: registry}, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: nur berechtigte (aktive) Superadmins
|
|
||||||
// sehen die Mandantenliste ueberhaupt.
|
|
||||||
func TestListTenants_RejectsNonSuperadmin(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
_, err := env.handler.ListTenants(ctx, "irgendeine-nicht-existierende-id", "", "")
|
|
||||||
if !errors.Is(err, ErrNotSuperadmin) {
|
|
||||||
t.Fatalf("erwartet ErrNotSuperadmin, habe: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestListTenants_ShowsSearchAndStatusFilterResults(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
all, err := env.handler.ListTenants(ctx, env.superadminID, "", "")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list: %v", err)
|
|
||||||
}
|
|
||||||
found := false
|
|
||||||
for _, item := range all {
|
|
||||||
if item.Slug == env.slug {
|
|
||||||
found = true
|
|
||||||
if item.Status != "active" {
|
|
||||||
t.Fatalf("status = %q, want active", item.Status)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
t.Fatal("erwartet test-tenant in ungefilterter liste")
|
|
||||||
}
|
|
||||||
|
|
||||||
bySearch, err := env.handler.ListTenants(ctx, env.superadminID, env.slug, "")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list mit suche: %v", err)
|
|
||||||
}
|
|
||||||
if len(bySearch) != 1 || bySearch[0].Slug != env.slug {
|
|
||||||
t.Fatalf("suche nach slug lieferte unerwartetes ergebnis: %+v", bySearch)
|
|
||||||
}
|
|
||||||
|
|
||||||
byWrongStatus, err := env.handler.ListTenants(ctx, env.superadminID, env.slug, "suspended")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list mit statusfilter: %v", err)
|
|
||||||
}
|
|
||||||
if len(byWrongStatus) != 0 {
|
|
||||||
t.Fatalf("statusfilter haette test-tenant (status=active) ausfiltern muessen, habe: %+v", byWrongStatus)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: fehlender Pflichtwert (Anzeigename)
|
|
||||||
// wird serverseitig abgelehnt, bevor etwas gespeichert wird.
|
|
||||||
func TestUpdateSettings_RejectsMissingDisplayName(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
_, err := env.handler.UpdateSettings(ctx, env.superadminID, env.slug, SettingsPatch{DisplayName: " "})
|
|
||||||
if !errors.Is(err, ErrMissingDisplayName) {
|
|
||||||
t.Fatalf("erwartet ErrMissingDisplayName, habe: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUpdateSettings_AppliesValidPatch(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
updated, err := env.handler.UpdateSettings(ctx, env.superadminID, env.slug, SettingsPatch{DisplayName: "Neuer Name"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("update: %v", err)
|
|
||||||
}
|
|
||||||
if updated.DisplayName != "Neuer Name" {
|
|
||||||
t.Fatalf("displayname = %q, want 'Neuer Name'", updated.DisplayName)
|
|
||||||
}
|
|
||||||
|
|
||||||
detail, err := env.handler.GetTenantDetail(ctx, env.superadminID, env.slug)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("detail: %v", err)
|
|
||||||
}
|
|
||||||
if detail.Settings.DisplayName != "Neuer Name" {
|
|
||||||
t.Fatalf("detail zeigt nicht den aktualisierten namen: %+v", detail.Settings)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Lifecycle-Aktionen sind ausloesbar und wirken sich
|
|
||||||
// auf den tatsaechlichen Mandantenstatus aus.
|
|
||||||
func TestPerformLifecycleAction_SuspendAndReactivate(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
suspended, err := env.handler.PerformLifecycleAction(ctx, env.superadminID, env.slug, ActionSuspend)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("suspend: %v", err)
|
|
||||||
}
|
|
||||||
if suspended.Status != tenant.StatusSuspended {
|
|
||||||
t.Fatalf("status = %q, want suspended", suspended.Status)
|
|
||||||
}
|
|
||||||
|
|
||||||
reactivated, err := env.handler.PerformLifecycleAction(ctx, env.superadminID, env.slug, ActionReactivate)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("reactivate: %v", err)
|
|
||||||
}
|
|
||||||
if reactivated.Status != tenant.StatusActive {
|
|
||||||
t.Fatalf("status = %q, want active", reactivated.Status)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPerformLifecycleAction_RejectsInvalidTransition(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
// Reaktivieren eines bereits aktiven Tenants ist kein gueltiger Uebergang.
|
|
||||||
_, err := env.handler.PerformLifecycleAction(ctx, env.superadminID, env.slug, ActionReactivate)
|
|
||||||
if !errors.Is(err, tenant.ErrInvalidTransition) {
|
|
||||||
t.Fatalf("erwartet ErrInvalidTransition, habe: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPerformLifecycleAction_RejectsNonSuperadmin(t *testing.T) {
|
|
||||||
env, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
_, err := env.handler.PerformLifecycleAction(ctx, "keine-berechtigung", env.slug, ActionSuspend)
|
|
||||||
if !errors.Is(err, ErrNotSuperadmin) {
|
|
||||||
t.Fatalf("erwartet ErrNotSuperadmin, habe: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package tenantsettings
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Handler stellt Lesen/Schreiben der Tenant-Einstellungen als schlanke
|
|
||||||
// Vorbereitung der Schnittstelle bereit (API-01/TEN-05 sind nicht Teil
|
|
||||||
// dieser Kachel). tenantID wird hier als Pfad-/Query-Parameter erwartet,
|
|
||||||
// eine echte Auth-/Berechtigungspruefung kommt erst mit IAM-02/RBAC-01.
|
|
||||||
type Handler struct {
|
|
||||||
store *Store
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewHandler(store *Store) *Handler {
|
|
||||||
return &Handler{store: store}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) Get(w http.ResponseWriter, r *http.Request) {
|
|
||||||
tenantID := r.URL.Query().Get("tenant_id")
|
|
||||||
if tenantID == "" {
|
|
||||||
http.Error(w, "tenant_id fehlt", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
settings, err := h.store.Get(r.Context(), tenantID)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "einstellungen konnten nicht geladen werden", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, http.StatusOK, settings)
|
|
||||||
}
|
|
||||||
|
|
||||||
type updateRequest struct {
|
|
||||||
DisplayName *string `json:"display_name"`
|
|
||||||
LogoURL *string `json:"logo_url"`
|
|
||||||
ColorScheme *string `json:"color_scheme"`
|
|
||||||
Timezone *string `json:"timezone"`
|
|
||||||
Language *string `json:"language"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) Update(w http.ResponseWriter, r *http.Request) {
|
|
||||||
tenantID := r.URL.Query().Get("tenant_id")
|
|
||||||
if tenantID == "" {
|
|
||||||
http.Error(w, "tenant_id fehlt", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var req updateRequest
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
settings, err := h.store.Update(r.Context(), tenantID, Patch{
|
|
||||||
DisplayName: req.DisplayName,
|
|
||||||
LogoURL: req.LogoURL,
|
|
||||||
ColorScheme: req.ColorScheme,
|
|
||||||
Timezone: req.Timezone,
|
|
||||||
Language: req.Language,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "einstellungen konnten nicht gespeichert werden", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, http.StatusOK, settings)
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeJSON(w http.ResponseWriter, status int, v any) {
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(status)
|
|
||||||
_ = json.NewEncoder(w).Encode(v)
|
|
||||||
}
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
package tenantsettings
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*Store, string, string, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS tenants (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
slug TEXT NOT NULL UNIQUE,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
db_name TEXT NOT NULL UNIQUE,
|
|
||||||
db_dsn TEXT NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'active',
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS tenant_settings (
|
|
||||||
tenant_id UUID PRIMARY KEY REFERENCES tenants(id),
|
|
||||||
display_name TEXT, logo_url TEXT, color_scheme TEXT, timezone TEXT, language TEXT,
|
|
||||||
version INT NOT NULL DEFAULT 0, updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS tenant_settings_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), tenant_id UUID NOT NULL,
|
|
||||||
display_name TEXT, logo_url TEXT, color_scheme TEXT, timezone TEXT, language TEXT,
|
|
||||||
version INT NOT NULL, changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var tenantA, tenantB string
|
|
||||||
if err := pool.QueryRow(ctx, `INSERT INTO tenants (slug, name, db_name, db_dsn) VALUES ('ts_a', 'A', 'tenant_ts_a', 'unused') RETURNING id`).Scan(&tenantA); err != nil {
|
|
||||||
t.Fatalf("tenant a anlegen: %v", err)
|
|
||||||
}
|
|
||||||
if err := pool.QueryRow(ctx, `INSERT INTO tenants (slug, name, db_name, db_dsn) VALUES ('ts_b', 'B', 'tenant_ts_b', 'unused') RETURNING id`).Scan(&tenantB); err != nil {
|
|
||||||
t.Fatalf("tenant b anlegen: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM tenant_settings_history WHERE tenant_id IN ($1, $2)`, tenantA, tenantB)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM tenant_settings WHERE tenant_id IN ($1, $2)`, tenantA, tenantB)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM tenants WHERE id IN ($1, $2)`, tenantA, tenantB)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return NewStore(pool), tenantA, tenantB, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func strp(s string) *string { return &s }
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: fehlende Werte liefern Defaults, kein Fehler.
|
|
||||||
func TestGet_UnsetTenantReturnsDefaults(t *testing.T) {
|
|
||||||
store, tenantA, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
got, err := store.Get(ctx, tenantA)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get: %v", err)
|
|
||||||
}
|
|
||||||
want := Defaults()
|
|
||||||
if got != want {
|
|
||||||
t.Fatalf("erwartet defaults %+v, habe %+v", want, got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + 2: Teil-Update laesst nicht gesetzte Felder auf Default.
|
|
||||||
func TestUpdate_PartialPatchKeepsOtherFieldsAtDefault(t *testing.T) {
|
|
||||||
store, tenantA, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
got, err := store.Update(ctx, tenantA, Patch{DisplayName: strp("Acme GmbH")})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("update: %v", err)
|
|
||||||
}
|
|
||||||
if got.DisplayName != "Acme GmbH" {
|
|
||||||
t.Fatalf("erwartet 'Acme GmbH', habe %q", got.DisplayName)
|
|
||||||
}
|
|
||||||
d := Defaults()
|
|
||||||
if got.ColorScheme != d.ColorScheme || got.Timezone != d.Timezone || got.Language != d.Language {
|
|
||||||
t.Fatalf("nicht gesetzte felder haetten auf default bleiben sollen, habe %+v", got)
|
|
||||||
}
|
|
||||||
if got.Version != 1 {
|
|
||||||
t.Fatalf("erwartet version 1, habe %d", got.Version)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Aenderung eines Tenants wirkt sich
|
|
||||||
// nicht auf einen anderen aus.
|
|
||||||
func TestUpdate_IsolatedBetweenTenants(t *testing.T) {
|
|
||||||
store, tenantA, tenantB, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Update(ctx, tenantA, Patch{DisplayName: strp("Tenant A")}); err != nil {
|
|
||||||
t.Fatalf("update a: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
gotB, err := store.Get(ctx, tenantB)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get b: %v", err)
|
|
||||||
}
|
|
||||||
if gotB != Defaults() {
|
|
||||||
t.Fatalf("tenant b sollte unberuehrt bei defaults bleiben, habe %+v", gotB)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Aenderungen versioniert nachvollziehbar.
|
|
||||||
func TestUpdate_HistoryTracksVersions(t *testing.T) {
|
|
||||||
store, tenantA, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Update(ctx, tenantA, Patch{DisplayName: strp("v1")}); err != nil {
|
|
||||||
t.Fatalf("update 1: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.Update(ctx, tenantA, Patch{DisplayName: strp("v2")}); err != nil {
|
|
||||||
t.Fatalf("update 2: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.Update(ctx, tenantA, Patch{ColorScheme: strp("dark")}); err != nil {
|
|
||||||
t.Fatalf("update 3: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := store.History(ctx, tenantA)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 3 {
|
|
||||||
t.Fatalf("erwartet 3 historieneintraege, habe %d", len(history))
|
|
||||||
}
|
|
||||||
if history[0].DisplayName != "v1" || history[0].Version != 1 {
|
|
||||||
t.Fatalf("history[0] unerwartet: %+v", history[0])
|
|
||||||
}
|
|
||||||
if history[1].DisplayName != "v2" || history[1].Version != 2 {
|
|
||||||
t.Fatalf("history[1] unerwartet: %+v", history[1])
|
|
||||||
}
|
|
||||||
if history[2].ColorScheme != "dark" || history[2].DisplayName != "v2" || history[2].Version != 3 {
|
|
||||||
t.Fatalf("history[2] unerwartet (display_name haette aus vorherigem update erhalten bleiben sollen): %+v", history[2])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
// Package tenantsettings implementiert Core TEN-03: pro-Tenant-Einstellungen
|
|
||||||
// (Anzeigename, Logo, Farbschema, Zeitzone, Sprache) mit versionierter
|
|
||||||
// Aenderungshistorie und dokumentierten Systemvoreinstellungen.
|
|
||||||
package tenantsettings
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Settings ist der vollstaendig AUFGELOESTE Stand (jede leere Einstellung ist
|
|
||||||
// bereits durch ihren Default ersetzt) — Aufrufer muessen sich nie selbst um
|
|
||||||
// Systemvoreinstellungen kuemmern (Akzeptanzkriterium 2).
|
|
||||||
type Settings struct {
|
|
||||||
DisplayName string
|
|
||||||
LogoURL string
|
|
||||||
ColorScheme string
|
|
||||||
Timezone string
|
|
||||||
Language string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Defaults liefert die dokumentierten Systemvoreinstellungen.
|
|
||||||
func Defaults() Settings {
|
|
||||||
return Settings{
|
|
||||||
DisplayName: "",
|
|
||||||
LogoURL: "",
|
|
||||||
ColorScheme: "system",
|
|
||||||
Timezone: "UTC",
|
|
||||||
Language: "de",
|
|
||||||
Version: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Patch enthaelt nur die Felder, die tatsaechlich geaendert werden sollen —
|
|
||||||
// nil bedeutet "unveraendert lassen", nicht "auf Default zuruecksetzen".
|
|
||||||
type Patch struct {
|
|
||||||
DisplayName *string
|
|
||||||
LogoURL *string
|
|
||||||
ColorScheme *string
|
|
||||||
Timezone *string
|
|
||||||
Language *string
|
|
||||||
}
|
|
||||||
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get liefert die aufgeloesten Einstellungen eines Tenants. Existiert noch
|
|
||||||
// kein Datensatz oder sind einzelne Spalten NULL, werden die jeweiligen
|
|
||||||
// Systemvoreinstellungen eingesetzt (Akzeptanzkriterium 2 / Pruefung 2) —
|
|
||||||
// niemals ein Fehler wegen fehlender Werte.
|
|
||||||
func (s *Store) Get(ctx context.Context, tenantID string) (Settings, error) {
|
|
||||||
var displayName, logoURL, colorScheme, timezone, language *string
|
|
||||||
var version int
|
|
||||||
|
|
||||||
row := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT display_name, logo_url, color_scheme, timezone, language, version
|
|
||||||
FROM tenant_settings WHERE tenant_id = $1
|
|
||||||
`, tenantID)
|
|
||||||
err := row.Scan(&displayName, &logoURL, &colorScheme, &timezone, &language, &version)
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Defaults(), nil
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return Settings{}, fmt.Errorf("einstellungen lesen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
d := Defaults()
|
|
||||||
return Settings{
|
|
||||||
DisplayName: orDefault(displayName, d.DisplayName),
|
|
||||||
LogoURL: orDefault(logoURL, d.LogoURL),
|
|
||||||
ColorScheme: orDefault(colorScheme, d.ColorScheme),
|
|
||||||
Timezone: orDefault(timezone, d.Timezone),
|
|
||||||
Language: orDefault(language, d.Language),
|
|
||||||
Version: version,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func orDefault(v *string, def string) string {
|
|
||||||
if v == nil {
|
|
||||||
return def
|
|
||||||
}
|
|
||||||
return *v
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update wendet patch auf den aktuellen Stand an, erhoeht die Version und
|
|
||||||
// schreibt Stand + Historieneintrag atomar (Akzeptanzkriterium 3). Nicht in
|
|
||||||
// patch gesetzte Felder bleiben unveraendert (bzw. weiterhin auf Default,
|
|
||||||
// wenn sie es vorher schon waren).
|
|
||||||
func (s *Store) Update(ctx context.Context, tenantID string, patch Patch) (Settings, error) {
|
|
||||||
tx, err := s.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return Settings{}, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
var rawDisplayName, rawLogoURL, rawColorScheme, rawTimezone, rawLanguage *string
|
|
||||||
var version int
|
|
||||||
row := tx.QueryRow(ctx, `
|
|
||||||
SELECT display_name, logo_url, color_scheme, timezone, language, version
|
|
||||||
FROM tenant_settings WHERE tenant_id = $1 FOR UPDATE
|
|
||||||
`, tenantID)
|
|
||||||
err = row.Scan(&rawDisplayName, &rawLogoURL, &rawColorScheme, &rawTimezone, &rawLanguage, &version)
|
|
||||||
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Settings{}, fmt.Errorf("aktuellen stand lesen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if patch.DisplayName != nil {
|
|
||||||
rawDisplayName = patch.DisplayName
|
|
||||||
}
|
|
||||||
if patch.LogoURL != nil {
|
|
||||||
rawLogoURL = patch.LogoURL
|
|
||||||
}
|
|
||||||
if patch.ColorScheme != nil {
|
|
||||||
rawColorScheme = patch.ColorScheme
|
|
||||||
}
|
|
||||||
if patch.Timezone != nil {
|
|
||||||
rawTimezone = patch.Timezone
|
|
||||||
}
|
|
||||||
if patch.Language != nil {
|
|
||||||
rawLanguage = patch.Language
|
|
||||||
}
|
|
||||||
newVersion := version + 1
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO tenant_settings (tenant_id, display_name, logo_url, color_scheme, timezone, language, version, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, now())
|
|
||||||
ON CONFLICT (tenant_id) DO UPDATE SET
|
|
||||||
display_name = $2, logo_url = $3, color_scheme = $4, timezone = $5, language = $6, version = $7, updated_at = now()
|
|
||||||
`, tenantID, rawDisplayName, rawLogoURL, rawColorScheme, rawTimezone, rawLanguage, newVersion); err != nil {
|
|
||||||
return Settings{}, fmt.Errorf("einstellungen speichern: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO tenant_settings_history (tenant_id, display_name, logo_url, color_scheme, timezone, language, version, changed_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, now())
|
|
||||||
`, tenantID, rawDisplayName, rawLogoURL, rawColorScheme, rawTimezone, rawLanguage, newVersion); err != nil {
|
|
||||||
return Settings{}, fmt.Errorf("historie schreiben: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return Settings{}, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return s.Get(ctx, tenantID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// History liefert die vollstaendige Versionshistorie eines Tenants
|
|
||||||
// (Akzeptanzkriterium 3 / Pruefung 3-Vorbereitung).
|
|
||||||
func (s *Store) History(ctx context.Context, tenantID string) ([]Settings, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT display_name, logo_url, color_scheme, timezone, language, version
|
|
||||||
FROM tenant_settings_history WHERE tenant_id = $1 ORDER BY version
|
|
||||||
`, tenantID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("historie abfragen: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
d := Defaults()
|
|
||||||
var out []Settings
|
|
||||||
for rows.Next() {
|
|
||||||
var displayName, logoURL, colorScheme, timezone, language *string
|
|
||||||
var version int
|
|
||||||
if err := rows.Scan(&displayName, &logoURL, &colorScheme, &timezone, &language, &version); err != nil {
|
|
||||||
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, Settings{
|
|
||||||
DisplayName: orDefault(displayName, d.DisplayName),
|
|
||||||
LogoURL: orDefault(logoURL, d.LogoURL),
|
|
||||||
ColorScheme: orDefault(colorScheme, d.ColorScheme),
|
|
||||||
Timezone: orDefault(timezone, d.Timezone),
|
|
||||||
Language: orDefault(language, d.Language),
|
|
||||||
Version: version,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler stellt Login (inklusive optionalem zweiten Faktor) und die
|
||||||
|
// 2FA-Einrichtung als HTTP-Endpunkte bereit (IAM-08). Ersetzt auth.Handler.Login
|
||||||
|
// nicht (der bleibt fuer Faelle ohne 2FA-Bedarf nutzbar), bietet aber den
|
||||||
|
// EINEN Login-Endpunkt, den das Frontend tatsaechlich aufruft — LoginWithTOTP
|
||||||
|
// deckt beide Faelle (mit/ohne 2FA) bereits ab.
|
||||||
|
type Handler struct {
|
||||||
|
users *user.TenantUserStore
|
||||||
|
totp *Store
|
||||||
|
login *auth.LoginService
|
||||||
|
issuer string // fuer die otpauth://-Provisioning-URI (Akzeptanzkriterium 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(users *user.TenantUserStore, totpStore *Store, login *auth.LoginService, issuer string) *Handler {
|
||||||
|
return &Handler{users: users, totp: totpStore, login: login, issuer: issuer}
|
||||||
|
}
|
||||||
|
|
||||||
|
type loginRequest struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
TOTPCode string `json:"totp_code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type loginErrorResponse struct {
|
||||||
|
// Error ist bewusst IMMER dieselbe generische Meldung fuer falsches
|
||||||
|
// Passwort/Token (Akzeptanzkriterium 3 / Pruefung 1) — Code unterscheidet
|
||||||
|
// intern zwischen "second_factor_required" (Formular soll TOTP-Feld
|
||||||
|
// einblenden) und "invalid_credentials" (alles andere), ohne dem Client
|
||||||
|
// mehr ueber den tatsaechlichen Fehlgrund zu verraten.
|
||||||
|
Error string `json:"error"`
|
||||||
|
Code string `json:"code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Login ist der einzige Login-Endpunkt des Frontends (Akzeptanzkriterium 1).
|
||||||
|
func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req loginRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := LoginWithTOTP(r.Context(), h.users, h.totp, h.login, req.Email, req.Password, req.TOTPCode)
|
||||||
|
if err != nil {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
if err == ErrSecondFactorRequired {
|
||||||
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
|
_ = json.NewEncoder(w).Encode(loginErrorResponse{
|
||||||
|
Error: "Anmeldedaten oder Code ungültig.",
|
||||||
|
Code: "second_factor_required",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
|
_ = json.NewEncoder(w).Encode(loginErrorResponse{
|
||||||
|
Error: "Anmeldedaten oder Code ungültig.",
|
||||||
|
Code: "invalid_credentials",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: auth.CookieName,
|
||||||
|
Value: token,
|
||||||
|
Path: "/",
|
||||||
|
HttpOnly: true,
|
||||||
|
Secure: true,
|
||||||
|
SameSite: http.SameSiteStrictMode,
|
||||||
|
MaxAge: int(auth.AccessTokenTTL.Seconds()),
|
||||||
|
})
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
type statusResponse struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status liefert, ob 2FA fuer den angemeldeten Benutzer aktiv ist — fuer die
|
||||||
|
// Profilseite (Akzeptanzkriterium 2: zeigt an, ob Einrichtung schon
|
||||||
|
// stattgefunden hat). Muss hinter auth.RequireAuth haengen.
|
||||||
|
func (h *Handler) Status(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
enabled, err := h.totp.IsEnabled(r.Context(), claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "status konnte nicht ermittelt werden", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(statusResponse{Enabled: enabled})
|
||||||
|
}
|
||||||
|
|
||||||
|
type setupBeginResponse struct {
|
||||||
|
Secret string `json:"secret"`
|
||||||
|
ProvisioningURI string `json:"provisioning_uri"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetupBegin startet die 2FA-Einrichtung (Akzeptanzkriterium 2) — muss hinter
|
||||||
|
// auth.RequireAuth haengen.
|
||||||
|
func (h *Handler) SetupBegin(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
u, err := h.users.Get(r.Context(), claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "benutzer nicht gefunden", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
secret, uri, err := h.totp.BeginSetup(r.Context(), claims.UserID, h.issuer, u.Email)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "einrichtung konnte nicht gestartet werden", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(setupBeginResponse{Secret: secret, ProvisioningURI: uri})
|
||||||
|
}
|
||||||
|
|
||||||
|
type setupConfirmRequest struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type setupConfirmResponse struct {
|
||||||
|
RecoveryCodes []string `json:"recovery_codes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetupConfirm bestaetigt die Einrichtung und liefert die Wiederherstellungscodes
|
||||||
|
// EINMALIG im Klartext (Akzeptanzkriterium 2) — muss hinter auth.RequireAuth haengen.
|
||||||
|
func (h *Handler) SetupConfirm(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req setupConfirmRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
codes, err := h.totp.ConfirmSetup(r.Context(), claims.UserID, req.Code)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Code ungültig.", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(setupConfirmResponse{RecoveryCodes: codes})
|
||||||
|
}
|
||||||
@@ -0,0 +1,171 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
func emailForUser(t *testing.T, users *user.TenantUserStore, userID string) string {
|
||||||
|
t.Helper()
|
||||||
|
u, err := users.Get(context.Background(), userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("benutzer laden: %v", err)
|
||||||
|
}
|
||||||
|
return u.Email
|
||||||
|
}
|
||||||
|
|
||||||
|
// authenticatedRequest baut einen Request mit echtem, gueltigem
|
||||||
|
// Session-Cookie (echter Issuer, echte Verifikation ueber auth.RequireAuth) —
|
||||||
|
// kein simulierter Context, dasselbe Muster wie internal/oidc (IAM-13).
|
||||||
|
func authenticatedRequest(t *testing.T, issuer *auth.TokenIssuer, userID string, req *http.Request) *http.Request {
|
||||||
|
t.Helper()
|
||||||
|
token, err := issuer.Issue(userID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
req.AddCookie(&http.Cookie{Name: auth.CookieName, Value: token})
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + Pruefung 1: Login ohne 2FA funktioniert normal,
|
||||||
|
// Login mit falschem Passwort liefert die generische Fehlermeldung.
|
||||||
|
func TestHandlerLogin_WithoutTOTP(t *testing.T) {
|
||||||
|
store, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
login := auth.NewLoginService(users, auth.NewTokenIssuer("test-secret"), "acme")
|
||||||
|
h := NewHandler(users, store, login, "NEXARCH")
|
||||||
|
|
||||||
|
body, _ := json.Marshal(map[string]string{"email": emailForUser(t, users, userID), "password": "korrektes-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/auth/login", bytes.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.Login(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200, body: %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
if len(rec.Result().Cookies()) == 0 {
|
||||||
|
t.Fatal("erwartet gesetztes session-cookie")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandlerLogin_WrongPassword_GivesGenericError(t *testing.T) {
|
||||||
|
store, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
login := auth.NewLoginService(users, auth.NewTokenIssuer("test-secret"), "acme")
|
||||||
|
h := NewHandler(users, store, login, "NEXARCH")
|
||||||
|
|
||||||
|
body, _ := json.Marshal(map[string]string{"email": emailForUser(t, users, userID), "password": "falsches-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/auth/login", bytes.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.Login(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
var resp loginErrorResponse
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
|
||||||
|
t.Fatalf("response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Error != "Anmeldedaten oder Code ungültig." {
|
||||||
|
t.Fatalf("erwartet generische Fehlermeldung, habe %q (koennte interne Details preisgeben)", resp.Error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 + 2: mit aktivem 2FA verlangt Login den Code,
|
||||||
|
// Setup-Confirm liefert die Wiederherstellungscodes EINMALIG.
|
||||||
|
func TestHandlerLogin_WithTOTP_RequiresCode(t *testing.T) {
|
||||||
|
store, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
secret, _, err := store.BeginSetup(ctx, userID, "NEXARCH", "user@example.com")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("begin setup: %v", err)
|
||||||
|
}
|
||||||
|
code, err := GenerateCode(secret, time.Now())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("code generieren: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := store.ConfirmSetup(ctx, userID, code); err != nil {
|
||||||
|
t.Fatalf("confirm setup: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
login := auth.NewLoginService(users, auth.NewTokenIssuer("test-secret"), "acme")
|
||||||
|
h := NewHandler(users, store, login, "NEXARCH")
|
||||||
|
email := emailForUser(t, users, userID)
|
||||||
|
|
||||||
|
// Ohne Code: second_factor_required, kein Cookie.
|
||||||
|
body, _ := json.Marshal(map[string]string{"email": email, "password": "korrektes-passwort"})
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/auth/login", bytes.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.Login(rec, req)
|
||||||
|
if rec.Code != http.StatusUnauthorized {
|
||||||
|
t.Fatalf("ohne code: status = %d, want 401", rec.Code)
|
||||||
|
}
|
||||||
|
var resp loginErrorResponse
|
||||||
|
_ = json.Unmarshal(rec.Body.Bytes(), &resp)
|
||||||
|
if resp.Code != "second_factor_required" {
|
||||||
|
t.Fatalf("erwartet code=second_factor_required, habe %q", resp.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mit gueltigem Code: Login gelingt.
|
||||||
|
freshCode, _ := GenerateCode(secret, time.Now())
|
||||||
|
body2, _ := json.Marshal(map[string]string{"email": email, "password": "korrektes-passwort", "totp_code": freshCode})
|
||||||
|
req2 := httptest.NewRequest(http.MethodPost, "/auth/login", bytes.NewReader(body2))
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.Login(rec2, req2)
|
||||||
|
if rec2.Code != http.StatusOK {
|
||||||
|
t.Fatalf("mit code: status = %d, want 200, body: %s", rec2.Code, rec2.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandlerSetupConfirm_ReturnsRecoveryCodes(t *testing.T) {
|
||||||
|
store, users, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
login := auth.NewLoginService(users, auth.NewTokenIssuer("test-secret"), "acme")
|
||||||
|
sessionIssuer := auth.NewTokenIssuer("test-session-secret")
|
||||||
|
h := NewHandler(users, store, login, "NEXARCH")
|
||||||
|
|
||||||
|
beginReq := authenticatedRequest(t, sessionIssuer, userID, httptest.NewRequest(http.MethodPost, "/auth/totp/setup/begin", nil))
|
||||||
|
beginRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(sessionIssuer, h.SetupBegin)(beginRec, beginReq)
|
||||||
|
if beginRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("setup begin: status = %d, body: %s", beginRec.Code, beginRec.Body.String())
|
||||||
|
}
|
||||||
|
var beginResp setupBeginResponse
|
||||||
|
if err := json.Unmarshal(beginRec.Body.Bytes(), &beginResp); err != nil {
|
||||||
|
t.Fatalf("begin-response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
code, err := GenerateCode(beginResp.Secret, time.Now())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("code generieren: %v", err)
|
||||||
|
}
|
||||||
|
confirmBody, _ := json.Marshal(setupConfirmRequest{Code: code})
|
||||||
|
confirmReq := authenticatedRequest(t, sessionIssuer, userID,
|
||||||
|
httptest.NewRequest(http.MethodPost, "/auth/totp/setup/confirm", bytes.NewReader(confirmBody)))
|
||||||
|
confirmRec := httptest.NewRecorder()
|
||||||
|
auth.RequireAuth(sessionIssuer, h.SetupConfirm)(confirmRec, confirmReq)
|
||||||
|
|
||||||
|
if confirmRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("setup confirm: status = %d, body: %s", confirmRec.Code, confirmRec.Body.String())
|
||||||
|
}
|
||||||
|
var confirmResp setupConfirmResponse
|
||||||
|
if err := json.Unmarshal(confirmRec.Body.Bytes(), &confirmResp); err != nil {
|
||||||
|
t.Fatalf("confirm-response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(confirmResp.RecoveryCodes) != RecoveryCodeCount {
|
||||||
|
t.Fatalf("erwartet %d wiederherstellungscodes, habe %d", RecoveryCodeCount, len(confirmResp.RecoveryCodes))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrSecondFactorRequired = errors.New("totp: zweiter faktor erforderlich")
|
||||||
|
|
||||||
|
// LoginWithTOTP komponiert IAM-02s LoginService mit der 2FA-Pruefung, ohne
|
||||||
|
// LoginService selbst zu veraendern. Ist 2FA fuer den Benutzer aktiv, MUSS
|
||||||
|
// totpCode gueltig sein (Akzeptanzkriterium 2) — ein leerer/falscher Code
|
||||||
|
// wird zuverlaessig abgewiesen, auch bei korrektem Passwort.
|
||||||
|
func LoginWithTOTP(ctx context.Context, users *user.TenantUserStore, totpStore *Store, login *auth.LoginService, email, password, totpCode string) (token string, err error) {
|
||||||
|
creds, err := users.GetByEmailForAuth(ctx, email)
|
||||||
|
if err != nil {
|
||||||
|
return "", auth.ErrInvalidCredentials
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled, err := totpStore.IsEnabled(ctx, creds.User.ID)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if enabled {
|
||||||
|
if totpCode == "" {
|
||||||
|
return "", ErrSecondFactorRequired
|
||||||
|
}
|
||||||
|
ok, err := totpStore.VerifyLoginCode(ctx, creds.User.ID, totpCode)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
return "", ErrSecondFactorRequired
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return login.Login(ctx, email, password)
|
||||||
|
}
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrInvalidCode = errors.New("totp: code ungueltig")
|
||||||
|
ErrNotConfirmed = errors.New("totp: einrichtung noch nicht bestaetigt")
|
||||||
|
ErrRecoveryCodeUsed = errors.New("totp: wiederherstellungscode bereits verwendet oder ungueltig")
|
||||||
|
)
|
||||||
|
|
||||||
|
const RecoveryCodeCount = 10
|
||||||
|
|
||||||
|
type Store struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStore(pool *pgxpool.Pool) *Store {
|
||||||
|
return &Store{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BeginSetup erzeugt ein neues Secret fuer einen Benutzer und speichert es
|
||||||
|
// als NOCH NICHT bestaetigt — der Code muss vor Aktivierung einmal
|
||||||
|
// verifiziert werden (Akzeptanzkriterium 1).
|
||||||
|
func (s *Store) BeginSetup(ctx context.Context, userID, issuer, accountName string) (secret, provisioningURI string, err error) {
|
||||||
|
secret, err = GenerateSecret()
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO totp_credentials (user_id, secret, confirmed)
|
||||||
|
VALUES ($1, $2, false)
|
||||||
|
ON CONFLICT (user_id) DO UPDATE SET secret = $2, confirmed = false
|
||||||
|
`, userID, secret)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("totp-einrichtung speichern: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return secret, ProvisioningURI(issuer, accountName, secret), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConfirmSetup verifiziert den ersten eingegebenen Code und aktiviert 2FA
|
||||||
|
// erst dann (Akzeptanzkriterium 1). Bei Erfolg werden einmalig
|
||||||
|
// Wiederherstellungscodes erzeugt und im Klartext zurueckgegeben — gespeichert
|
||||||
|
// wird nur deren Hash.
|
||||||
|
func (s *Store) ConfirmSetup(ctx context.Context, userID, code string) (recoveryCodes []string, err error) {
|
||||||
|
var secret string
|
||||||
|
if err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT secret FROM totp_credentials WHERE user_id = $1
|
||||||
|
`, userID).Scan(&secret); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, ErrNotConfirmed
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("secret lesen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ok, err := Validate(secret, code, time.Now())
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
return nil, ErrInvalidCode
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := s.pool.Exec(ctx, `UPDATE totp_credentials SET confirmed = true WHERE user_id = $1`, userID); err != nil {
|
||||||
|
return nil, fmt.Errorf("bestaetigung speichern: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
recoveryCodes, err = s.generateRecoveryCodes(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return recoveryCodes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) generateRecoveryCodes(ctx context.Context, userID string) ([]string, error) {
|
||||||
|
codes := make([]string, RecoveryCodeCount)
|
||||||
|
for i := range codes {
|
||||||
|
buf := make([]byte, 8)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return nil, fmt.Errorf("wiederherstellungscode erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
code := hex.EncodeToString(buf)
|
||||||
|
codes[i] = code
|
||||||
|
|
||||||
|
hash := hashRecoveryCode(code)
|
||||||
|
if _, err := s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO totp_recovery_codes (user_id, code_hash) VALUES ($1, $2)
|
||||||
|
`, userID, hash); err != nil {
|
||||||
|
return nil, fmt.Errorf("wiederherstellungscode speichern: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return codes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsEnabled prueft, ob 2FA fuer einen Benutzer aktiv (bestaetigt) ist.
|
||||||
|
func (s *Store) IsEnabled(ctx context.Context, userID string) (bool, error) {
|
||||||
|
var confirmed bool
|
||||||
|
err := s.pool.QueryRow(ctx, `SELECT confirmed FROM totp_credentials WHERE user_id = $1`, userID).Scan(&confirmed)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("status lesen: %w", err)
|
||||||
|
}
|
||||||
|
return confirmed, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// VerifyLoginCode akzeptiert entweder einen gueltigen TOTP-Code oder einen
|
||||||
|
// noch nicht verwendeten Wiederherstellungscode (Akzeptanzkriterium 2 + 3).
|
||||||
|
func (s *Store) VerifyLoginCode(ctx context.Context, userID, code string) (bool, error) {
|
||||||
|
var secret string
|
||||||
|
var confirmed bool
|
||||||
|
err := s.pool.QueryRow(ctx, `SELECT secret, confirmed FROM totp_credentials WHERE user_id = $1`, userID).Scan(&secret, &confirmed)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) || !confirmed {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("secret lesen: %w", err)
|
||||||
|
}
|
||||||
|
if !confirmed {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if ok, err := Validate(secret, code, time.Now()); err != nil {
|
||||||
|
return false, err
|
||||||
|
} else if ok {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.consumeRecoveryCode(ctx, userID, code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// consumeRecoveryCode markiert einen Wiederherstellungscode atomar als
|
||||||
|
// verwendet (WHERE used_at IS NULL) — ein bereits verbrauchter Code kann
|
||||||
|
// nicht doppelt eingeloest werden (Akzeptanzkriterium 3 / Pruefung 2).
|
||||||
|
func (s *Store) consumeRecoveryCode(ctx context.Context, userID, code string) (bool, error) {
|
||||||
|
hash := hashRecoveryCode(code)
|
||||||
|
tag, err := s.pool.Exec(ctx, `
|
||||||
|
UPDATE totp_recovery_codes SET used_at = now()
|
||||||
|
WHERE user_id = $1 AND code_hash = $2 AND used_at IS NULL
|
||||||
|
`, userID, hash)
|
||||||
|
if err != nil {
|
||||||
|
return false, fmt.Errorf("wiederherstellungscode einloesen: %w", err)
|
||||||
|
}
|
||||||
|
return tag.RowsAffected() == 1, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func hashRecoveryCode(code string) []byte {
|
||||||
|
sum := sha256.Sum256([]byte(code))
|
||||||
|
return sum[:]
|
||||||
|
}
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest(t *testing.T) (*Store, *user.TenantUserStore, string, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), email TEXT NOT NULL UNIQUE, name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active', password_hash TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS totp_credentials (
|
||||||
|
user_id UUID PRIMARY KEY REFERENCES users(id), secret TEXT NOT NULL,
|
||||||
|
confirmed BOOLEAN NOT NULL DEFAULT false, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS totp_recovery_codes (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
code_hash BYTEA NOT NULL UNIQUE, used_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
userStore := user.NewTenantUserStore(pool)
|
||||||
|
email := fmt.Sprintf("totp-test-%d@example.com", time.Now().UnixNano())
|
||||||
|
u, err := userStore.Create(ctx, email, "TOTP Test")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create user: %v", err)
|
||||||
|
}
|
||||||
|
hash, err := auth.HashPassword("korrektes-passwort")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash: %v", err)
|
||||||
|
}
|
||||||
|
if err := userStore.SetPasswordHash(ctx, u.ID, hash); err != nil {
|
||||||
|
t.Fatalf("set password: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup := func() { pool.Close() }
|
||||||
|
return NewStore(pool), userStore, u.ID, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Einrichtung per QR-Code (URI), Bestaetigung vor Aktivierung.
|
||||||
|
func TestBeginAndConfirmSetup(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
secret, uri, err := store.BeginSetup(ctx, userID, "NEXARCH", "user@example.com")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("begin setup: %v", err)
|
||||||
|
}
|
||||||
|
if uri == "" {
|
||||||
|
t.Fatal("erwartet nicht-leere provisioning-uri")
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled, err := store.IsEnabled(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled (vor bestaetigung): %v", err)
|
||||||
|
}
|
||||||
|
if enabled {
|
||||||
|
t.Fatal("erwartet NICHT aktiviert vor bestaetigung")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Falscher Code darf nicht aktivieren.
|
||||||
|
if _, err := store.ConfirmSetup(ctx, userID, "000000"); !errors.Is(err, ErrInvalidCode) && err == nil {
|
||||||
|
t.Fatalf("erwartet ablehnung bei falschem code, habe err=%v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
code, err := GenerateCode(secret, time.Now())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate code: %v", err)
|
||||||
|
}
|
||||||
|
recoveryCodes, err := store.ConfirmSetup(ctx, userID, code)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("confirm setup: %v", err)
|
||||||
|
}
|
||||||
|
if len(recoveryCodes) != RecoveryCodeCount {
|
||||||
|
t.Fatalf("erwartet %d wiederherstellungscodes, habe %d", RecoveryCodeCount, len(recoveryCodes))
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled, err = store.IsEnabled(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("is enabled (nach bestaetigung): %v", err)
|
||||||
|
}
|
||||||
|
if !enabled {
|
||||||
|
t.Fatal("erwartet aktiviert nach erfolgreicher bestaetigung")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Login ohne zweiten Faktor bei aktivem
|
||||||
|
// 2FA wird zuverlaessig abgewiesen.
|
||||||
|
func TestLoginWithTOTP_RequiresSecondFactorWhenEnabled(t *testing.T) {
|
||||||
|
store, userStore, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
secret, _, err := store.BeginSetup(ctx, userID, "NEXARCH", "user@example.com")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("begin setup: %v", err)
|
||||||
|
}
|
||||||
|
code, _ := GenerateCode(secret, time.Now())
|
||||||
|
if _, err := store.ConfirmSetup(ctx, userID, code); err != nil {
|
||||||
|
t.Fatalf("confirm setup: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
u, err := userStore.Get(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get user: %v", err)
|
||||||
|
}
|
||||||
|
issuer := auth.NewTokenIssuer("test-secret-nur-fuer-tests")
|
||||||
|
loginService := auth.NewLoginService(userStore, issuer, "acme")
|
||||||
|
|
||||||
|
// Korrektes Passwort, aber KEIN 2FA-Code -> abgewiesen.
|
||||||
|
if _, err := LoginWithTOTP(ctx, userStore, store, loginService, u.Email, "korrektes-passwort", ""); !errors.Is(err, ErrSecondFactorRequired) {
|
||||||
|
t.Fatalf("erwartet ErrSecondFactorRequired ohne code, habe %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Korrektes Passwort + korrekter aktueller Code -> erfolgreich.
|
||||||
|
loginCode, _ := GenerateCode(secret, time.Now())
|
||||||
|
token, err := LoginWithTOTP(ctx, userStore, store, loginService, u.Email, "korrektes-passwort", loginCode)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("login mit gueltigem 2fa-code: %v", err)
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
t.Fatal("erwartet gueltiges token")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 2: Wiederherstellungscode nach Nutzung als
|
||||||
|
// verbraucht getestet.
|
||||||
|
func TestVerifyLoginCode_RecoveryCodeIsSingleUse(t *testing.T) {
|
||||||
|
store, _, userID, cleanup := setupTest(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
secret, _, err := store.BeginSetup(ctx, userID, "NEXARCH", "user@example.com")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("begin setup: %v", err)
|
||||||
|
}
|
||||||
|
code, _ := GenerateCode(secret, time.Now())
|
||||||
|
recoveryCodes, err := store.ConfirmSetup(ctx, userID, code)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("confirm setup: %v", err)
|
||||||
|
}
|
||||||
|
recovery := recoveryCodes[0]
|
||||||
|
|
||||||
|
ok, err := store.VerifyLoginCode(ctx, userID, recovery)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify (erste nutzung): %v", err)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("erwartet erfolgreiche erste nutzung des wiederherstellungscodes")
|
||||||
|
}
|
||||||
|
|
||||||
|
ok, err = store.VerifyLoginCode(ctx, userID, recovery)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify (zweite nutzung): %v", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("erwartet abgelehnt bei erneuter nutzung desselben wiederherstellungscodes")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
// Package totp implementiert Core IAM-04: TOTP-basierte Zwei-Faktor-
|
||||||
|
// Authentifizierung (RFC 6238, aufbauend auf HOTP RFC 4226) mit stdlib
|
||||||
|
// crypto/hmac+sha1 — kein externes Modul noetig.
|
||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/hmac"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/sha1"
|
||||||
|
"crypto/subtle"
|
||||||
|
"encoding/base32"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"net/url"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// StepSeconds ist das TOTP-Zeitfenster (RFC-6238-Standard: 30 Sekunden).
|
||||||
|
const StepSeconds = 30
|
||||||
|
|
||||||
|
// DefaultSkewSteps ist die dokumentierte Zeitversatz-Toleranz
|
||||||
|
// (Akzeptanzkriterium/Pruefung 3): +/- 1 Schritt = +/- 30 Sekunden um die
|
||||||
|
// aktuelle Serverzeit, insgesamt ein 90-Sekunden-Fenster. Grosszuegig genug
|
||||||
|
// fuer leicht abweichende Client-Uhren, eng genug um ein TOTP-Fenster nicht
|
||||||
|
// unbrauchbar lange gueltig zu lassen.
|
||||||
|
const DefaultSkewSteps = 1
|
||||||
|
|
||||||
|
// GenerateSecret erzeugt ein neues, zufaelliges TOTP-Secret (20 Byte, wie von
|
||||||
|
// Authenticator-Apps erwartet), Base32-kodiert ohne Padding.
|
||||||
|
func GenerateSecret() (string, error) {
|
||||||
|
buf := make([]byte, 20)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return "", fmt.Errorf("secret erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
return base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(buf), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ProvisioningURI liefert die otpauth://-URI fuer den QR-Code
|
||||||
|
// (Akzeptanzkriterium 1) — das eigentliche QR-Rendering ist Frontend-Sache
|
||||||
|
// (IAM-08), hier wird nur die standardkonforme URI erzeugt.
|
||||||
|
func ProvisioningURI(issuer, accountName, secret string) string {
|
||||||
|
label := url.PathEscape(issuer) + ":" + url.PathEscape(accountName)
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("secret", secret)
|
||||||
|
q.Set("issuer", issuer)
|
||||||
|
q.Set("algorithm", "SHA1")
|
||||||
|
q.Set("digits", "6")
|
||||||
|
q.Set("period", fmt.Sprintf("%d", StepSeconds))
|
||||||
|
return fmt.Sprintf("otpauth://totp/%s?%s", label, q.Encode())
|
||||||
|
}
|
||||||
|
|
||||||
|
// GenerateCode berechnet den 6-stelligen TOTP-Code fuer secret zum Zeitpunkt t.
|
||||||
|
func GenerateCode(secret string, t time.Time) (string, error) {
|
||||||
|
key, err := decodeSecret(secret)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
counter := uint64(t.Unix() / StepSeconds)
|
||||||
|
return hotp(key, counter), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate prueft code gegen secret mit der dokumentierten Zeitversatz-
|
||||||
|
// Toleranz (DefaultSkewSteps) um t. Vergleich ist timing-safe.
|
||||||
|
func Validate(secret, code string, t time.Time) (bool, error) {
|
||||||
|
key, err := decodeSecret(secret)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
counter := int64(t.Unix() / StepSeconds)
|
||||||
|
|
||||||
|
for delta := -DefaultSkewSteps; delta <= DefaultSkewSteps; delta++ {
|
||||||
|
candidate := hotp(key, uint64(counter+int64(delta)))
|
||||||
|
if subtle.ConstantTimeCompare([]byte(candidate), []byte(code)) == 1 {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeSecret(secret string) ([]byte, error) {
|
||||||
|
key, err := base32.StdEncoding.WithPadding(base32.NoPadding).DecodeString(secret)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("secret dekodieren: %w", err)
|
||||||
|
}
|
||||||
|
return key, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// hotp implementiert RFC 4226 mit HMAC-SHA1, 6 Ziffern.
|
||||||
|
func hotp(key []byte, counter uint64) string {
|
||||||
|
buf := make([]byte, 8)
|
||||||
|
binary.BigEndian.PutUint64(buf, counter)
|
||||||
|
|
||||||
|
mac := hmac.New(sha1.New, key)
|
||||||
|
mac.Write(buf)
|
||||||
|
sum := mac.Sum(nil)
|
||||||
|
|
||||||
|
offset := sum[len(sum)-1] & 0x0f
|
||||||
|
code := (uint32(sum[offset]&0x7f) << 24) |
|
||||||
|
(uint32(sum[offset+1]) << 16) |
|
||||||
|
(uint32(sum[offset+2]) << 8) |
|
||||||
|
uint32(sum[offset+3])
|
||||||
|
|
||||||
|
return fmt.Sprintf("%06d", code%1000000)
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package totp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGenerateAndValidateCode_RoundTrip(t *testing.T) {
|
||||||
|
secret, err := GenerateSecret()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate secret: %v", err)
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
code, err := GenerateCode(secret, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate code: %v", err)
|
||||||
|
}
|
||||||
|
if len(code) != 6 {
|
||||||
|
t.Fatalf("erwartet 6-stelligen code, habe %q", code)
|
||||||
|
}
|
||||||
|
|
||||||
|
ok, err := Validate(secret, code, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("validate: %v", err)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("erwartet gueltigen code")
|
||||||
|
}
|
||||||
|
|
||||||
|
wrongCode := "000000"
|
||||||
|
if code == wrongCode {
|
||||||
|
wrongCode = "111111"
|
||||||
|
}
|
||||||
|
ok, err = Validate(secret, wrongCode, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("validate (falsch): %v", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("erwartet ungueltig fuer falschen code")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium/Pruefung 3: Zeitversatz-Toleranz dokumentiert (siehe
|
||||||
|
// DefaultSkewSteps = 1 Schritt = 30s) und getestet.
|
||||||
|
func TestValidate_ClockSkewTolerance(t *testing.T) {
|
||||||
|
secret, err := GenerateSecret()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate secret: %v", err)
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
// Code aus dem VORHERIGEN Zeitfenster (bis zu 30s in der Vergangenheit)
|
||||||
|
// muss innerhalb der dokumentierten Toleranz noch akzeptiert werden.
|
||||||
|
pastCode, err := GenerateCode(secret, now.Add(-25*time.Second))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate code (past): %v", err)
|
||||||
|
}
|
||||||
|
ok, err := Validate(secret, pastCode, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("validate (past): %v", err)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("erwartet gueltig innerhalb der dokumentierten skew-toleranz (25s)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Code weit ausserhalb der Toleranz (mehrere Schritte in der
|
||||||
|
// Vergangenheit) muss abgelehnt werden.
|
||||||
|
farPastCode, err := GenerateCode(secret, now.Add(-5*time.Minute))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate code (far past): %v", err)
|
||||||
|
}
|
||||||
|
ok, err = Validate(secret, farPastCode, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("validate (far past): %v", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("erwartet ungueltig weit ausserhalb der skew-toleranz (5min)")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -103,6 +103,71 @@ func (s *TenantUserStore) Deactivate(ctx context.Context, id string) (User, erro
|
|||||||
`, id, StatusInactive))
|
`, id, StatusInactive))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetPasswordHash schreibt einen bereits berechneten bcrypt-Hash (siehe
|
||||||
|
// internal/auth, IAM-02). Der Store selbst kennt kein Klartext-Passwort.
|
||||||
|
func (s *TenantUserStore) SetPasswordHash(ctx context.Context, id, hash string) error {
|
||||||
|
tag, err := s.pool.Exec(ctx, `
|
||||||
|
UPDATE users SET password_hash = $2, updated_at = now() WHERE id = $1
|
||||||
|
`, id, hash)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("passwort setzen: %w", err)
|
||||||
|
}
|
||||||
|
if tag.RowsAffected() == 0 {
|
||||||
|
return ErrNotFound
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AuthCredentials wird ausschliesslich fuer den Login-Pfad (internal/auth)
|
||||||
|
// verwendet und traegt bewusst den password_hash, damit er nicht ueber den
|
||||||
|
// regulaeren User-Typ/JSON-Serialisierungspfad nach aussen dringen kann.
|
||||||
|
type AuthCredentials struct {
|
||||||
|
User User
|
||||||
|
PasswordHash string
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetByIDForAuth liefert Benutzer + Passwort-Hash zu einer User-ID — fuer
|
||||||
|
// IAM-08 (Passwortaenderung: die bestehende Session liefert die ID, nicht
|
||||||
|
// die E-Mail-Adresse, gleiches Prinzip wie GetByEmailForAuth).
|
||||||
|
func (s *TenantUserStore) GetByIDForAuth(ctx context.Context, id string) (AuthCredentials, error) {
|
||||||
|
var c AuthCredentials
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at, password_hash
|
||||||
|
FROM users WHERE id = $1
|
||||||
|
`, id)
|
||||||
|
|
||||||
|
if err := row.Scan(&c.User.ID, &c.User.Email, &c.User.Name, &c.User.Status,
|
||||||
|
&c.User.CreatedAt, &c.User.UpdatedAt, &c.PasswordHash); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return AuthCredentials{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return AuthCredentials{}, fmt.Errorf("anmeldedaten lesen: %w", err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetByEmailForAuth liefert Benutzer + Passwort-Hash zu einer E-Mail-Adresse
|
||||||
|
// aus GENAU DIESER Tenant-Datenbank — der Tenant-Scope ergibt sich damit
|
||||||
|
// zwingend aus dem verwendeten Pool, es gibt keine Moeglichkeit, versehentlich
|
||||||
|
// ueber Tenant-Grenzen hinweg zu suchen (bekannter archivmail-Fehler, siehe
|
||||||
|
// IAM-02 "Bekannte Fehler vermeiden").
|
||||||
|
func (s *TenantUserStore) GetByEmailForAuth(ctx context.Context, email string) (AuthCredentials, error) {
|
||||||
|
var c AuthCredentials
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, email, name, status, created_at, updated_at, password_hash
|
||||||
|
FROM users WHERE email = $1
|
||||||
|
`, email)
|
||||||
|
|
||||||
|
if err := row.Scan(&c.User.ID, &c.User.Email, &c.User.Name, &c.User.Status,
|
||||||
|
&c.User.CreatedAt, &c.User.UpdatedAt, &c.PasswordHash); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return AuthCredentials{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return AuthCredentials{}, fmt.Errorf("anmeldedaten lesen: %w", err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
func scanUser(row pgx.Row) (User, error) {
|
func scanUser(row pgx.Row) (User, error) {
|
||||||
var u User
|
var u User
|
||||||
if err := row.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
if err := row.Scan(&u.ID, &u.Email, &u.Name, &u.Status, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE tenants DROP COLUMN previous_status;
|
|
||||||
ALTER TABLE tenants DROP COLUMN deletion_scheduled_at;
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
-- Lebenszyklus-Zustaende fuer Mandanten (TEN-04, siehe core-kanban/tickets/TEN-04.md).
|
|
||||||
-- previous_status haelt den Zustand VOR einer Loeschvormerkung, damit
|
|
||||||
-- CancelDeletion "den vorherigen Zustand vollstaendig wiederherstellt"
|
|
||||||
-- (aktiv ODER suspendiert), statt hart auf 'active' zurueckzusetzen.
|
|
||||||
ALTER TABLE tenants ADD COLUMN previous_status TEXT;
|
|
||||||
ALTER TABLE tenants ADD COLUMN deletion_scheduled_at TIMESTAMPTZ;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS tenant_settings_history;
|
|
||||||
DROP TABLE IF EXISTS tenant_settings;
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
-- Pro-Tenant-Einstellungen & Branding (TEN-03, siehe core-kanban/tickets/TEN-03.md).
|
|
||||||
-- Alle Spalten NULLABLE: ein fehlender Wert bedeutet "System-Default
|
|
||||||
-- verwenden" (Akzeptanzkriterium 2), niemals ein Fehler.
|
|
||||||
CREATE TABLE tenant_settings (
|
|
||||||
tenant_id UUID PRIMARY KEY REFERENCES tenants(id),
|
|
||||||
display_name TEXT,
|
|
||||||
logo_url TEXT,
|
|
||||||
color_scheme TEXT,
|
|
||||||
timezone TEXT,
|
|
||||||
language TEXT,
|
|
||||||
version INT NOT NULL DEFAULT 0,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE tenant_settings_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
tenant_id UUID NOT NULL,
|
|
||||||
display_name TEXT,
|
|
||||||
logo_url TEXT,
|
|
||||||
color_scheme TEXT,
|
|
||||||
timezone TEXT,
|
|
||||||
language TEXT,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX tenant_settings_history_tenant_idx ON tenant_settings_history (tenant_id, version);
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE users DROP COLUMN password_hash;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- Passwort-Hash-Spalte fuer Login (IAM-02, siehe core-kanban/tickets/IAM-02.md).
|
||||||
|
-- Enthaelt AUSSCHLIESSLICH den bcrypt-Hash, niemals das Klartext-Passwort.
|
||||||
|
ALTER TABLE users ADD COLUMN password_hash TEXT NOT NULL DEFAULT '';
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS password_tokens;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- Einmal-Token fuer Passwort-Reset und Einladung (IAM-03, siehe
|
||||||
|
-- core-kanban/tickets/IAM-03.md). token_hash enthaelt NIEMALS den
|
||||||
|
-- Klartext-Token, nur dessen SHA-256-Hash.
|
||||||
|
CREATE TABLE password_tokens (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
token_hash BYTEA NOT NULL UNIQUE,
|
||||||
|
purpose TEXT NOT NULL CHECK (purpose IN ('reset', 'invite')),
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
used_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
DROP TABLE IF EXISTS totp_policy;
|
||||||
|
DROP TABLE IF EXISTS totp_recovery_codes;
|
||||||
|
DROP TABLE IF EXISTS totp_credentials;
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
-- Zwei-Faktor-Authentifizierung TOTP (IAM-04, siehe core-kanban/tickets/IAM-04.md).
|
||||||
|
CREATE TABLE totp_credentials (
|
||||||
|
user_id UUID PRIMARY KEY REFERENCES users(id),
|
||||||
|
secret TEXT NOT NULL,
|
||||||
|
confirmed BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- code_hash enthaelt NIEMALS den Klartext-Wiederherstellungscode, nur dessen
|
||||||
|
-- SHA-256-Hash. used_at markiert einmalige Verwendbarkeit (Akzeptanzkriterium 3).
|
||||||
|
CREATE TABLE totp_recovery_codes (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
code_hash BYTEA NOT NULL UNIQUE,
|
||||||
|
used_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Erzwingbare Aktivierungspflicht pro Tenant (Singleton-Zeile, Modell C).
|
||||||
|
CREATE TABLE totp_policy (
|
||||||
|
id BOOLEAN PRIMARY KEY DEFAULT true CHECK (id),
|
||||||
|
required BOOLEAN NOT NULL DEFAULT false
|
||||||
|
);
|
||||||
@@ -1,25 +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 tenant_settings_history CASCADE;"
|
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenant_settings CASCADE;"
|
|
||||||
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 Mandantenverwaltung",
|
title: "NEXARCH Anmeldung & Profil",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { TextField, useToast } from "@nexarch/shl";
|
||||||
|
import { ApiError, login } from "../../lib/api";
|
||||||
|
|
||||||
|
export default function LoginPage() {
|
||||||
|
const { push } = useToast();
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [totpCode, setTotpCode] = useState("");
|
||||||
|
const [needsSecondFactor, setNeedsSecondFactor] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
await login(email, password, needsSecondFactor ? totpCode : undefined);
|
||||||
|
push("Anmeldung erfolgreich.", "success");
|
||||||
|
window.location.href = "/profile";
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof ApiError) {
|
||||||
|
// Akzeptanzkriterium 3 / Pruefung 1: nur die generische, vom Backend
|
||||||
|
// gelieferte Meldung anzeigen — keine eigene, evtl. praezisere
|
||||||
|
// Fehlerursache im Frontend herleiten oder ergaenzen.
|
||||||
|
setError(err.message);
|
||||||
|
if (err.code === "second_factor_required") {
|
||||||
|
setNeedsSecondFactor(true);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
setError("Anmeldung fehlgeschlagen. Bitte versuchen Sie es erneut.");
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 400, margin: "80px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Anmeldung</h1>
|
||||||
|
<form onSubmit={onSubmit} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="E-Mail-Adresse"
|
||||||
|
type="email"
|
||||||
|
autoComplete="username"
|
||||||
|
required
|
||||||
|
value={email}
|
||||||
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
label="Passwort"
|
||||||
|
type="password"
|
||||||
|
autoComplete="current-password"
|
||||||
|
required
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
{needsSecondFactor && (
|
||||||
|
<TextField
|
||||||
|
label="Zweiter Faktor (Authenticator-Code oder Wiederherstellungscode)"
|
||||||
|
type="text"
|
||||||
|
inputMode="numeric"
|
||||||
|
autoComplete="one-time-code"
|
||||||
|
required
|
||||||
|
value={totpCode}
|
||||||
|
onChange={(e) => setTotpCode(e.target.value)}
|
||||||
|
hint="Öffnen Sie Ihre Authenticator-App oder geben Sie einen Wiederherstellungscode ein."
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? "Anmeldung läuft…" : "Anmelden"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
<p>
|
||||||
|
<a href="/password-reset/request">Passwort vergessen?</a>
|
||||||
|
</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
|
export default function IndexPage() {
|
||||||
|
redirect("/login");
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Suspense, useState } from "react";
|
||||||
|
import { useSearchParams } from "next/navigation";
|
||||||
|
import { TextField } from "@nexarch/shl";
|
||||||
|
import { ApiError, completePasswordReset } from "../../../lib/api";
|
||||||
|
|
||||||
|
export default function PasswordResetCompletePage() {
|
||||||
|
return (
|
||||||
|
<Suspense fallback={null}>
|
||||||
|
<PasswordResetCompleteForm />
|
||||||
|
</Suspense>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function PasswordResetCompleteForm() {
|
||||||
|
const params = useSearchParams();
|
||||||
|
const token = params.get("token") ?? "";
|
||||||
|
const [newPassword, setNewPassword] = useState("");
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [done, setDone] = useState(false);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
await completePasswordReset(token, newPassword);
|
||||||
|
setDone(true);
|
||||||
|
} catch (err) {
|
||||||
|
// Akzeptanzkriterium 3: generische Meldung, keine interne Fehlerursache.
|
||||||
|
setError(err instanceof ApiError ? err.message : "Der Link ist ungültig oder abgelaufen.");
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (done) {
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 400, margin: "80px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Passwort geändert</h1>
|
||||||
|
<p>
|
||||||
|
Ihr Passwort wurde erfolgreich geändert. <a href="/login">Jetzt anmelden</a>.
|
||||||
|
</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 400, margin: "80px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Neues Passwort festlegen</h1>
|
||||||
|
{!token && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
Kein gültiger Link. Bitte fordern Sie einen neuen Reset-Link an.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<form onSubmit={onSubmit} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Neues Passwort"
|
||||||
|
type="password"
|
||||||
|
autoComplete="new-password"
|
||||||
|
required
|
||||||
|
minLength={8}
|
||||||
|
value={newPassword}
|
||||||
|
onChange={(e) => setNewPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={submitting || !token}>
|
||||||
|
{submitting ? "Wird gespeichert…" : "Passwort speichern"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { TextField } from "@nexarch/shl";
|
||||||
|
import { requestPasswordReset } from "../../../lib/api";
|
||||||
|
|
||||||
|
export default function PasswordResetRequestPage() {
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
const [message, setMessage] = useState<string | null>(null);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
// Antwort ist absichtlich IMMER dieselbe (Backend-Garantie,
|
||||||
|
// Akzeptanzkriterium 3) — das Frontend erfindet keine differenzierte
|
||||||
|
// Anzeige je nachdem ob das Konto existiert.
|
||||||
|
const result = await requestPasswordReset(email);
|
||||||
|
setMessage(result.message);
|
||||||
|
} catch {
|
||||||
|
setMessage("Falls ein Konto mit dieser E-Mail-Adresse existiert, wurde eine Nachricht mit weiteren Schritten verschickt.");
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 400, margin: "80px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Passwort zurücksetzen</h1>
|
||||||
|
{message ? (
|
||||||
|
<p role="status">{message}</p>
|
||||||
|
) : (
|
||||||
|
<form onSubmit={onSubmit} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="E-Mail-Adresse"
|
||||||
|
type="email"
|
||||||
|
autoComplete="username"
|
||||||
|
required
|
||||||
|
value={email}
|
||||||
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
/>
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? "Wird gesendet…" : "Link anfordern"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
|
<p>
|
||||||
|
<a href="/login">Zurück zur Anmeldung</a>
|
||||||
|
</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,228 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { TextField, useToast } from "@nexarch/shl";
|
||||||
|
import {
|
||||||
|
ApiError,
|
||||||
|
Me,
|
||||||
|
beginTotpSetup,
|
||||||
|
changePassword,
|
||||||
|
confirmTotpSetup,
|
||||||
|
fetchMe,
|
||||||
|
fetchTotpStatus,
|
||||||
|
} from "../../lib/api";
|
||||||
|
|
||||||
|
export default function ProfilePage() {
|
||||||
|
const { push } = useToast();
|
||||||
|
const [me, setMe] = useState<Me | null>(null);
|
||||||
|
const [totpEnabled, setTotpEnabled] = useState<boolean | null>(null);
|
||||||
|
const [loadError, setLoadError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
Promise.all([fetchMe(), fetchTotpStatus()])
|
||||||
|
.then(([meResult, statusResult]) => {
|
||||||
|
setMe(meResult);
|
||||||
|
setTotpEnabled(statusResult.enabled);
|
||||||
|
})
|
||||||
|
.catch(() => setLoadError("Bitte melden Sie sich an, um Ihr Profil zu sehen."));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (loadError) {
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 480, margin: "80px auto", padding: "0 16px" }}>
|
||||||
|
<p role="alert">{loadError}</p>
|
||||||
|
<a href="/login">Zur Anmeldung</a>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main style={{ maxWidth: 480, margin: "40px auto", padding: "0 16px" }}>
|
||||||
|
<h1>Mein Profil</h1>
|
||||||
|
{me && (
|
||||||
|
<section aria-labelledby="stammdaten-heading">
|
||||||
|
<h2 id="stammdaten-heading">Stammdaten</h2>
|
||||||
|
<p>
|
||||||
|
{me.name} — {me.email}
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<ChangePasswordSection onSuccess={() => push("Passwort geändert.", "success")} />
|
||||||
|
|
||||||
|
<TotpSection
|
||||||
|
enabled={totpEnabled}
|
||||||
|
onEnabled={() => setTotpEnabled(true)}
|
||||||
|
onNotice={(text) => push(text, "info")}
|
||||||
|
/>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function ChangePasswordSection({ onSuccess }: { onSuccess: () => void }) {
|
||||||
|
const [currentPassword, setCurrentPassword] = useState("");
|
||||||
|
const [newPassword, setNewPassword] = useState("");
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
await changePassword(currentPassword, newPassword);
|
||||||
|
setCurrentPassword("");
|
||||||
|
setNewPassword("");
|
||||||
|
onSuccess();
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Passwort konnte nicht geändert werden.");
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section aria-labelledby="passwort-heading">
|
||||||
|
<h2 id="passwort-heading">Passwort ändern</h2>
|
||||||
|
<form onSubmit={onSubmit} noValidate>
|
||||||
|
<TextField
|
||||||
|
label="Aktuelles Passwort"
|
||||||
|
type="password"
|
||||||
|
autoComplete="current-password"
|
||||||
|
required
|
||||||
|
value={currentPassword}
|
||||||
|
onChange={(e) => setCurrentPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
label="Neues Passwort"
|
||||||
|
type="password"
|
||||||
|
autoComplete="new-password"
|
||||||
|
required
|
||||||
|
minLength={8}
|
||||||
|
value={newPassword}
|
||||||
|
onChange={(e) => setNewPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? "Wird gespeichert…" : "Passwort ändern"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function TotpSection({
|
||||||
|
enabled,
|
||||||
|
onEnabled,
|
||||||
|
onNotice,
|
||||||
|
}: {
|
||||||
|
enabled: boolean | null;
|
||||||
|
onEnabled: () => void;
|
||||||
|
onNotice: (text: string) => void;
|
||||||
|
}) {
|
||||||
|
const [setupData, setSetupData] = useState<{ secret: string; provisioningUri: string } | null>(null);
|
||||||
|
const [confirmCode, setConfirmCode] = useState("");
|
||||||
|
const [recoveryCodes, setRecoveryCodes] = useState<string[] | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
|
async function onBeginSetup() {
|
||||||
|
setError(null);
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const result = await beginTotpSetup();
|
||||||
|
setSetupData({ secret: result.secret, provisioningUri: result.provisioning_uri });
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Einrichtung konnte nicht gestartet werden.");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onConfirm(event: React.FormEvent<HTMLFormElement>) {
|
||||||
|
event.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const result = await confirmTotpSetup(confirmCode);
|
||||||
|
// Akzeptanzkriterium 2: Wiederherstellungscodes werden HIER, EINMALIG
|
||||||
|
// im Klartext angezeigt — die Backend-API liefert sie an keiner
|
||||||
|
// anderen Stelle je wieder aus (siehe internal/totp/store.go).
|
||||||
|
setRecoveryCodes(result.recovery_codes);
|
||||||
|
setSetupData(null);
|
||||||
|
onEnabled();
|
||||||
|
onNotice("Zwei-Faktor-Authentifizierung aktiviert. Bewahren Sie die Wiederherstellungscodes sicher auf.");
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof ApiError ? err.message : "Code ungültig.");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section aria-labelledby="zwei-faktor-heading">
|
||||||
|
<h2 id="zwei-faktor-heading">Zwei-Faktor-Authentifizierung</h2>
|
||||||
|
|
||||||
|
{recoveryCodes ? (
|
||||||
|
<div role="alert">
|
||||||
|
<p>
|
||||||
|
<strong>Wiederherstellungscodes — jetzt notieren, sie werden nicht erneut angezeigt:</strong>
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
{recoveryCodes.map((code) => (
|
||||||
|
<li key={code}>
|
||||||
|
<code>{code}</code>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
) : enabled ? (
|
||||||
|
<p>Zwei-Faktor-Authentifizierung ist aktiv.</p>
|
||||||
|
) : setupData ? (
|
||||||
|
<form onSubmit={onConfirm} noValidate>
|
||||||
|
<p>
|
||||||
|
Scannen Sie den folgenden Schlüssel mit Ihrer Authenticator-App oder geben Sie ihn manuell ein:
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<code>{setupData.secret}</code>
|
||||||
|
</p>
|
||||||
|
<p style={{ wordBreak: "break-all" }}>
|
||||||
|
<a href={setupData.provisioningUri}>{setupData.provisioningUri}</a>
|
||||||
|
</p>
|
||||||
|
<TextField
|
||||||
|
label="Bestätigungscode aus der App"
|
||||||
|
type="text"
|
||||||
|
inputMode="numeric"
|
||||||
|
required
|
||||||
|
value={confirmCode}
|
||||||
|
onChange={(e) => setConfirmCode(e.target.value)}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={busy}>
|
||||||
|
{busy ? "Wird bestätigt…" : "Einrichtung bestätigen"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<p>Zwei-Faktor-Authentifizierung ist derzeit nicht aktiv.</p>
|
||||||
|
{error && (
|
||||||
|
<p role="alert" style={{ color: "var(--shl-color-danger)" }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="button" onClick={onBeginSetup} disabled={busy}>
|
||||||
|
{busy ? "Wird gestartet…" : "Einrichten"}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
// Duenne fetch-Wrapper gegen die IAM-08-Backend-Endpunkte. Kein Framework,
|
||||||
|
// keine Abstraktionsschicht ueber das Notwendige hinaus (Produkt-DNA:
|
||||||
|
// schlanker Go-Dienst + schmales Frontend statt schwergewichtiger Plattform).
|
||||||
|
|
||||||
|
const API_BASE = process.env.NEXT_PUBLIC_CORE_API_BASE ?? "";
|
||||||
|
|
||||||
|
export class ApiError extends Error {
|
||||||
|
code?: string;
|
||||||
|
constructor(message: string, code?: string) {
|
||||||
|
super(message);
|
||||||
|
this.code = code;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function postJSON<T>(path: string, body: unknown): Promise<T> {
|
||||||
|
const res = await fetch(`${API_BASE}${path}`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
credentials: "include",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new ApiError(data.error ?? data.message ?? "Unbekannter Fehler", data.code);
|
||||||
|
}
|
||||||
|
return data as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getJSON<T>(path: string): Promise<T> {
|
||||||
|
const res = await fetch(`${API_BASE}${path}`, { credentials: "include" });
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new ApiError(data.error ?? data.message ?? "Unbekannter Fehler", data.code);
|
||||||
|
}
|
||||||
|
return data as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LoginResult {
|
||||||
|
ok: true;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function login(email: string, password: string, totpCode?: string): Promise<LoginResult> {
|
||||||
|
await postJSON("/auth/login", { email, password, totp_code: totpCode ?? "" });
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function requestPasswordReset(email: string): Promise<{ message: string }> {
|
||||||
|
return postJSON("/auth/password-reset/request", { email });
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function completePasswordReset(token: string, newPassword: string): Promise<void> {
|
||||||
|
await postJSON("/auth/password-reset/complete", { token, new_password: newPassword });
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function changePassword(currentPassword: string, newPassword: string): Promise<void> {
|
||||||
|
await postJSON("/account/change-password", { current_password: currentPassword, new_password: newPassword });
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Me {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchMe(): Promise<Me> {
|
||||||
|
return getJSON("/account/me");
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TotpStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchTotpStatus(): Promise<TotpStatus> {
|
||||||
|
return getJSON("/auth/totp/status");
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TotpSetupBegin {
|
||||||
|
secret: string;
|
||||||
|
provisioning_uri: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function beginTotpSetup(): Promise<TotpSetupBegin> {
|
||||||
|
return postJSON("/auth/totp/setup/begin", {});
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TotpSetupConfirm {
|
||||||
|
recovery_codes: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function confirmTotpSetup(code: string): Promise<TotpSetupConfirm> {
|
||||||
|
return postJSON("/auth/totp/setup/confirm", { code });
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "nexarch-tenant-admin",
|
"name": "nexarch-account",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es2017",
|
"target": "ES2017",
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
"allowJs": true,
|
"allowJs": false,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
@@ -1,225 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { useState } from "react";
|
|
||||||
import {
|
|
||||||
fetchTenants,
|
|
||||||
fetchTenantDetail,
|
|
||||||
updateSettings,
|
|
||||||
performLifecycleAction,
|
|
||||||
type TenantListItem,
|
|
||||||
type TenantDetail,
|
|
||||||
type LifecycleAction,
|
|
||||||
} from "@/lib/api";
|
|
||||||
|
|
||||||
const ACTION_LABEL: Record<LifecycleAction, string> = {
|
|
||||||
suspend: "Suspendieren",
|
|
||||||
reactivate: "Reaktivieren",
|
|
||||||
schedule_deletion: "Löschung vormerken",
|
|
||||||
cancel_deletion: "Löschung abbrechen",
|
|
||||||
};
|
|
||||||
|
|
||||||
const ACTION_CONFIRM: Record<LifecycleAction, string> = {
|
|
||||||
suspend: "Mandant wirklich suspendieren? Benutzer können sich danach nicht mehr anmelden.",
|
|
||||||
reactivate: "Mandant wirklich reaktivieren?",
|
|
||||||
schedule_deletion:
|
|
||||||
"Mandant wirklich zur Löschung vormerken? Nach der Karenzzeit wird er unwiderruflich gelöscht.",
|
|
||||||
cancel_deletion: "Vorgemerkte Löschung wirklich abbrechen?",
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function Page() {
|
|
||||||
const [superadminId, setSuperadminId] = useState("");
|
|
||||||
const [search, setSearch] = useState("");
|
|
||||||
const [status, setStatus] = useState("");
|
|
||||||
const [tenants, setTenants] = useState<TenantListItem[] | null>(null);
|
|
||||||
const [detail, setDetail] = useState<TenantDetail | null>(null);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
const [formError, setFormError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
async function loadList() {
|
|
||||||
setError(null);
|
|
||||||
try {
|
|
||||||
const items = await fetchTenants(superadminId.trim(), search.trim(), status);
|
|
||||||
setTenants(items);
|
|
||||||
} catch (e: any) {
|
|
||||||
setError(e.message ?? "Unbekannter Fehler");
|
|
||||||
setTenants(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function openDetail(slug: string) {
|
|
||||||
setError(null);
|
|
||||||
try {
|
|
||||||
const d = await fetchTenantDetail(superadminId.trim(), slug);
|
|
||||||
setDetail(d);
|
|
||||||
} catch (e: any) {
|
|
||||||
setError(e.message ?? "Unbekannter Fehler");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onSubmitSettings(e: React.FormEvent<HTMLFormElement>) {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!detail) return;
|
|
||||||
setFormError(null);
|
|
||||||
|
|
||||||
const form = new FormData(e.currentTarget);
|
|
||||||
const displayName = String(form.get("displayName") ?? "").trim();
|
|
||||||
if (!displayName) {
|
|
||||||
setFormError("Anzeigename ist ein Pflichtfeld.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await updateSettings(
|
|
||||||
superadminId.trim(),
|
|
||||||
detail.slug,
|
|
||||||
displayName,
|
|
||||||
String(form.get("colorScheme") ?? ""),
|
|
||||||
String(form.get("timezone") ?? ""),
|
|
||||||
String(form.get("language") ?? "")
|
|
||||||
);
|
|
||||||
await openDetail(detail.slug);
|
|
||||||
} catch (e: any) {
|
|
||||||
setFormError(e.message ?? "Speichern fehlgeschlagen");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onLifecycleAction(action: LifecycleAction) {
|
|
||||||
if (!detail) return;
|
|
||||||
if (!window.confirm(ACTION_CONFIRM[action])) return;
|
|
||||||
setError(null);
|
|
||||||
try {
|
|
||||||
await performLifecycleAction(superadminId.trim(), detail.slug, action);
|
|
||||||
await openDetail(detail.slug);
|
|
||||||
await loadList();
|
|
||||||
} catch (e: any) {
|
|
||||||
setError(e.message ?? "Aktion fehlgeschlagen");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<main style={{ maxWidth: 900, margin: "0 auto", padding: "2rem 1rem" }}>
|
|
||||||
<h1>Mandantenverwaltung</h1>
|
|
||||||
|
|
||||||
<div style={{ display: "flex", gap: "0.5rem", marginBottom: "1rem", flexWrap: "wrap" }}>
|
|
||||||
<input
|
|
||||||
value={superadminId}
|
|
||||||
onChange={(e) => setSuperadminId(e.target.value)}
|
|
||||||
placeholder="Superadmin-ID"
|
|
||||||
style={{ padding: "0.5rem" }}
|
|
||||||
/>
|
|
||||||
<input
|
|
||||||
value={search}
|
|
||||||
onChange={(e) => setSearch(e.target.value)}
|
|
||||||
placeholder="Suche (Slug/Name)"
|
|
||||||
style={{ padding: "0.5rem" }}
|
|
||||||
/>
|
|
||||||
<select value={status} onChange={(e) => setStatus(e.target.value)} style={{ padding: "0.5rem" }}>
|
|
||||||
<option value="">Alle Status</option>
|
|
||||||
<option value="active">Aktiv</option>
|
|
||||||
<option value="suspended">Suspendiert</option>
|
|
||||||
<option value="pending_deletion">Löschung vorgemerkt</option>
|
|
||||||
<option value="deleted">Gelöscht</option>
|
|
||||||
</select>
|
|
||||||
<button onClick={loadList} style={{ padding: "0.5rem 1rem" }}>
|
|
||||||
Anzeigen
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && (
|
|
||||||
<p style={{ color: "#c62828" }} role="alert">
|
|
||||||
Fehler: {error}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{tenants && (
|
|
||||||
<table style={{ width: "100%", borderCollapse: "collapse", background: "white" }}>
|
|
||||||
<thead>
|
|
||||||
<tr style={{ textAlign: "left", borderBottom: "2px solid #ddd" }}>
|
|
||||||
<th style={{ padding: "0.5rem" }}>Slug</th>
|
|
||||||
<th style={{ padding: "0.5rem" }}>Name</th>
|
|
||||||
<th style={{ padding: "0.5rem" }}>Status</th>
|
|
||||||
<th style={{ padding: "0.5rem" }}></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{tenants.map((t) => (
|
|
||||||
<tr key={t.id} style={{ borderBottom: "1px solid #eee" }}>
|
|
||||||
<td style={{ padding: "0.5rem" }}>{t.slug}</td>
|
|
||||||
<td style={{ padding: "0.5rem" }}>{t.name}</td>
|
|
||||||
<td style={{ padding: "0.5rem" }}>{t.status}</td>
|
|
||||||
<td style={{ padding: "0.5rem" }}>
|
|
||||||
<button onClick={() => openDetail(t.slug)}>Details</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
{tenants.length === 0 && (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={4} style={{ padding: "0.5rem" }}>
|
|
||||||
Keine Mandanten gefunden.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{detail && (
|
|
||||||
<section style={{ background: "white", padding: "1rem", borderRadius: 8, marginTop: "1.5rem" }}>
|
|
||||||
<h2>
|
|
||||||
{detail.name} ({detail.slug}) — Status: {detail.status}
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
<form onSubmit={onSubmitSettings} style={{ display: "grid", gap: "0.75rem", maxWidth: 400 }}>
|
|
||||||
{formError && (
|
|
||||||
<p style={{ color: "#c62828" }} role="alert">
|
|
||||||
{formError}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
<label>
|
|
||||||
Anzeigename (Pflichtfeld)
|
|
||||||
<input
|
|
||||||
name="displayName"
|
|
||||||
required
|
|
||||||
defaultValue={detail.settings.DisplayName}
|
|
||||||
style={{ width: "100%", padding: "0.4rem" }}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label>
|
|
||||||
Farbschema
|
|
||||||
<input
|
|
||||||
name="colorScheme"
|
|
||||||
defaultValue={detail.settings.ColorScheme}
|
|
||||||
style={{ width: "100%", padding: "0.4rem" }}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label>
|
|
||||||
Zeitzone
|
|
||||||
<input
|
|
||||||
name="timezone"
|
|
||||||
defaultValue={detail.settings.Timezone}
|
|
||||||
style={{ width: "100%", padding: "0.4rem" }}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label>
|
|
||||||
Sprache
|
|
||||||
<input
|
|
||||||
name="language"
|
|
||||||
defaultValue={detail.settings.Language}
|
|
||||||
style={{ width: "100%", padding: "0.4rem" }}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<button type="submit">Einstellungen speichern</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div style={{ display: "flex", gap: "0.5rem", marginTop: "1.5rem", flexWrap: "wrap" }}>
|
|
||||||
{(Object.keys(ACTION_LABEL) as LifecycleAction[]).map((action) => (
|
|
||||||
<button key={action} onClick={() => onLifecycleAction(action)}>
|
|
||||||
{ACTION_LABEL[action]}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
)}
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
// Duenner Client fuer das TEN-05-Backend-API (internal/tenantadmin) — keine
|
|
||||||
// eigene Provisioning-/Lifecycle-/Validierungslogik ausser der Pflichtfeld-
|
|
||||||
// Vorpruefung im Formular (Akzeptanzkriterium 2), die zusaetzlich serverseitig
|
|
||||||
// durchgesetzt wird.
|
|
||||||
export type TenantListItem = {
|
|
||||||
id: string;
|
|
||||||
slug: string;
|
|
||||||
name: string;
|
|
||||||
status: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type Settings = {
|
|
||||||
DisplayName: string;
|
|
||||||
LogoURL: string;
|
|
||||||
ColorScheme: string;
|
|
||||||
Timezone: string;
|
|
||||||
Language: string;
|
|
||||||
Version: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type TenantDetail = {
|
|
||||||
id: string;
|
|
||||||
slug: string;
|
|
||||||
name: string;
|
|
||||||
status: string;
|
|
||||||
settings: Settings;
|
|
||||||
};
|
|
||||||
|
|
||||||
function apiBase(): string {
|
|
||||||
const base = process.env.NEXT_PUBLIC_TENANTADMIN_API_URL;
|
|
||||||
if (!base) {
|
|
||||||
throw new Error(
|
|
||||||
"NEXT_PUBLIC_TENANTADMIN_API_URL ist nicht gesetzt (Umgebungsvariable erforderlich)"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return base;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handle<T>(res: Response): Promise<T> {
|
|
||||||
if (!res.ok) {
|
|
||||||
const body = await res.json().catch(() => ({}));
|
|
||||||
throw new Error(body.error || `Anfrage fehlgeschlagen (${res.status})`);
|
|
||||||
}
|
|
||||||
return res.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchTenants(
|
|
||||||
superadminId: string,
|
|
||||||
search: string,
|
|
||||||
status: string
|
|
||||||
): Promise<TenantListItem[]> {
|
|
||||||
const params = new URLSearchParams({ superadmin: superadminId, search, status });
|
|
||||||
const res = await fetch(`${apiBase()}/admin/tenants?${params}`, { cache: "no-store" });
|
|
||||||
return handle<TenantListItem[]>(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchTenantDetail(
|
|
||||||
superadminId: string,
|
|
||||||
slug: string
|
|
||||||
): Promise<TenantDetail> {
|
|
||||||
const params = new URLSearchParams({ superadmin: superadminId, slug });
|
|
||||||
const res = await fetch(`${apiBase()}/admin/tenants/detail?${params}`, { cache: "no-store" });
|
|
||||||
return handle<TenantDetail>(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateSettings(
|
|
||||||
superadminId: string,
|
|
||||||
slug: string,
|
|
||||||
displayName: string,
|
|
||||||
colorScheme: string,
|
|
||||||
timezone: string,
|
|
||||||
language: string
|
|
||||||
): Promise<Settings> {
|
|
||||||
const res = await fetch(`${apiBase()}/admin/tenants/settings`, {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({
|
|
||||||
superadmin: superadminId,
|
|
||||||
slug,
|
|
||||||
display_name: displayName,
|
|
||||||
color_scheme: colorScheme,
|
|
||||||
timezone,
|
|
||||||
language,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
return handle<Settings>(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
export type LifecycleAction =
|
|
||||||
| "suspend"
|
|
||||||
| "reactivate"
|
|
||||||
| "schedule_deletion"
|
|
||||||
| "cancel_deletion";
|
|
||||||
|
|
||||||
export async function performLifecycleAction(
|
|
||||||
superadminId: string,
|
|
||||||
slug: string,
|
|
||||||
action: LifecycleAction
|
|
||||||
): Promise<void> {
|
|
||||||
const res = await fetch(`${apiBase()}/admin/tenants/lifecycle`, {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({ superadmin: superadminId, slug, action }),
|
|
||||||
});
|
|
||||||
await handle<unknown>(res);
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user