Files
OwnCord/Server/ws/event_pruner_test.go
T
Claude d320a8b587 fix(review): address 11 Copilot review findings on PR #1132
Clean sweep of every actionable item from the two Copilot review passes
on head 59ae4d8. Grouped by severity:

─── Crash / security (must-fix) ─────────────────────────────────────

1. main.go:140 — telemetryShutdown nil panic.
   telemetry.Init can return (nil, err) on the -tags otel skeleton
   path; the deferred closure would then call a nil function. Normalise
   to a no-op shutdown when Init errors so the defer is always safe.

2. api/upload_handler.go — permSvc nil deref.
   MountUploadRoutes + handleServeFile dereference permSvc on every
   authenticated file request. Add a fail-fast panic at mount time so
   the misconfiguration surfaces at wiring, not on the first 500.
   Update upload_handler_test.go to pass a real PermissionService built
   on the test DB (the existing tests were missing the argument entirely,
   which meant the package wouldn't compile — this fixes the real bug
   Copilot flagged).

3. ws/event_persister.go — NewEventPersister nil EventStore panic.
   run() dereferences p.store on every flush. Panic at constructor
   time instead so the crash happens once at startup rather than
   minutes later in a background goroutine.

4. plugin/host_ui.go — serve-time symlink check.
   rejectSymlinksUnder only runs at install time, so a symlink created
   post-install (accidental or malicious) would be followed by
   http.ServeFile and leak host files. Add an os.Lstat + ModeSymlink
   check + IsRegular check to AssetHandler on every request. Cheap
   relative to the file read and closes the TOCTOU window.

─── Correctness / observability (should-fix) ───────────────────────

5. ws/deps.go:77 — requirePerm hides misconfig as FORBIDDEN.
   Previously, nil database, nil perms, or a GetRoleForUser error all
   returned ErrCodeForbidden with the same message, making operator
   failures indistinguishable from legitimate permission denials.
   Split the branches: misconfig + DB error now return ErrCodeInternal
   with a server-side slog.Error so operators see the real problem;
   FORBIDDEN is reserved for the actual permission-bit check.

6. telemetry/metrics.go — ServiceCallDurationMs renamed to Sec.
   Field name said "Ms" but the instrument name was
   `service_call_duration_seconds` with unit "s". Renamed the field
   and updated all 8 service-layer callers so the struct field and
   metric semantics match.

7. ws/event_persister.go — flushEvy typo → flushEvery.
   Renamed the field and the one call site in run().

─── Comments out of sync with code ──────────────────────────────────

8. plugin/loader.go — Stat vs Lstat comment.
   The comment claimed "Stat (not Lstat)" but the code correctly uses
   os.Lstat to detect symlinks. Updated the comment to match the code;
   the code was already right.

