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>
292 lines
9.8 KiB
Go
292 lines
9.8 KiB
Go
package admin_test
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/J3vb/OwnCord/Server/admin"
|
|
)
|
|
|
|
func TestSetupStatus_NeedsSetup(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "GET", "/setup/status", "", nil)
|
|
if rr.Code != http.StatusOK {
|
|
t.Fatalf("GET /setup/status = %d, want 200", rr.Code)
|
|
}
|
|
|
|
var resp struct {
|
|
NeedsSetup bool `json:"needs_setup"`
|
|
}
|
|
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
if !resp.NeedsSetup {
|
|
t.Error("needs_setup = false, want true (no users)")
|
|
}
|
|
}
|
|
|
|
func TestSetupStatus_NoSetupNeeded(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
createAdminUser(t, database) // Create a user first
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "GET", "/setup/status", "", nil)
|
|
if rr.Code != http.StatusOK {
|
|
t.Fatalf("GET /setup/status = %d, want 200", rr.Code)
|
|
}
|
|
|
|
var resp struct {
|
|
NeedsSetup bool `json:"needs_setup"`
|
|
}
|
|
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
if resp.NeedsSetup {
|
|
t.Error("needs_setup = true, want false (user exists)")
|
|
}
|
|
}
|
|
|
|
func TestSetup_CreatesOwner(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "myadmin",
|
|
"password": "SecurePass123!",
|
|
})
|
|
|
|
if rr.Code != http.StatusCreated {
|
|
t.Fatalf("POST /setup = %d, want 201; body=%s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var resp struct {
|
|
Token string `json:"token"`
|
|
UserID int64 `json:"user_id"`
|
|
Username string `json:"username"`
|
|
InviteCode string `json:"invite_code"`
|
|
}
|
|
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
if resp.Token == "" {
|
|
t.Error("token is empty")
|
|
}
|
|
if resp.Username != "myadmin" {
|
|
t.Errorf("username = %q, want %q", resp.Username, "myadmin")
|
|
}
|
|
if resp.InviteCode == "" {
|
|
t.Error("invite_code is empty")
|
|
}
|
|
if resp.UserID == 0 {
|
|
t.Error("user_id is 0")
|
|
}
|
|
|
|
// Verify user was created with Owner role.
|
|
user, err := database.GetUserByUsername(context.Background(), "myadmin")
|
|
if err != nil || user == nil {
|
|
t.Fatal("user not found in database after setup")
|
|
}
|
|
if user.RoleID != 1 {
|
|
t.Errorf("role_id = %d, want 1 (Owner)", user.RoleID)
|
|
}
|
|
}
|
|
|
|
// TestSetup_UsernameNotHTMLEscaped pins OC-0153: handleSetup must not persist
|
|
// an HTML-escaped owner username. setupPrecheck canonicalized the username
|
|
// with a bare bluemonday.StrictPolicy().Sanitize call, which HTML-escapes
|
|
// survivors (' -> ', & -> &, " -> "), so a name like "O'Brien"
|
|
// was stored as "O'Brien" — different from what the owner typed and from
|
|
// what handleLogin looks up later (which only trims). That permanently locks
|
|
// the Owner out of their own account. Mirrors the already-fixed sibling in
|
|
// Server/api/auth_handler_test.go (TestRegister_UsernameNotHTMLEscaped).
|
|
func TestSetup_UsernameNotHTMLEscaped(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "O'Brien",
|
|
"password": "SecurePass123!",
|
|
})
|
|
if rr.Code != http.StatusCreated {
|
|
t.Fatalf("POST /setup = %d, want 201; body=%s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var resp struct {
|
|
Username string `json:"username"`
|
|
}
|
|
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
if resp.Username != "O'Brien" {
|
|
t.Errorf("setup response username = %q, want %q (must not be HTML-escaped)", resp.Username, "O'Brien")
|
|
}
|
|
|
|
// The username handleLogin will look up (raw, only trimmed) must match
|
|
// what setup stored, or the owner is locked out of their own account.
|
|
stored, err := database.GetUserByUsername(context.Background(), "O'Brien")
|
|
if err != nil || stored == nil {
|
|
t.Fatalf("GetUserByUsername(%q) = (%v, %v), want a match", "O'Brien", stored, err)
|
|
}
|
|
}
|
|
|
|
func TestSetup_BlockedAfterFirstUser(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
// First setup succeeds.
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "owner1",
|
|
"password": "SecurePass123!",
|
|
})
|
|
if rr.Code != http.StatusCreated {
|
|
t.Fatalf("first setup = %d, want 201; body=%s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
// Second setup is blocked.
|
|
rr2 := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "hacker",
|
|
"password": "EvilPass456!",
|
|
})
|
|
if rr2.Code != http.StatusForbidden {
|
|
t.Errorf("second setup = %d, want 403", rr2.Code)
|
|
}
|
|
}
|
|
|
|
func TestSetup_WeakPassword(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "admin",
|
|
"password": "short",
|
|
})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("weak password = %d, want 400; body=%s", rr.Code, rr.Body.String())
|
|
}
|
|
}
|
|
|
|
func TestSetup_MissingFields(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": "",
|
|
"password": "",
|
|
})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("missing fields = %d, want 400", rr.Code)
|
|
}
|
|
}
|
|
|
|
// TestSetup_ConcurrentRace fires many parallel setup requests at a fresh
|
|
// server and asserts that exactly one owner is created (BUG-119).
|
|
func TestSetup_ConcurrentRace(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
const goroutines = 20
|
|
results := make(chan int, goroutines)
|
|
|
|
// Launch goroutines simultaneously.
|
|
start := make(chan struct{})
|
|
for i := range goroutines {
|
|
go func(n int) {
|
|
<-start // wait for the gate
|
|
rr := doRequest(t, handler, "POST", "/setup", "", map[string]string{
|
|
"username": fmt.Sprintf("owner%d", n),
|
|
"password": "SecurePass123!",
|
|
})
|
|
results <- rr.Code
|
|
}(i)
|
|
}
|
|
close(start) // release all goroutines at once
|
|
|
|
created := 0
|
|
for range goroutines {
|
|
code := <-results
|
|
switch code {
|
|
case http.StatusCreated:
|
|
created++
|
|
case http.StatusForbidden, http.StatusTooManyRequests:
|
|
// expected for losers (already set up or rate-limited)
|
|
default:
|
|
t.Errorf("unexpected status %d", code)
|
|
}
|
|
}
|
|
|
|
if created != 1 {
|
|
t.Errorf("expected exactly 1 owner created, got %d", created)
|
|
}
|
|
|
|
// Verify only one user exists in the database.
|
|
count, err := database.UserCount(context.Background())
|
|
if err != nil {
|
|
t.Fatalf("UserCount: %v", err)
|
|
}
|
|
if count != 1 {
|
|
t.Errorf("user count = %d, want 1", count)
|
|
}
|
|
}
|
|
|
|
// A freshly generated config leaves allowed_origins empty, and browsers send an
|
|
// Origin header on same-origin POSTs. Before isSameOrigin existed, that pairing
|
|
// made first-run setup fail on every new install with "cross-origin setup
|
|
// request blocked". These two tests pin both halves: same-origin gets through
|
|
// on an empty allowlist, and a foreign origin still does not.
|
|
func TestSetup_SameOriginAllowedWithEmptyAllowlist(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
body, err := json.Marshal(map[string]string{"username": "owner", "password": "correct-horse"})
|
|
if err != nil {
|
|
t.Fatalf("marshal: %v", err)
|
|
}
|
|
req := httptest.NewRequest("POST", "/setup", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
// httptest.NewRequest sets Host to example.com; the browser would send the
|
|
// matching Origin for a page served from this same server.
|
|
req.Header.Set("Origin", "https://"+req.Host)
|
|
|
|
rr := httptest.NewRecorder()
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
if rr.Code != http.StatusCreated {
|
|
t.Fatalf("POST /setup with same-origin Origin = %d, want 201; body: %s", rr.Code, rr.Body.String())
|
|
}
|
|
}
|
|
|
|
func TestSetup_ForeignOriginStillBlocked(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
body, err := json.Marshal(map[string]string{"username": "owner", "password": "correct-horse"})
|
|
if err != nil {
|
|
t.Fatalf("marshal: %v", err)
|
|
}
|
|
req := httptest.NewRequest("POST", "/setup", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("Origin", "https://evil.example")
|
|
|
|
rr := httptest.NewRecorder()
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
if rr.Code != http.StatusForbidden {
|
|
t.Fatalf("POST /setup from a foreign origin = %d, want 403", rr.Code)
|
|
}
|
|
|
|
count, err := database.UserCount(context.Background())
|
|
if err != nil {
|
|
t.Fatalf("UserCount: %v", err)
|
|
}
|
|
if count != 0 {
|
|
t.Fatalf("owner account created from a foreign origin: user count = %d, want 0", count)
|
|
}
|
|
}
|