From e86248b27c4ae68122caed4ef9ddefaaf74908e8 Mon Sep 17 00:00:00 2001 From: Stephen Adamson Date: Tue, 7 Jul 2026 00:10:00 +0100 Subject: [PATCH] refactor: move auth, GDPR, and booking cleanup to centralized scheduler Convert CleanupRevokedJTIs to return (int, error) and remove StartJTICleanup goroutine. Add CleanupStaleLoginEntries and CleanupGDPRExportCache for centralized scheduler. Add clock.London timezone location. Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- backend/auth/jwt.go | 46 +++------ backend/clock/clock.go | 14 +++ backend/handlers/auth/auth_test.go | 119 ++++++++++++++++++++++ backend/handlers/auth/local.go | 43 +++----- backend/handlers/bookings/reserve_test.go | 2 +- backend/handlers/user/gdpr_export.go | 34 +++---- backend/handlers/user/gdpr_test.go | 97 ++++++++++++++++++ 7 files changed, 276 insertions(+), 79 deletions(-) diff --git a/backend/auth/jwt.go b/backend/auth/jwt.go index de5f4c0..8ee5627 100644 --- a/backend/auth/jwt.go +++ b/backend/auth/jwt.go @@ -8,8 +8,9 @@ import ( "log" "time" - "crussell/db" "crussell/clock" + "crussell/db" + "github.com/jackc/pgx/v5" "github.com/go-chi/jwtauth/v5" @@ -43,7 +44,7 @@ func RevokeJTI(ctx context.Context, jti string, expiresAt time.Time) { } tx, err := db.Conn.Begin(ctx) if err != nil { - fmt.Printf("WARN: Failed to begin transaction for JTI revocation: %v\n", err) + log.Printf("WARN: Failed to begin transaction for JTI revocation: %v", err) return } defer tx.Rollback(ctx) @@ -54,12 +55,12 @@ func RevokeJTI(ctx context.Context, jti string, expiresAt time.Time) { jti, expiresAt) if err != nil { // Log but don't fail - this is best effort - fmt.Printf("WARN: Failed to revoke JTI %s: %v\n", jti, err) + log.Printf("WARN: Failed to revoke JTI %s: %v", jti, err) return } if err := tx.Commit(ctx); err != nil { - fmt.Printf("WARN: Failed to commit transaction for JTI revocation: %v\n", err) + log.Printf("WARN: Failed to commit transaction for JTI revocation: %v", err) } } @@ -81,46 +82,31 @@ func IsJTIRevoked(ctx context.Context, jti string) bool { return exists } -// CleanupRevokedJTIs removes expired entries from PostgreSQL -func CleanupRevokedJTIs(ctx context.Context) { +// CleanupRevokedJTIs removes expired entries from PostgreSQL and returns the count of deleted rows. +func CleanupRevokedJTIs(ctx context.Context) (int, error) { if db.Conn == nil { - return + return 0, nil } tx, err := db.Conn.Begin(ctx) if err != nil { - fmt.Printf("WARN: Failed to begin transaction for JTI cleanup: %v\n", err) - return + log.Printf("WARN: Failed to begin transaction for JTI cleanup: %v", err) + return 0, err } defer tx.Rollback(ctx) - _, err = tx.Exec(ctx, + tag, err := tx.Exec(ctx, `DELETE FROM revoked_jtis WHERE expires_at < NOW()`) if err != nil { - fmt.Printf("WARN: Failed to cleanup revoked JTIs: %v\n", err) - return + log.Printf("WARN: Failed to cleanup revoked JTIs: %v", err) + return 0, err } if err := tx.Commit(ctx); err != nil { - fmt.Printf("WARN: Failed to commit transaction for JTI cleanup: %v\n", err) + log.Printf("WARN: Failed to commit transaction for JTI cleanup: %v", err) + return 0, err } -} -// StartJTICleanup starts a background goroutine to periodically clean expired JTIs -func StartJTICleanup() { - go func() { - ticker := time.NewTicker(30 * time.Minute) - defer ticker.Stop() - for range ticker.C { - func() { - defer func() { - if r := recover(); r != nil { - log.Printf("Panic recovered in JWT cleanup ticker: %v", r) - } - }() - CleanupRevokedJTIs(context.Background()) - }() - } - }() + return int(tag.RowsAffected()), nil } func InitJWT(secret string) { diff --git a/backend/clock/clock.go b/backend/clock/clock.go index d5b2da3..6240864 100644 --- a/backend/clock/clock.go +++ b/backend/clock/clock.go @@ -1,3 +1,7 @@ +// Package clock provides the single source of truth for time across the +// application. All wall-clock operations use Now() for UTC consistency with +// the database. LondonLocation provides Europe/London for cron schedules and +// scheduling calculations that depend on local business-closing rules. package clock import "time" @@ -8,3 +12,13 @@ import "time" func Now() time.Time { return time.Now().UTC() } + +// London is the Europe/London timezone location, used for cron schedules and +// business-closing calculations. +var London = func() *time.Location { + loc, err := time.LoadLocation("Europe/London") + if err != nil { + panic("clock: failed to load Europe/London timezone: " + err.Error()) + } + return loc +}() diff --git a/backend/handlers/auth/auth_test.go b/backend/handlers/auth/auth_test.go index 537bbbd..ca827ce 100644 --- a/backend/handlers/auth/auth_test.go +++ b/backend/handlers/auth/auth_test.go @@ -1847,5 +1847,124 @@ func TestRefreshToken_RevokesOldJTI_DBBacked(t *testing.T) { } } +// ============================================================ +// CleanupStaleLoginEntries Tests +// ============================================================ + +func TestCleanupStaleLoginEntries_Empty(t *testing.T) { + t.Parallel() + + loginStateMu.Lock() + saved := loginInProgress + loginInProgress = make(map[string]time.Time) + loginStateMu.Unlock() + defer func() { + loginStateMu.Lock() + loginInProgress = saved + loginStateMu.Unlock() + }() + + _, err := CleanupStaleLoginEntries(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } +} + +func TestCleanupStaleLoginEntries_RemovesStale(t *testing.T) { + t.Parallel() + + loginStateMu.Lock() + saved := loginInProgress + loginInProgress = map[string]time.Time{ + "stale-user": clock.Now().Add(-60 * time.Second), + } + loginStateMu.Unlock() + defer func() { + loginStateMu.Lock() + loginInProgress = saved + loginStateMu.Unlock() + }() + + _, err := CleanupStaleLoginEntries(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + loginStateMu.Lock() + _, exists := loginInProgress["stale-user"] + deleted := loginInProgress["stale-user"] + loginStateMu.Unlock() + if exists { + t.Errorf("expected stale entry (60s old) to be removed, got %v", deleted) + } +} + +func TestCleanupStaleLoginEntries_PreservesRecent(t *testing.T) { + t.Parallel() + + loginStateMu.Lock() + saved := loginInProgress + loginInProgress = map[string]time.Time{ + "recent-user": clock.Now().Add(-5 * time.Second), + } + loginStateMu.Unlock() + defer func() { + loginStateMu.Lock() + loginInProgress = saved + loginStateMu.Unlock() + }() + + _, err := CleanupStaleLoginEntries(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + loginStateMu.Lock() + _, exists := loginInProgress["recent-user"] + loginStateMu.Unlock() + if !exists { + t.Error("expected recent entry (5s old) to be preserved") + } +} + +func TestCleanupStaleLoginEntries_Mixed(t *testing.T) { + t.Parallel() + + loginStateMu.Lock() + saved := loginInProgress + loginInProgress = map[string]time.Time{ + "stale-user": clock.Now().Add(-60 * time.Second), + "recent-user": clock.Now().Add(-5 * time.Second), + "borderline": clock.Now().Add(-29 * time.Second), // Just under 30s threshold + } + loginStateMu.Unlock() + defer func() { + loginStateMu.Lock() + loginInProgress = saved + loginStateMu.Unlock() + }() + + _, err := CleanupStaleLoginEntries(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + loginStateMu.Lock() + _, staleExists := loginInProgress["stale-user"] + _, recentExists := loginInProgress["recent-user"] + _, borderlineExists := loginInProgress["borderline"] + loginStateMu.Unlock() + + if staleExists { + t.Error("expected stale-user (60s old) to be removed") + } + if !recentExists { + t.Error("expected recent-user (5s old) to be preserved") + } + if !borderlineExists { + t.Error("expected borderline entry (29s old) to be preserved") + } +} + // Ensure test compilation - import pgxpool to avoid unused import var _ = func() *pgxpool.Pool { return nil } diff --git a/backend/handlers/auth/local.go b/backend/handlers/auth/local.go index 41e84be..c316a5b 100644 --- a/backend/handlers/auth/local.go +++ b/backend/handlers/auth/local.go @@ -1,10 +1,10 @@ package auth import ( + "context" "crussell/auth" "crussell/clock" "crussell/db" - "github.com/jackc/pgx/v5" "crussell/internal/dav" "crussell/internal/validators" "crussell/internal/zxcvbnjs" @@ -16,21 +16,22 @@ import ( "log" "net/http" - "github.com/go-chi/chi/v5/middleware" + "github.com/jackc/pgx/v5" + "os" "regexp" "strings" "sync" "time" + "github.com/go-chi/chi/v5/middleware" + "github.com/nyaruka/phonenumbers" "golang.org/x/crypto/bcrypt" "golang.org/x/text/cases" "golang.org/x/text/language" ) - - const maxLoginInProgress = 20 // Login state management @@ -39,30 +40,18 @@ var ( loginInProgress = make(map[string]time.Time) ) -func init() { - go func() { - ticker := time.NewTicker(1 * time.Hour) - defer ticker.Stop() - - for range ticker.C { - func() { - defer func() { - if r := recover(); r != nil { - log.Printf("Panic recovered in login state cleanup ticker: %v", r) - } - }() - loginStateMu.Lock() - now := clock.Now() - // Clean up stuck loginInProgress entries (older than 30s) - for userID, startedAt := range loginInProgress { - if now.Sub(startedAt) > 30*time.Second { - delete(loginInProgress, userID) - } - } - loginStateMu.Unlock() - }() +// CleanupStaleLoginEntries removes stuck loginInProgress entries older than 30 seconds. +// Called by the centralised jobs scheduler. +func CleanupStaleLoginEntries(ctx context.Context) (int, error) { + loginStateMu.Lock() + defer loginStateMu.Unlock() + now := clock.Now() + for userID, startedAt := range loginInProgress { + if now.Sub(startedAt) > 30*time.Second { + delete(loginInProgress, userID) } - }() + } + return 0, nil } type RegisterRequest struct { diff --git a/backend/handlers/bookings/reserve_test.go b/backend/handlers/bookings/reserve_test.go index e90766f..f5ca538 100644 --- a/backend/handlers/bookings/reserve_test.go +++ b/backend/handlers/bookings/reserve_test.go @@ -325,7 +325,7 @@ func TestReserveSlot_DualCleanup(t *testing.T) { } // Run cleanup - err = scheduling.CleanupOldReservations(ctx) + _, err = scheduling.CleanupOldReservations(ctx) if err != nil { t.Fatalf("CleanupOldReservations failed: %v", err) } diff --git a/backend/handlers/user/gdpr_export.go b/backend/handlers/user/gdpr_export.go index 9f987b4..b795d77 100644 --- a/backend/handlers/user/gdpr_export.go +++ b/backend/handlers/user/gdpr_export.go @@ -24,28 +24,20 @@ type gdprCacheEntry struct { generating bool } -func init() { - go func() { - ticker := time.NewTicker(5 * time.Minute) - defer ticker.Stop() - for range ticker.C { - func() { - defer func() { - if r := recover(); r != nil { - log.Printf("Panic recovered in GDPR export cache cleanup ticker: %v", r) - } - }() - gdprExportCacheMu.Lock() - now := clock.Now() - for k, v := range gdprExportCache { - if now.After(v.expiresAt) { - delete(gdprExportCache, k) - } - } - gdprExportCacheMu.Unlock() - }() +// CleanupGDPRExportCache removes expired entries from the GDPR export cache. +// Called by the centralised jobs scheduler. +func CleanupGDPRExportCache(ctx context.Context) (int, error) { + gdprExportCacheMu.Lock() + defer gdprExportCacheMu.Unlock() + now := clock.Now() + var n int + for k, v := range gdprExportCache { + if now.After(v.expiresAt) { + delete(gdprExportCache, k) + n++ } - }() + } + return n, nil } // GET /api/user/gdpr-export diff --git a/backend/handlers/user/gdpr_test.go b/backend/handlers/user/gdpr_test.go index 15db1e1..625d6b4 100644 --- a/backend/handlers/user/gdpr_test.go +++ b/backend/handlers/user/gdpr_test.go @@ -1214,3 +1214,100 @@ func TestAnonymizeStaleGuestAccounts_DoesNotAffectRegisteredUsers(t *testing.T) t.Errorf("expected referral_code to be preserved, got %v", referralCode) } } + +// ============================================================ +// CleanupGDPRExportCache Tests +// ============================================================ + +func TestCleanupGDPRExportCache_Empty(t *testing.T) { + t.Parallel() + + gdprExportCacheMu.Lock() + gdprExportCache = make(map[string]*gdprCacheEntry) + gdprExportCacheMu.Unlock() + + _, err := CleanupGDPRExportCache(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } +} + +func TestCleanupGDPRExportCache_RemovesExpired(t *testing.T) { + t.Parallel() + + gdprExportCacheMu.Lock() + gdprExportCache = map[string]*gdprCacheEntry{ + "user-expired": {expiresAt: clock.Now().Add(-1 * time.Hour)}, + } + gdprExportCacheMu.Unlock() + + _, err := CleanupGDPRExportCache(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + gdprExportCacheMu.RLock() + _, exists := gdprExportCache["user-expired"] + gdprExportCacheMu.RUnlock() + if exists { + t.Error("expected expired entry to be removed") + } +} + +func TestCleanupGDPRExportCache_PreservesValid(t *testing.T) { + t.Parallel() + + gdprExportCacheMu.Lock() + gdprExportCache = map[string]*gdprCacheEntry{ + "user-valid": {expiresAt: clock.Now().Add(1 * time.Hour)}, + } + gdprExportCacheMu.Unlock() + + _, err := CleanupGDPRExportCache(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + gdprExportCacheMu.RLock() + entry, exists := gdprExportCache["user-valid"] + gdprExportCacheMu.RUnlock() + if !exists { + t.Fatal("expected valid entry to be preserved") + } + if entry == nil { + t.Error("expected non-nil entry") + } +} + +func TestCleanupGDPRExportCache_Mixed(t *testing.T) { + t.Parallel() + + gdprExportCacheMu.Lock() + gdprExportCache = map[string]*gdprCacheEntry{ + "user-expired": {expiresAt: clock.Now().Add(-2 * time.Hour)}, + "user-valid": {expiresAt: clock.Now().Add(2 * time.Hour)}, + "user-expired2": {expiresAt: clock.Now().Add(-30 * time.Minute)}, + } + gdprExportCacheMu.Unlock() + + _, err := CleanupGDPRExportCache(context.Background()) + if err != nil { + t.Errorf("expected nil error, got %v", err) + } + + gdprExportCacheMu.RLock() + _, expiredExists := gdprExportCache["user-expired"] + _, validExists := gdprExportCache["user-valid"] + _, expired2Exists := gdprExportCache["user-expired2"] + gdprExportCacheMu.RUnlock() + + if expiredExists { + t.Error("expected user-expired to be removed") + } + if expired2Exists { + t.Error("expected user-expired2 to be removed") + } + if !validExists { + t.Error("expected user-valid to be preserved") + } +}