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>
153 lines
6.2 KiB
Go
153 lines
6.2 KiB
Go
package admin_test
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/J3vb/OwnCord/Server/admin"
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
)
|
|
|
|
// unbanMockHub wraps mockHub (admin/api_test.go) and additionally implements
|
|
// the optional memberUnbanBroadcaster capability handlePatchUser looks for
|
|
// via a type assertion, so these tests can observe whether an unban fired
|
|
// the mirror of BroadcastMemberBan.
|
|
type unbanMockHub struct {
|
|
*mockHub
|
|
unbannedIDs []int64
|
|
}
|
|
|
|
func (m *unbanMockHub) BroadcastMemberUnban(userID int64) {
|
|
m.unbannedIDs = append(m.unbannedIDs, userID)
|
|
}
|
|
|
|
// An unban must tell every already-connected client the user is back in the
|
|
// roster — the mirror of the ban path's BroadcastMemberBan — or they stay
|
|
// missing from every connected client's member store until that client
|
|
// reconnects (v022).
|
|
func TestAdminAPI_PatchUser_UnbanBroadcastsMemberUnban(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
hub := &unbanMockHub{mockHub: &mockHub{}}
|
|
handler := admin.NewAdminAPI(database, "1.0.0", hub, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
token := createAdminUser(t, database)
|
|
|
|
targetUID, _ := database.CreateUser(context.Background(), "unbanbroadcast", "hash", 3)
|
|
|
|
w := doRequest(t, handler, http.MethodPatch, "/users/"+itoa(targetUID), token, map[string]any{
|
|
"banned": true,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("ban: status = %d, want 200; body: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
w = doRequest(t, handler, http.MethodPatch, "/users/"+itoa(targetUID), token, map[string]any{
|
|
"banned": false,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("unban: status = %d, want 200; body: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
if len(hub.unbannedIDs) != 1 || hub.unbannedIDs[0] != targetUID {
|
|
t.Fatalf("BroadcastMemberUnban calls = %v, want exactly [%d]", hub.unbannedIDs, targetUID)
|
|
}
|
|
if len(hub.memberBanIDs) != 1 || hub.memberBanIDs[0] != targetUID {
|
|
t.Fatalf("BroadcastMemberBan calls = %v, want exactly [%d] (unaffected by the unban change)", hub.memberBanIDs, targetUID)
|
|
}
|
|
}
|
|
|
|
// A role change must re-derive channel visibility for the promoted user, not
|
|
// just revoke what they can no longer read — otherwise a channel the new
|
|
// role newly gained READ_MESSAGES on never appears in their sidebar until
|
|
// they reconnect (v025).
|
|
func TestAdminAPI_PatchUser_RoleChangeRefreshesVisibility(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
hub := &mockHub{}
|
|
handler := admin.NewAdminAPI(database, "1.0.0", hub, nil, nil, nil, nil, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
token := createAdminUser(t, database)
|
|
|
|
targetUID, _ := database.CreateUser(context.Background(), "rolerefresh", "hash", 3)
|
|
|
|
w := doRequest(t, handler, http.MethodPatch, "/users/"+itoa(targetUID), token, map[string]any{
|
|
"role_id": 2,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200; body: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
if hub.allVisibilityRefreshes != 1 {
|
|
t.Fatalf("RefreshAllChannelVisibility calls = %d, want 1", hub.allVisibilityRefreshes)
|
|
}
|
|
found := false
|
|
for _, mu := range hub.memberUpdates {
|
|
if mu.userID == targetUID {
|
|
found = true
|
|
}
|
|
}
|
|
if !found {
|
|
t.Fatalf("expected a member_update for the role change, got %+v", hub.memberUpdates)
|
|
}
|
|
}
|
|
|
|
// roleDeletingInvalidator simulates a second admin deleting the just-assigned
|
|
// role in the window between ModerationService.ChangeUserRole committing and
|
|
// handlePatchUser's own re-read of that role (used only for its name in the
|
|
// member_update payload). It hooks PermissionInvalidator.InvalidateUser
|
|
// because handlePatchUser calls that exactly once, synchronously, right
|
|
// after ChangeUserRole succeeds and right before the vulnerable re-read.
|
|
type roleDeletingInvalidator struct {
|
|
database *db.DB
|
|
deleteRoleID, fallbackRoleID int64
|
|
}
|
|
|
|
func (r *roleDeletingInvalidator) InvalidateUser(int64) {
|
|
if _, err := r.database.DeleteRoleReassigning(context.Background(), r.deleteRoleID, r.fallbackRoleID); err != nil {
|
|
panic(err) // test setup bug, not the behavior under test
|
|
}
|
|
}
|
|
func (r *roleDeletingInvalidator) InvalidateAll() {}
|
|
|
|
// A role demotion's live-subscription revocation (BroadcastMemberUpdate ->
|
|
// revokeUnreadableChannels) and visibility re-derivation
|
|
// (RefreshAllChannelVisibility) must run whenever ChangeUserRole actually
|
|
// committed the role change, not only when a second, purely-cosmetic re-read
|
|
// of the role (done only to get its name) happens to still succeed. If the
|
|
// role is deleted out from under that re-read — a real admin racing a role
|
|
// deletion against this handler, or a transient read error — the demoted
|
|
// user's socket must not be left subscribed to channels it can no longer
|
|
// read (OC-0045).
|
|
func TestAdminAPI_PatchUser_RoleChangeBroadcastsEvenIfRoleReReadFails(t *testing.T) {
|
|
database := openAdminTestDB(t)
|
|
hub := &mockHub{}
|
|
invalidator := &roleDeletingInvalidator{database: database, deleteRoleID: 2, fallbackRoleID: 3}
|
|
handler := admin.NewAdminAPI(database, "1.0.0", hub, nil, nil, nil, invalidator, newTestModService(database), newTestRoleService(database), newTestSettingsService(database))
|
|
token := createAdminUser(t, database)
|
|
|
|
targetUID, _ := database.CreateUser(context.Background(), "roleracetarget", "hash", 3)
|
|
|
|
// Promote the target to role 2 ("Admin"). The handler's own
|
|
// InvalidateUser hook fires mid-request and deletes role 2 (reassigning
|
|
// the target back to role 3 first, exactly like a real admin's DELETE
|
|
// /admin/api/roles/2 would), so by the time handlePatchUser re-reads
|
|
// role 2 for its name, GetRoleByID returns (nil, nil).
|
|
w := doRequest(t, handler, http.MethodPatch, "/users/"+itoa(targetUID), token, map[string]any{
|
|
"role_id": 2,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200; body: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
if hub.allVisibilityRefreshes != 1 {
|
|
t.Fatalf("RefreshAllChannelVisibility calls = %d, want 1 (role change committed regardless of the re-read)", hub.allVisibilityRefreshes)
|
|
}
|
|
found := false
|
|
for _, mu := range hub.memberUpdates {
|
|
if mu.userID == targetUID {
|
|
found = true
|
|
}
|
|
}
|
|
if !found {
|
|
t.Fatalf("expected a member_update for the role change despite the concurrent role deletion, got %+v", hub.memberUpdates)
|
|
}
|
|
}
|