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>
203 lines
8.0 KiB
Go
203 lines
8.0 KiB
Go
package admin_test
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/J3vb/OwnCord/Server/admin"
|
|
"github.com/J3vb/OwnCord/Server/auth"
|
|
"github.com/J3vb/OwnCord/Server/updater"
|
|
)
|
|
|
|
// ─── NewHandler ───────────────────────────────────────────────────────────────
|
|
|
|
// TestNewHandler_ReturnsNonNilHandler verifies that NewHandler returns a non-nil
|
|
// http.Handler with all dependencies wired.
|
|
func TestNewHandler_ReturnsNonNilHandler(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
h := admin.NewHandler(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
if h == nil {
|
|
t.Fatal("NewHandler returned nil handler")
|
|
}
|
|
}
|
|
|
|
// TestNewHandler_ServesStaticRoot verifies that GET / on the returned handler
|
|
// responds with 200 and HTML content (the embedded admin SPA).
|
|
func TestNewHandler_ServesStaticRoot(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
h := admin.NewHandler(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
|
w := httptest.NewRecorder()
|
|
h.ServeHTTP(w, req)
|
|
|
|
if w.Code != http.StatusOK {
|
|
t.Errorf("GET / status = %d, want 200", w.Code)
|
|
}
|
|
|
|
ct := w.Header().Get("Content-Type")
|
|
if ct == "" {
|
|
t.Error("Content-Type header missing on / response")
|
|
}
|
|
|
|
body := w.Body.String()
|
|
if !strings.Contains(body, "api('POST','/logs/ticket')") {
|
|
t.Error("admin root should request log stream tickets before opening EventSource")
|
|
}
|
|
if !strings.Contains(body, "/admin/api/logs/stream?ticket=") {
|
|
t.Error("admin root should connect to log stream with a ticket query parameter")
|
|
}
|
|
if strings.Contains(body, "/admin/api/logs/stream?token=") {
|
|
t.Error("admin root should not use the deprecated token-based log stream URL")
|
|
}
|
|
}
|
|
|
|
// TestNewHandler_SetsCSPOnRoot verifies that the root path response includes a
|
|
// Content-Security-Policy header allowing inline scripts and styles.
|
|
func TestNewHandler_SetsCSPOnRoot(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
h := admin.NewHandler(database, "1.0.0", nil, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
|
w := httptest.NewRecorder()
|
|
h.ServeHTTP(w, req)
|
|
|
|
csp := w.Header().Get("Content-Security-Policy")
|
|
if csp == "" {
|
|
t.Error("Content-Security-Policy header missing on / response")
|
|
}
|
|
}
|
|
|
|
// TestNewHandler_APIRoutesMounted verifies that /api/* routes are reachable
|
|
// through the NewHandler-returned handler (setup/status endpoint is unauthenticated).
|
|
func TestNewHandler_APIRoutesMounted(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
h := admin.NewHandler(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/api/setup/status", nil)
|
|
w := httptest.NewRecorder()
|
|
h.ServeHTTP(w, req)
|
|
|
|
// 200 because no users exist yet — setup is needed
|
|
if w.Code != http.StatusOK {
|
|
t.Errorf("GET /api/setup/status status = %d, want 200", w.Code)
|
|
}
|
|
}
|
|
|
|
// TestNewHandler_AuthProtectedRoute verifies that authenticated routes under
|
|
// /api require a valid token.
|
|
func TestNewHandler_AuthProtectedRoute(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
h := admin.NewHandler(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
// /api/stats requires authentication
|
|
req := httptest.NewRequest(http.MethodGet, "/api/stats", nil)
|
|
w := httptest.NewRecorder()
|
|
h.ServeHTTP(w, req)
|
|
|
|
if w.Code != http.StatusUnauthorized {
|
|
t.Errorf("unauthenticated /api/stats status = %d, want 401", w.Code)
|
|
}
|
|
}
|
|
|
|
// TestNewHandler_WithUpdater verifies that NewHandler works correctly when an
|
|
// updater is provided.
|
|
func TestNewHandler_WithUpdater(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
u := updater.NewUpdater("1.0.0", "", "J3vb", "OwnCord")
|
|
h := admin.NewHandler(database, "1.0.0", &mockHub{}, u, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
if h == nil {
|
|
t.Fatal("NewHandler with updater returned nil handler")
|
|
}
|
|
}
|
|
|
|
// ─── ownerOnlyMiddleware (tested via API endpoints that use it) ───────────────
|
|
|
|
// TestOwnerOnlyMiddleware_OwnerAllowed verifies that a user with Owner role
|
|
// (position == 100) can reach backup endpoints.
|
|
func TestOwnerOnlyMiddleware_OwnerAllowed(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
// createAdminUser creates an Owner-role user (role_id=1, position=100)
|
|
ownerToken := createAdminUser(t, database)
|
|
|
|
// Use a temp dir so the backup handler can create data/backups without
|
|
// polluting the repo working directory.
|
|
tmpDir := t.TempDir()
|
|
origDir, err := os.Getwd()
|
|
if err != nil {
|
|
t.Fatalf("os.Getwd: %v", err)
|
|
}
|
|
if err := os.Chdir(tmpDir); err != nil {
|
|
t.Fatalf("os.Chdir: %v", err)
|
|
}
|
|
admin.SetBackupBaseDir(filepath.Join(tmpDir, "data", "backups"))
|
|
t.Cleanup(func() {
|
|
_ = os.Chdir(origDir)
|
|
admin.SetBackupBaseDir(filepath.Join(origDir, "data", "backups"))
|
|
})
|
|
|
|
w := doRequest(t, handler, http.MethodPost, "/backup", ownerToken, nil)
|
|
|
|
// Owner should pass ownerOnlyMiddleware and reach handleBackup.
|
|
// handleBackup itself may return 200 (success) or 500 (if BackupTo fails in
|
|
// test environment), but it must not return 403 (forbidden).
|
|
if w.Code == http.StatusForbidden {
|
|
t.Errorf("Owner user got 403 Forbidden from backup endpoint — ownerOnlyMiddleware incorrectly blocked owner")
|
|
}
|
|
}
|
|
|
|
// TestOwnerOnlyMiddleware_AdminDenied verifies that a user with Admin role
|
|
// (position < 100) cannot reach owner-only endpoints.
|
|
func TestOwnerOnlyMiddleware_AdminDenied(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
// Create admin user (role_id=2, position=80)
|
|
adminUID, _ := database.CreateUser(context.Background(), "middlewareadmin", "hash", 2)
|
|
token := "mw-admin-token"
|
|
_, _ = database.CreateSession(context.Background(), adminUID, auth.HashToken(token), "test", "127.0.0.1")
|
|
|
|
w := doRequest(t, handler, http.MethodPost, "/backup", token, nil)
|
|
|
|
if w.Code != http.StatusForbidden {
|
|
t.Errorf("Admin user status = %d, want 403", w.Code)
|
|
}
|
|
}
|
|
|
|
// TestOwnerOnlyMiddleware_MemberDenied verifies that a Member-role user cannot
|
|
// reach owner-only endpoints.
|
|
func TestOwnerOnlyMiddleware_MemberDenied(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
memberToken := createMemberUser(t, database)
|
|
|
|
// Members don't have ADMINISTRATOR bit so they get 403 from adminAuthMiddleware
|
|
// before reaching ownerOnlyMiddleware — result is still non-200.
|
|
w := doRequest(t, handler, http.MethodPost, "/backup", memberToken, nil)
|
|
|
|
if w.Code == http.StatusOK {
|
|
t.Error("Member user got 200 from owner-only backup endpoint")
|
|
}
|
|
}
|
|
|
|
// TestOwnerOnlyMiddleware_Unauthenticated verifies that a missing token is
|
|
// rejected before reaching ownerOnlyMiddleware.
|
|
func TestOwnerOnlyMiddleware_Unauthenticated(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
handler := admin.NewAdminAPI(database, "1.0.0", &mockHub{}, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
|
|
w := doRequest(t, handler, http.MethodPost, "/backup", "", nil)
|
|
|
|
if w.Code != http.StatusUnauthorized {
|
|
t.Errorf("unauthenticated backup request status = %d, want 401", w.Code)
|
|
}
|
|
}
|