mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* feat(service): settings family — SettingsService over the Store seam The B3-8 settings/audit family's service: List, Patch (whitelist, boolean normalization, the require_2fa preconditions incl. the TOTP census and the unrelated-key guard, atomic apply, one audit row per changed key) and Setting (the read the hub and the backup scheduler consume; wraps db.ErrNotFound as the store reports it). db gains ApplySettings — the handler's raw upsert loop as one hand-written transactional wrapper where raw SQL belongs — and Store carries it. parseSettingsPatchBool duplicates auth.go's parseBooleanSettingValue with the admin surface's own pinned error wording; both messages are test-pinned, so the twins stay separate. Service-level characterization in settings_test.go mirrors the admin/api_test.go PATCH rows and adds the service-only contracts (ErrNotFound wrap, audit rows, multi-key apply). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * refactor(admin): settings handlers thin over SettingsService; scheduler reads via it handleGetSettings/handlePatchSettings become adapters (decode, delegate, map ErrBadRequest to 400 with the service's prefix-free message); the whitelist and every precondition now live only in the service, so admin/types.go's copy is gone. MaintainBackups reads backup_schedule and backup_retention through the service — its backup mechanics keep the handle — and the maintenance chain threads Settings from the runtime the hub stage built. NewHandler/NewAdminAPI gain the settings parameter; all 207 construction sites wired via the newTestSettingsService helper. Behavior parity pinned by the existing TestAdminAPI_*Settings* rows (all green); the only unpinned change is the PATCH 500 path collapsing its four stage-specific internal messages into one. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * refactor(ws): hub settings cache reads through a SettingsReader The hub's server_name/motd cache consumes a consumer-side SettingsReader interface (service.SettingsService satisfies it; HubOptions.Settings is required and validated like DB and Limiter — the RequiredCollaborators pin gains the refusal case). hub_settings.go no longer touches db at all, so the import pin from the B3-5 finisher goes, and its allowlist row goes with it; the thinned admin settings handler's row is deleted too — two allowlist rows down, the settings family's persistence now lives only in db/ and service/. Test helpers (both ws package namespaces) default the reader over the test database; newBareHub wires it explicitly; production passes Services.Settings from StartRuntime. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * docs(boundaries,b3): settings/audit family re-measure and evidence The backup pair takes its forecast boundary disposition; the family's two deleted rows and the disposition counts (28/18/15 -> 24/18/17) re-derived from the tool. Family evidence block appended to the B3-8 section; README B3 row records B3-5 complete and the family opened. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * fix(service): prefix-free ErrBadRequest wraps for the pinned admin bodies The %.0w rework was meant to ride the service commit but was left unstaged: with the plain %w wrap the PATCH error bodies carry a 'bad request: ' prefix the admin pins reject. Zero-width wrapping keeps errors.Is(ErrBadRequest) while err.Error() stays exactly the pinned message. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * test(app): lifecycle hub fixtures wire the required Settings reader The two direct ws.NewHub sites in lifecycle_test predate Settings becoming required; race across internal/app is green again. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * test(db): cover ApplySettings — the db coverage floor caught the gap CI's coverage floor failed db at 78.9% against 79.3%: ApplySettings was exercised only from service tests, which do not count toward db's own figure. Four db-side rows cover the apply, the empty no-op, the in-transaction failure rollback and the begin failure, using the package's full-migration opener. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 * chore(coverage): raise the service floor to the branch's measured 69.2 The settings family's tested service code raised the Linux figure from the 67.8 floor to 69.2; the ratchet raises the floor in the same PR (service is not in the run-varying set). db stays at 79.3 — this PR restores its figure (79.5 with the ApplySettings tests), it did not set out to raise it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8dwVLEihnGZYtH9X631F4 --------- Co-authored-by: Claude <noreply@anthropic.com>
154 lines
5.0 KiB
Go
154 lines
5.0 KiB
Go
package admin_test
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/J3vb/OwnCord/Server/admin"
|
|
"github.com/J3vb/OwnCord/Server/service"
|
|
)
|
|
|
|
func listBackupFiles(t *testing.T, dir string) []string {
|
|
t.Helper()
|
|
entries, err := os.ReadDir(dir)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil
|
|
}
|
|
t.Fatalf("ReadDir: %v", err)
|
|
}
|
|
var names []string
|
|
for _, e := range entries {
|
|
if filepath.Ext(e.Name()) == ".db" {
|
|
names = append(names, e.Name())
|
|
}
|
|
}
|
|
return names
|
|
}
|
|
|
|
func backdate(t *testing.T, path string, age time.Duration) {
|
|
t.Helper()
|
|
old := time.Now().Add(-age)
|
|
if err := os.Chtimes(path, old, old); err != nil {
|
|
t.Fatalf("Chtimes: %v", err)
|
|
}
|
|
}
|
|
|
|
// TestMaintainBackups_ScheduleAndRetention exercises the full settings-driven
|
|
// lifecycle: off is a no-op, daily creates one backup and only one, staleness
|
|
// triggers the next, and retention prunes expired backups while always
|
|
// keeping the newest.
|
|
func TestMaintainBackups_ScheduleAndRetention(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
dir := t.TempDir()
|
|
admin.SetBackupBaseDir(dir)
|
|
t.Cleanup(func() { admin.SetBackupBaseDir(filepath.Join("data", "backups")) })
|
|
ctx := context.Background()
|
|
|
|
// Settings absent → no-op, no error.
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups with no settings: %v", err)
|
|
}
|
|
if got := listBackupFiles(t, dir); len(got) != 0 {
|
|
t.Fatalf("no-settings tick created files: %v", got)
|
|
}
|
|
|
|
// Schedule off → still a no-op.
|
|
mustSetSetting(t, database, "backup_schedule", "off")
|
|
mustSetSetting(t, database, "backup_retention", "7")
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups with schedule=off: %v", err)
|
|
}
|
|
if got := listBackupFiles(t, dir); len(got) != 0 {
|
|
t.Fatalf("schedule=off created files: %v", got)
|
|
}
|
|
|
|
// Daily → first tick creates exactly one scheduled backup.
|
|
mustSetSetting(t, database, "backup_schedule", "daily")
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups daily #1: %v", err)
|
|
}
|
|
files := listBackupFiles(t, dir)
|
|
if len(files) != 1 || !strings.HasPrefix(files[0], "scheduled_") {
|
|
t.Fatalf("after first daily tick files = %v, want one scheduled_*.db", files)
|
|
}
|
|
first := filepath.Join(dir, files[0])
|
|
|
|
// Fresh backup on disk → next tick is a no-op.
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups daily #2: %v", err)
|
|
}
|
|
if got := listBackupFiles(t, dir); len(got) != 1 {
|
|
t.Fatalf("fresh-backup tick changed files: %v", got)
|
|
}
|
|
|
|
// Backup older than a day (but inside retention) → a new one is taken and
|
|
// the old one is kept.
|
|
backdate(t, first, 25*time.Hour)
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups daily #3: %v", err)
|
|
}
|
|
if got := listBackupFiles(t, dir); len(got) != 2 {
|
|
t.Fatalf("stale-backup tick files = %v, want 2", got)
|
|
}
|
|
|
|
// Old backup past the 7-day retention window → pruned; the fresh one stays.
|
|
backdate(t, first, 8*24*time.Hour)
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups daily #4: %v", err)
|
|
}
|
|
got := listBackupFiles(t, dir)
|
|
if len(got) != 1 {
|
|
t.Fatalf("retention tick files = %v, want 1", got)
|
|
}
|
|
if filepath.Join(dir, got[0]) == first {
|
|
t.Fatalf("retention pruned the newest backup instead of the expired one")
|
|
}
|
|
}
|
|
|
|
// TestMaintainBackups_RetentionNeverDeletesNewest locks the safety rule: even
|
|
// when every backup is past retention, the newest survives.
|
|
func TestMaintainBackups_RetentionNeverDeletesNewest(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
dir := t.TempDir()
|
|
admin.SetBackupBaseDir(dir)
|
|
t.Cleanup(func() { admin.SetBackupBaseDir(filepath.Join("data", "backups")) })
|
|
ctx := context.Background()
|
|
|
|
mustSetSetting(t, database, "backup_schedule", "off")
|
|
mustSetSetting(t, database, "backup_retention", "7")
|
|
|
|
// Two ancient backups, one slightly newer than the other.
|
|
older := filepath.Join(dir, "chatserver_a.db")
|
|
newer := filepath.Join(dir, "chatserver_b.db")
|
|
for _, p := range []string{older, newer} {
|
|
if err := os.WriteFile(p, []byte("x"), 0o600); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
backdate(t, older, 30*24*time.Hour)
|
|
backdate(t, newer, 20*24*time.Hour)
|
|
|
|
if err := admin.MaintainBackups(ctx, database, service.NewSettingsService(database)); err != nil {
|
|
t.Fatalf("MaintainBackups: %v", err)
|
|
}
|
|
got := listBackupFiles(t, dir)
|
|
if len(got) != 1 || got[0] != "chatserver_b.db" {
|
|
t.Fatalf("files = %v, want only chatserver_b.db (newest kept)", got)
|
|
}
|
|
}
|
|
|
|
func mustSetSetting(t *testing.T, database interface {
|
|
SetSetting(ctx context.Context, key, value string) error
|
|
}, key, value string,
|
|
) {
|
|
t.Helper()
|
|
if err := database.SetSetting(context.Background(), key, value); err != nil {
|
|
t.Fatalf("SetSetting(%s): %v", key, err)
|
|
}
|
|
}
|