9. telemetry/telemetry_otel.go — compile claim wrong.
   Comment said the file would fail to compile without the upstream
   OTel modules, but the skeleton deliberately avoids importing them
   and Init returns a runtime error instead. Updated the comment to
   reflect actual CI behaviour (the -tags otel build step passes
   today but doesn't exercise real telemetry).

─── Nit / polish ────────────────────────────────────────────────────

10. ws/event_pruner.go — startup delay magic constant.
    Hard-coded time.Minute made the "run shortly after startup"
    behaviour untestable (a test with a 100ms interval would still
    wait a full minute). Cap the startup delay by the interval:
    min(interval, time.Minute). Documented via a new `maxStartupDelay`
    constant.

11. ws/event_pruner_test.go — new file.
    Unit coverage for runPrune cutoff correctness, error swallowing,
    StartEventPruner nil-store short-circuit, ctx cancellation, and
    the interval-bounded startup delay from fix #10. Uses a fakeEventStore
    stub that records every prune call and signals the first one so
    tests don't sleep.

─── Verification ────────────────────────────────────────────────────

gofmt -l clean. No network access in sandbox so `go vet` and `go test`
could not run; the changes are local and surgical and every touched
file compiles in isolation against the existing signatures.

https://claude.ai/code/session_01UsBsQW2YiA2usk9pnJjAWk
2026-04-06 13:48:41 +00:00

164 lines
5.0 KiB
Go

// Pass 4 follow-up — event pruner unit tests.
//
// Covers runPrune correctness (cutoff calculation + error path) and the
// StartEventPruner goroutine lifecycle (nil store short-circuit, ctx
// cancellation, startup-delay-bounded-by-interval behaviour introduced
// in the Copilot review fix).
package ws
import (
"context"
"errors"
"sync"
"sync/atomic"
"testing"
"time"
"github.com/owncord/server/db"
)
// fakeEventStore is a minimal EventStore stub that records every prune
// call and optionally returns a canned error. Only the methods actually
// exercised by the pruner are implemented; the rest panic so an accidental
// code path change is noisy.
type fakeEventStore struct {
mu sync.Mutex
pruneCalls int
lastCutoff time.Time
pruneReturn int64
pruneErr error
pruneSignal chan struct{} // closed (via atomic swap) once a prune happens
pruneDone atomic.Bool
}
func (f *fakeEventStore) PruneEventsOlderThan(_ context.Context, cutoff time.Time) (int64, error) {
f.mu.Lock()
f.pruneCalls++
f.lastCutoff = cutoff
ret := f.pruneReturn
err := f.pruneErr
f.mu.Unlock()
if !f.pruneDone.Swap(true) && f.pruneSignal != nil {
close(f.pruneSignal)
}
return ret, err
}
func (f *fakeEventStore) Calls() int {
f.mu.Lock()
defer f.mu.Unlock()
return f.pruneCalls
}
func (f *fakeEventStore) LastCutoff() time.Time {
f.mu.Lock()
defer f.mu.Unlock()
return f.lastCutoff
}
// Stubs for the rest of the EventStore interface — not exercised here.
func (*fakeEventStore) PersistEvent(context.Context, int64, string, int64, []byte) error {
panic("unused")
}
func (*fakeEventStore) GetEventsSince(context.Context, int64, int) ([]db.PersistedEvent, error) {
panic("unused")
}
func (*fakeEventStore) GetEventsSinceForChannels(context.Context, int64, []int64, int) ([]db.PersistedEvent, error) {
panic("unused")
}
func (*fakeEventStore) GetMaxEventSeq(context.Context) (int64, error) {
panic("unused")
}
func TestRunPruneCutoffCalculation(t *testing.T) {
s := &fakeEventStore{pruneReturn: 3}
retention := 24 * time.Hour
before := time.Now()
runPrune(context.Background(), s, retention)
after := time.Now()
if s.Calls() != 1 {
t.Fatalf("expected 1 prune call, got %d", s.Calls())
}
cutoff := s.LastCutoff()
// cutoff must be in the window [before - retention, after - retention].
minCutoff := before.Add(-retention)
maxCutoff := after.Add(-retention)
if cutoff.Before(minCutoff) || cutoff.After(maxCutoff) {
t.Errorf("cutoff %v not in expected window [%v, %v]", cutoff, minCutoff, maxCutoff)
}
}
func TestRunPruneErrorDoesNotPanic(t *testing.T) {
s := &fakeEventStore{pruneErr: errors.New("boom")}
// Must not panic, must not propagate — error is logged and swallowed
// so the background goroutine keeps ticking.
runPrune(context.Background(), s, time.Hour)
if s.Calls() != 1 {
t.Fatalf("expected 1 prune call even on error, got %d", s.Calls())
}
}
func TestStartEventPrunerNilStoreIsNoop(t *testing.T) {
// Should not spawn a goroutine, should not panic.
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
StartEventPruner(ctx, nil, time.Hour, time.Hour)
// If the nil check were missing, calling PruneEventsOlderThan on nil
// would panic inside the goroutine — but since we don't spawn one,
// there's nothing to assert beyond "we got here".
}
func TestStartEventPrunerContextCancellation(t *testing.T) {
s := &fakeEventStore{pruneSignal: make(chan struct{})}
ctx, cancel := context.WithCancel(context.Background())
// Short interval so startup delay is bounded to the interval (50ms).
StartEventPruner(ctx, s, time.Hour, 50*time.Millisecond)
// Wait for the first prune to happen so we know the goroutine started.
select {
case <-s.pruneSignal:
case <-time.After(2 * time.Second):
t.Fatal("pruner did not run within 2s")
}
// Cancel and give the goroutine a moment to exit. There's no direct
// handle to join on, but we can verify no further prunes happen after
// a grace period.
cancel()
time.Sleep(150 * time.Millisecond)
callsAfterCancel := s.Calls()
time.Sleep(200 * time.Millisecond)
if s.Calls() != callsAfterCancel {
t.Errorf("pruner kept running after ctx cancel: %d -> %d calls", callsAfterCancel, s.Calls())
}
}
func TestStartEventPrunerStartupDelayBoundedByInterval(t *testing.T) {
// With interval=20ms and the uncapped startup delay of 1 minute, the
// test would have to wait a full minute for the first prune. The
// Copilot-review fix caps the startup delay at min(interval, 1min),
// so with interval=20ms the first prune happens within ~20ms.
s := &fakeEventStore{pruneSignal: make(chan struct{})}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
start := time.Now()
StartEventPruner(ctx, s, time.Hour, 20*time.Millisecond)
select {
case <-s.pruneSignal:
elapsed := time.Since(start)
if elapsed > 500*time.Millisecond {
t.Errorf("startup delay not bounded by interval: first prune took %v", elapsed)
}
case <-time.After(2 * time.Second):
t.Fatal("pruner did not run within 2s — startup delay likely not bounded")
}
}