fix(PROJ-73): Upload-Job-Status bei Panic + nil-Guards nach GetByUsername
Upload-Job bleibt bei einem Panic im Verarbeitungspfad nicht mehr auf "running" hängen, sondern zeigt "error" mit generischer Meldung (Panic- Rohwert nur im Server-Log, ErrMsg geht ans Frontend und könnte sonst Mail-Inhalt-Fragmente transportieren). Zusätzlich fail-closed nil-Guards an allen 13 GetByUsername-Aufrufstellen in internal/api/, die das Ergebnis bisher ungeprüft dereferenzierten. Verifiziert auf 192.168.1.132: Build und go vet fehlerfrei für die geänderten Dateien. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019j28kGcaJAhBnrYX34hGdt
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
798cb2817c
commit
88cdc3eb3e
+7
-1
@@ -88,7 +88,13 @@
|
|||||||
| PROJ-70 | User-Self-Service IMAP-Rückholung (Archiv-Mail zurück ins Postfach) | Deployed | [PROJ-70](PROJ-70-imap-rueckholung-self-service.md) | 2026-07-07 |
|
| PROJ-70 | User-Self-Service IMAP-Rückholung (Archiv-Mail zurück ins Postfach) | Deployed | [PROJ-70](PROJ-70-imap-rueckholung-self-service.md) | 2026-07-07 |
|
||||||
| PROJ-71 | TLS-Pflicht (optional) für eingehenden SMTP-BCC-Journaling-Kanal | Deployed | [PROJ-71](PROJ-71-smtp-require-tls.md) | 2026-07-08 |
|
| PROJ-71 | TLS-Pflicht (optional) für eingehenden SMTP-BCC-Journaling-Kanal | Deployed | [PROJ-71](PROJ-71-smtp-require-tls.md) | 2026-07-08 |
|
||||||
| PROJ-72 | Fix Superadmin kann Passwort/Rolle von Superadmin-Peers nicht ändern (Sicherheitsbug) | Deployed | [PROJ-72](PROJ-72-fix-superadmin-peer-patch.md) | 2026-07-27 |
|
| PROJ-72 | Fix Superadmin kann Passwort/Rolle von Superadmin-Peers nicht ändern (Sicherheitsbug) | Deployed | [PROJ-72](PROJ-72-fix-superadmin-peer-patch.md) | 2026-07-27 |
|
||||||
|
| PROJ-73 | Restliche Crash-Härtung (Upload-Job-Status bei Panic, fehlende nil-Checks) | In Review | [PROJ-73](PROJ-73-restliche-crash-haertung.md) | 2026-08-05 |
|
||||||
|
| PROJ-74 | Vorbestehende Test-/Vet-Signatur-Drift beheben (go vet/test wieder komplett grün) | Planned | [PROJ-74](PROJ-74-test-suite-signatur-drift.md) | 2026-08-05 |
|
||||||
|
| PROJ-75 | DB-Performance-Audit (Query-Index-Nutzung, Fan-out, pgxpool-Tuning) | Planned | [PROJ-75](PROJ-75-db-performance-audit.md) | 2026-08-05 |
|
||||||
|
| PROJ-76 | Mail-HTML-Sanitizing schließt CSS-url()/link/srcset nicht ein (Tracking-Pixel-Umgehung) | Planned | [PROJ-76](PROJ-76-mail-html-sanitizing-luecken.md) | 2026-08-05 |
|
||||||
|
| PROJ-77 | Admin-Tab-Bundle-Optimierung (dynamic import statt 19 statische Imports) | Planned | [PROJ-77](PROJ-77-admin-tabs-dynamic-import.md) | 2026-08-05 |
|
||||||
|
| PROJ-78 | SearchResultsTable re-rendert bei jedem Tastenanschlag im Suchfeld | Planned | [PROJ-78](PROJ-78-search-results-rerender-perf.md) | 2026-08-05 |
|
||||||
|
|
||||||
<!-- Add features above this line -->
|
<!-- Add features above this line -->
|
||||||
|
|
||||||
## Next Available ID: PROJ-73
|
## Next Available ID: PROJ-79
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
---
|
||||||
|
id: PROJ-73
|
||||||
|
title: Restliche Crash-Härtung (Upload-Job-Status bei Panic, fehlende nil-Checks)
|
||||||
|
status: In Review
|
||||||
|
created: 2026-08-05
|
||||||
|
---
|
||||||
|
|
||||||
|
## Problem
|
||||||
|
|
||||||
|
Nach der großen Crash-Robustheit-Härtung (Commit 798cb28) sind zwei kleinere
|
||||||
|
Lücken bewusst offen geblieben:
|
||||||
|
|
||||||
|
1. `runUploadJob` (`internal/api/upload.go`) läuft jetzt zwar dank
|
||||||
|
`internal/safego` nicht mehr prozessfatal bei einem Panic, der Job-Status
|
||||||
|
bleibt aber dauerhaft auf `"running"` hängen — der Nutzer bekommt nie eine
|
||||||
|
Fehlermeldung im Upload-UI, der Job wirkt wie ein hängender Prozess.
|
||||||
|
2. `internal/api/ocr_handlers.go:66` (`s.users.GetByUsername(...)`) und
|
||||||
|
analoge Stellen dereferenzieren das Ergebnis ohne expliziten `u == nil`-
|
||||||
|
Check. Aktuell liefert kein Store `(nil, nil)`, daher kein akuter Bug —
|
||||||
|
aber ungeschützt gegen künftige Store-Implementierungen oder Refactorings.
|
||||||
|
|
||||||
|
## Lösung (Vorschlag)
|
||||||
|
|
||||||
|
1. In `runUploadJob`: `defer` einbauen, der bei `recover() != nil` den
|
||||||
|
Job-Status auf `"error"` setzt (inkl. Fehlermeldung), statt nur zu loggen.
|
||||||
|
2. Alle `GetByUsername`-Aufrufstellen (grep `GetByUsername` über
|
||||||
|
`internal/api/`) auf `if u == nil { ... }`-Guard nach dem `err == nil`-
|
||||||
|
Check prüfen und ergänzen wo fehlend.
|
||||||
|
|
||||||
|
## Implementation Notes
|
||||||
|
|
||||||
|
**1. Upload-Job-Status bei Panic** — `internal/api/upload.go:148-162`
|
||||||
|
|
||||||
|
`runUploadJob` bekommt direkt nach `ctx := context.Background()` ein
|
||||||
|
`defer func(){ if rec := recover(); rec != nil { ... } }()`:
|
||||||
|
- setzt unter `job.mu` `Status = "error"` und `ErrMsg`,
|
||||||
|
- gibt den Panic anschließend per `panic(rec)` weiter, damit `safego.Run`
|
||||||
|
ihn wie bisher mit Task-Namen loggt (Prozess bleibt stabil).
|
||||||
|
|
||||||
|
Bewusste Abweichung vom Spec-Vorschlag: die `ErrMsg` enthält **nicht** den
|
||||||
|
Panic-Wert, sondern den generischen Text „Import wegen eines internen Fehlers
|
||||||
|
abgebrochen". Ein Panic-Wert kann Fragmente von Mail-Inhalten transportieren
|
||||||
|
und `ErrMsg` wird über `/upload/progress/{jobID}` ans Frontend ausgeliefert
|
||||||
|
(DSGVO). Die Details stehen im Server-Log.
|
||||||
|
|
||||||
|
Feldnamen sind konsistent zum bestehenden Muster (`Status` "running"/"done"/
|
||||||
|
"error", `ErrMsg` mit JSON-Tag `error_msg`), `snapshot()` liefert sie bereits
|
||||||
|
unverändert ans Frontend — keine API-Änderung nötig.
|
||||||
|
|
||||||
|
**2. nil-Guards nach `GetByUsername`** — alle 13 Aufrufstellen in
|
||||||
|
`internal/api/`, jeweils nur die vorhandene `if err != nil`-Bedingung erweitert
|
||||||
|
(kein neuer Fehlerpfad, damit Statuscodes/Logging unverändert bleiben):
|
||||||
|
|
||||||
|
| Datei:Zeile | neue Bedingung |
|
||||||
|
|---|---|
|
||||||
|
| `restore_handlers.go:43`, `:140` | `err != nil \|\| user == nil` (500) |
|
||||||
|
| `search_handlers.go:429`, `:497` | `err != nil \|\| u == nil \|\| !mailBelongsToUser(...)` (403) |
|
||||||
|
| `export.go:373` | `err != nil \|\| u == nil \|\| !mailBelongsToUser(...)` (403) |
|
||||||
|
| `export.go:472` | `err != nil \|\| u == nil` (500) |
|
||||||
|
| `smtpout_handlers.go:103` | `err != nil \|\| u == nil \|\| u.Email == ""` (400) |
|
||||||
|
| `ocr_handlers.go:66` | `err != nil \|\| u == nil \|\| !mailBelongsToUser(...)` (403) |
|
||||||
|
| `auth_handlers.go:106` | `err != nil \|\| user == nil` (500) |
|
||||||
|
| `profile_handlers.go:36`, `:113`, `:183` | `err != nil \|\| user == nil` (500) |
|
||||||
|
| `ediscovery.go:134` | `err != nil \|\| u == nil` (500) |
|
||||||
|
|
||||||
|
Alle Pfade, die eine Zugriffsprüfung machen (Search/Export/OCR), fallen bei
|
||||||
|
`u == nil` auf „access denied" zurück, nicht auf „erlaubt" — fail-closed.
|
||||||
|
|
||||||
|
Lokal kein `go build` möglich (kein Go-Toolchain), nur statische Prüfung.
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] Upload-Job zeigt nach einem simulierten Panic im Verarbeitungspfad
|
||||||
|
Status `"error"` mit Fehlermeldung statt dauerhaft `"running"`.
|
||||||
|
- [x] Alle `GetByUsername`-Stellen in `internal/api/` haben einen
|
||||||
|
expliziten nil-Guard.
|
||||||
|
- [ ] `go build ./... && go vet ./...` auf 132 fehlerfrei für geänderte
|
||||||
|
Dateien.
|
||||||
@@ -103,7 +103,7 @@ func (s *Server) handleMe(w http.ResponseWriter, r *http.Request) {
|
|||||||
sess := sessionFromCtx(r.Context())
|
sess := sessionFromCtx(r.Context())
|
||||||
|
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ func (s *Server) handleExportEDiscovery(w http.ResponseWriter, r *http.Request)
|
|||||||
var userEmail string
|
var userEmail string
|
||||||
if sess.Role == userstore.RoleUser {
|
if sess.Role == userstore.RoleUser {
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || u == nil {
|
||||||
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,7 +370,7 @@ func (s *Server) handleExportPDF(w http.ResponseWriter, r *http.Request) {
|
|||||||
// user: only own mails; domain_auditor: all tenant mails (no filter)
|
// user: only own mails; domain_auditor: all tenant mails (no filter)
|
||||||
if sess.Role == userstore.RoleUser {
|
if sess.Role == userstore.RoleUser {
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil || !mailBelongsToUser(pm, u.Email) {
|
if err != nil || u == nil || !mailBelongsToUser(pm, u.Email) {
|
||||||
writeError(w, http.StatusForbidden, "access denied")
|
writeError(w, http.StatusForbidden, "access denied")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -469,7 +469,7 @@ func (s *Server) handleExportZIP(w http.ResponseWriter, r *http.Request) {
|
|||||||
var userEmail string
|
var userEmail string
|
||||||
if sess.Role == userstore.RoleUser {
|
if sess.Role == userstore.RoleUser {
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || u == nil {
|
||||||
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ func (s *Server) handleGetOCRText(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil || !mailBelongsToUser(pm, u.Email) {
|
if err != nil || u == nil || !mailBelongsToUser(pm, u.Email) {
|
||||||
writeError(w, http.StatusForbidden, "access denied")
|
writeError(w, http.StatusForbidden, "access denied")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ func (s *Server) handleChangePassword(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
// Load user
|
// Load user
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
s.logger.Error("change_password: user not found", "err", err, "username", sess.Username)
|
s.logger.Error("change_password: user not found", "err", err, "username", sess.Username)
|
||||||
writeError(w, http.StatusInternalServerError, "user not found")
|
writeError(w, http.StatusInternalServerError, "user not found")
|
||||||
return
|
return
|
||||||
@@ -110,7 +110,7 @@ func (s *Server) handleChangeEmail(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
// Load user
|
// Load user
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
s.logger.Error("change_email: user not found", "err", err, "username", sess.Username)
|
s.logger.Error("change_email: user not found", "err", err, "username", sess.Username)
|
||||||
writeError(w, http.StatusInternalServerError, "user not found")
|
writeError(w, http.StatusInternalServerError, "user not found")
|
||||||
return
|
return
|
||||||
@@ -180,7 +180,7 @@ func (s *Server) handleChangePreferences(w http.ResponseWriter, r *http.Request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
s.logger.Error("change_preferences: user not found", "err", err, "username", sess.Username)
|
s.logger.Error("change_preferences: user not found", "err", err, "username", sess.Username)
|
||||||
writeError(w, http.StatusInternalServerError, "user not found")
|
writeError(w, http.StatusInternalServerError, "user not found")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ func (s *Server) handleSetRestoreEnabled(w http.ResponseWriter, r *http.Request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
s.logger.Error("restore_toggle: user not found", "err", err, "username", sess.Username)
|
s.logger.Error("restore_toggle: user not found", "err", err, "username", sess.Username)
|
||||||
writeError(w, http.StatusInternalServerError, "user not found")
|
writeError(w, http.StatusInternalServerError, "user not found")
|
||||||
return
|
return
|
||||||
@@ -137,7 +137,7 @@ func (s *Server) handleRestoreMail(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
user, err := s.users.GetByUsername(sess.Username)
|
user, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil {
|
if err != nil || user == nil {
|
||||||
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
writeError(w, http.StatusInternalServerError, "user lookup failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -426,7 +426,7 @@ func (s *Server) handleGetAttachment(w http.ResponseWriter, r *http.Request) {
|
|||||||
// user: only own mails; domain_auditor: all tenant mails (no filter)
|
// user: only own mails; domain_auditor: all tenant mails (no filter)
|
||||||
if sess.Role == userstore.RoleUser {
|
if sess.Role == userstore.RoleUser {
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil || !mailBelongsToUser(pm, u.Email) {
|
if err != nil || u == nil || !mailBelongsToUser(pm, u.Email) {
|
||||||
writeError(w, http.StatusForbidden, "access denied")
|
writeError(w, http.StatusForbidden, "access denied")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -494,7 +494,7 @@ func (s *Server) handleGetRaw(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil || !mailBelongsToUser(pm, u.Email) {
|
if err != nil || u == nil || !mailBelongsToUser(pm, u.Email) {
|
||||||
writeError(w, http.StatusForbidden, "access denied")
|
writeError(w, http.StatusForbidden, "access denied")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ func (s *Server) handleTestSMTPOut(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
sess := sessionFromCtx(r.Context())
|
sess := sessionFromCtx(r.Context())
|
||||||
u, err := s.users.GetByUsername(sess.Username)
|
u, err := s.users.GetByUsername(sess.Username)
|
||||||
if err != nil || u.Email == "" {
|
if err != nil || u == nil || u.Email == "" {
|
||||||
writeError(w, http.StatusBadRequest, "Keine E-Mail-Adresse für diesen Account")
|
writeError(w, http.StatusBadRequest, "Keine E-Mail-Adresse für diesen Account")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,6 +145,21 @@ func (s *Server) handleUploadProgress(w http.ResponseWriter, r *http.Request) {
|
|||||||
func (s *Server) runUploadJob(job *UploadJob, messages [][]byte, tenantID *int64) {
|
func (s *Server) runUploadJob(job *UploadJob, messages [][]byte, tenantID *int64) {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// PROJ-73: a panic in the import path must not leave the job stuck on
|
||||||
|
// "running" forever — surface it as an error state in the upload UI.
|
||||||
|
// safego.Go still catches the panic afterwards for the stack trace log.
|
||||||
|
defer func() {
|
||||||
|
if rec := recover(); rec != nil {
|
||||||
|
job.mu.Lock()
|
||||||
|
job.Status = "error"
|
||||||
|
// No panic value in the message: it can carry mail content
|
||||||
|
// fragments (DSGVO). Details go to the log via safego.Run.
|
||||||
|
job.ErrMsg = "Import wegen eines internen Fehlers abgebrochen"
|
||||||
|
job.mu.Unlock()
|
||||||
|
panic(rec)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
for _, raw := range messages {
|
for _, raw := range messages {
|
||||||
result := s.importRawMessage(ctx, raw, tenantID)
|
result := s.importRawMessage(ctx, raw, tenantID)
|
||||||
job.mu.Lock()
|
job.mu.Lock()
|
||||||
|
|||||||
Reference in New Issue
Block a user