mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
`Server/go.mod` declared `github.com/owncord/server` while the public repository is `github.com/J3vb/OwnCord`. Nothing resolves that path — there is no `owncord` GitHub org and no vanity-import host serving go-import metadata for it — so every import line in the tree named a location that does not exist. It compiles because a main module's own path is never fetched, which is exactly why it went unnoticed. The obvious fix — an AST-aware import rewriter (`gomvpkg`, `go mod edit`) — is wrong here, and provably so. Six of the 722 occurrences are not imports at all: `api/main_test.go:20` (a goleak `IgnoreTopFunction` pattern), `telemetry/metrics.go:17-19` (three OTel instrumentation-scope names), `invariants/syncutil_locks.go:73` (a diagnostic message), and `invariants/syncutil_locks_test.go:56` (an import line inside a raw-string Go fixture). An import rewriter touches none of them, and the compiler cannot see any of them either. Done as one scripted substitution over `git ls-files`, anchored on the full `github.com/owncord/server` string. The anchor matters: `owncord-server` is a different identifier — the OTel `service.name` (`config/config.go`, `telemetry/telemetry_otel.go`) and the GHCR image name (`.github/workflows/release.yml`, `docker-compose.yml`) — and a looser pattern would have moved it. It is untouched: 10 occurrences across 9 files, before and after. 350 files, 728 insertions, 728 deletions. 722 occurrences in 344 Go files, plus `go.mod:1`, the `sed` at `Makefile:67`, `Server/CLAUDE.md:3`, `docs/architecture/server.md:5`, and the ledger pair (`findings-ledger.json:3758` plus a `render-ledger.mjs` re-render of `FINDINGS.md`). Zero in any workflow, zero in the Dockerfile, zero in `Server/.golangci.yml` (no `local-prefixes`, `gci`, `importas` or `depguard` rule keys on the module path, so import grouping is not configured anywhere). The plan's blast-radius estimate missed one thing, and it is the one that would have gone red: **gofmt**. `J` (0x4A) sorts before every lowercase letter, so in the 36 files where a module-local import shares a contiguous group with a third-party one, the module's imports must move above `github.com/go-chi/...`. `gofmt -l` was clean before the substitution and listed exactly 36 files after it; `gofmt -w` on those 36 restores it to clean. `gofmt` is an enforced gate — the `formatters` block in `Server/.golangci.yml`, which is S-05 — so a substitution-only commit fails Lint. Verified: both directions, and the line accounting is exact. Every added line in this diff contains the new module path (728) and every removed line contains the old one (728); the count of changed lines containing neither is **zero**, so the gofmt re-sort moved module-path lines only and touched no third-party import. The residual check (`git ls-files -z | xargs -0 grep -n 'github\.com/owncord/server'`) returns exactly two hits, both deliberately out of scope: the RL-13 row in `docs/audit-2026-08-23-repository-layout.md` and the measurement row in this phase's own plan. The compiler-invisible half was proven by reverting *only* `api/main_test.go:20` to the old path on the otherwise-renamed tree: `go build ./...` and `go vet ./api/` both still pass — they see nothing wrong — while `go test ./api/` FAILS, because the runtime function name now carries the new path and goleak stops ignoring `ws.(*Hub).Run.func1`. Restoring the line makes it pass. `go.sum` is byte-identical (no `go mod tidy` was run and none was needed). All four build-tag variants compile; `go vet ./...`, `go vet -tags otel,wazero ./...` and `go vet -tags deadlock ./...` pass; `go test -race ./...` is 16/16 packages green; `go test -tags deadlock ./...` passes; the tag-gated `./plugin/...` (wazero) and `./telemetry/...` (otel) runs pass. `golangci-lint` v2.11.3 — the pinned CI version, rebuilt locally against Go 1.26 because the packaged binary cannot load a 1.26 config — reports **0 issues**. `go run ./cmd/genprotocol` leaves `git diff --exit-code ws/message_types.go ../Client/src/lib/protocolTypes.ts` clean, so the rename does not reach the generated protocol constants. `npx prettier --check .` and `node .superpowers/render-ledger.mjs --check` pass. Not included: `docs/audit-2026-08-23-repository-layout.md` and `docs/plans/b1-repository-foundation-2026-08-25.md` keep the old path — they are the audit row and the measurement that motivated this change, and rewriting them would erase the record of what was measured. They are why the residual check needs a two-path allowance rather than being empty; that allowance is stated above rather than hidden in a pathspec. `telemetry/metrics.go:19` declares `scopeVoice` for a `Server/voice` package that does not exist; the substitution carried the dead path forward verbatim as `github.com/J3vb/OwnCord/Server/voice` rather than fixing it, because correcting a real observability bug inside a mechanical rename would hide it in a 350-file diff. It needs its own item. No `go.work`, no second module, and no vanity-import host was set up — the new path resolves against the real repository, but nothing imports this module as a library, so `go get` reachability was not exercised either way. Refs RL-13, L-12
278 lines
9.8 KiB
Go
278 lines
9.8 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"log/slog"
|
|
"net/http"
|
|
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
"github.com/J3vb/OwnCord/Server/service"
|
|
)
|
|
|
|
// ─── Role Handlers ───────────────────────────────────────────────────────────
|
|
//
|
|
// The whole group sits behind requirePerm(MANAGE_ROLES); RoleService re-checks
|
|
// the bit and owns the hierarchy rules (manage only below your own position,
|
|
// never grant a bit you lack, Owner/default undeletable), so these handlers
|
|
// stay adapters: decode, call, invalidate, fan out.
|
|
//
|
|
// Fan-out after a mutation follows the two existing patterns exactly:
|
|
// - the permission cache is invalidated BEFORE the hub calls, as the
|
|
// channel-override handlers do, so the hub's per-client visibility lookups
|
|
// repopulate from post-change data;
|
|
// - visibility is re-synced with targeted channel_create/channel_delete
|
|
// (RefreshChannelVisibility), not a reconnect — a role's mask is the base
|
|
// for every channel, so the refresh covers all of them.
|
|
|
|
// roleServiceUnavailable writes the fail-closed response used when the server
|
|
// was constructed without a RoleService. Refusing beats falling back to an
|
|
// unchecked UPDATE, mirroring the nil-ModerationService branches.
|
|
func roleServiceUnavailable(w http.ResponseWriter) {
|
|
writeErr(w, http.StatusInternalServerError, "INTERNAL_ERROR", "role service unavailable")
|
|
}
|
|
|
|
// writeRoleErr maps RoleService errors onto admin API responses. Separate from
|
|
// writeModerationErr only because NOT_FOUND means "role", not "user".
|
|
func writeRoleErr(w http.ResponseWriter, err error) {
|
|
switch {
|
|
case errors.Is(err, service.ErrForbidden):
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN", err.Error())
|
|
case errors.Is(err, service.ErrNotFound):
|
|
writeErr(w, http.StatusNotFound, "NOT_FOUND", "role not found")
|
|
case errors.Is(err, service.ErrBadRequest):
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", err.Error())
|
|
default:
|
|
writeErr(w, http.StatusInternalServerError, "INTERNAL_ERROR", "role action failed")
|
|
}
|
|
}
|
|
|
|
// roleRequest is the JSON body for POST /roles and PATCH /roles/{id}. Every
|
|
// field is a pointer so PATCH can tell "absent" from "set to zero" — a mask of
|
|
// 0 (a role that may do nothing) and an empty color are both legitimate values.
|
|
type roleRequest struct {
|
|
Name *string `json:"name"`
|
|
Color *string `json:"color"`
|
|
Permissions *int64 `json:"permissions"`
|
|
Position *int `json:"position"`
|
|
}
|
|
|
|
func (r roleRequest) toInput() service.RoleInput {
|
|
return service.RoleInput{
|
|
Name: r.Name,
|
|
Color: r.Color,
|
|
Permissions: r.Permissions,
|
|
Position: r.Position,
|
|
}
|
|
}
|
|
|
|
// reorderRolesRequest is the JSON body for PATCH /roles/reorder: the ids of
|
|
// every role below the caller's own rank, highest first.
|
|
type reorderRolesRequest struct {
|
|
RoleIDs []int64 `json:"role_ids"`
|
|
}
|
|
|
|
func handleListRoles(roles *service.RoleService) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
if roles == nil {
|
|
roleServiceUnavailable(w)
|
|
return
|
|
}
|
|
list, err := roles.ListRoles(r.Context(), actorFromContext(r))
|
|
if err != nil {
|
|
writeRoleErr(w, err)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, list)
|
|
}
|
|
}
|
|
|
|
func handleCreateRole(database *db.DB, hub HubBroadcaster, roles *service.RoleService) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
if roles == nil {
|
|
roleServiceUnavailable(w)
|
|
return
|
|
}
|
|
var req roleRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", "invalid request body")
|
|
return
|
|
}
|
|
role, err := roles.CreateRole(r.Context(), actorFromContext(r), req.toInput())
|
|
if err != nil {
|
|
writeRoleErr(w, err)
|
|
return
|
|
}
|
|
// A brand-new role has no members, so nothing's cached mask changed and
|
|
// no channel changed visibility — only the role list itself moved.
|
|
broadcastRoles(r, database, hub)
|
|
writeJSON(w, http.StatusCreated, role)
|
|
}
|
|
}
|
|
|
|
func handlePatchRole(database *db.DB, hub HubBroadcaster, permInvalidator PermissionInvalidator, roles *service.RoleService) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
if roles == nil {
|
|
roleServiceUnavailable(w)
|
|
return
|
|
}
|
|
id, err := pathInt64(r, "id")
|
|
if err != nil {
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", "invalid role id")
|
|
return
|
|
}
|
|
var req roleRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", "invalid request body")
|
|
return
|
|
}
|
|
|
|
// Members are read before the update: after it they are the same set,
|
|
// but reading first keeps the invalidation correct even if a concurrent
|
|
// role assignment lands in between (the extra id is a wasted eviction,
|
|
// a missing one is a stale grant).
|
|
affected, affectedOK := roles.AffectedUserIDs(r.Context(), id)
|
|
|
|
// The pre-update name is read the same way, so a rename can be
|
|
// detected below even though UpdateRole itself only reports whether
|
|
// permissions changed.
|
|
before, beforeErr := database.GetRoleByID(r.Context(), id)
|
|
|
|
role, permsChanged, err := roles.UpdateRole(r.Context(), actorFromContext(r), id, req.toInput())
|
|
if err != nil {
|
|
writeRoleErr(w, err)
|
|
return
|
|
}
|
|
|
|
// Clients key a member's role by NAME, not id (member_update /
|
|
// ready carry a role name string). A rename alone leaves every
|
|
// member of the role holding a name that no longer resolves against
|
|
// the post-rename role list — they lose their role color, member-list
|
|
// group and permission-gated affordances until they reconnect. A
|
|
// member_update per affected user re-keys them, exactly like a role
|
|
// delete's fallback move already does.
|
|
if beforeErr == nil && before != nil && before.Name != role.Name && affectedOK && hub != nil {
|
|
for _, uid := range affected {
|
|
hub.BroadcastMemberUpdate(uid, role.Name)
|
|
}
|
|
}
|
|
|
|
if permsChanged {
|
|
if affectedOK {
|
|
invalidateUsers(permInvalidator, affected)
|
|
} else if permInvalidator != nil {
|
|
// The member list was unreadable, so per-user eviction cannot
|
|
// be trusted; drop every cached mask instead (what reorder
|
|
// does on every call) rather than leave revoked grants live.
|
|
permInvalidator.InvalidateAll()
|
|
}
|
|
// READ_MESSAGES may have moved in either direction, so every
|
|
// channel's audience for this role has to be re-derived.
|
|
if hub != nil {
|
|
hub.RefreshAllChannelVisibility()
|
|
}
|
|
}
|
|
broadcastRoles(r, database, hub)
|
|
writeJSON(w, http.StatusOK, role)
|
|
}
|
|
}
|
|
|
|
func handleDeleteRole(database *db.DB, hub HubBroadcaster, permInvalidator PermissionInvalidator, roles *service.RoleService) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
if roles == nil {
|
|
roleServiceUnavailable(w)
|
|
return
|
|
}
|
|
id, err := pathInt64(r, "id")
|
|
if err != nil {
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", "invalid role id")
|
|
return
|
|
}
|
|
_, fallback, moved, err := roles.DeleteRole(r.Context(), actorFromContext(r), id)
|
|
if err != nil {
|
|
writeRoleErr(w, err)
|
|
return
|
|
}
|
|
|
|
// The service already dropped the moved members' cached masks; this
|
|
// covers the handler-side invalidator too (they are the same object in
|
|
// production, distinct in tests).
|
|
invalidateUsers(permInvalidator, moved)
|
|
if hub != nil {
|
|
// Same shape as PATCH /users/{id} role_change: member_update tells
|
|
// every client the user regrouped, and revokes the subscriptions
|
|
// the new role may not read.
|
|
for _, uid := range moved {
|
|
hub.BroadcastMemberUpdate(uid, fallback.Name)
|
|
}
|
|
hub.RefreshAllChannelVisibility()
|
|
}
|
|
broadcastRoles(r, database, hub)
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
}
|
|
|
|
func handleReorderRoles(hub HubBroadcaster, permInvalidator PermissionInvalidator, roles *service.RoleService) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
if roles == nil {
|
|
roleServiceUnavailable(w)
|
|
return
|
|
}
|
|
var req reorderRolesRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeErr(w, http.StatusBadRequest, "BAD_REQUEST", "invalid request body")
|
|
return
|
|
}
|
|
updated, err := roles.ReorderRoles(r.Context(), actorFromContext(r), req.RoleIDs)
|
|
if err != nil {
|
|
writeRoleErr(w, err)
|
|
return
|
|
}
|
|
// Positions carry no permission bits, so no channel changes visibility;
|
|
// but a cached role snapshot holds the old position, which the
|
|
// hierarchy checks read.
|
|
if permInvalidator != nil {
|
|
permInvalidator.InvalidateAll()
|
|
}
|
|
if hub != nil {
|
|
hub.BroadcastRolesUpdate(updated)
|
|
}
|
|
writeJSON(w, http.StatusOK, updated)
|
|
}
|
|
}
|
|
|
|
// invalidateUsers drops the cached permissions of the given users, if an
|
|
// invalidator is wired.
|
|
func invalidateUsers(permInvalidator PermissionInvalidator, userIDs []int64) {
|
|
if permInvalidator == nil {
|
|
return
|
|
}
|
|
for _, uid := range userIDs {
|
|
permInvalidator.InvalidateUser(uid)
|
|
}
|
|
}
|
|
|
|
// broadcastRoles re-reads the role list and pushes it to every client. Re-read
|
|
// rather than patched locally so the broadcast always reflects committed state,
|
|
// including any concurrent change.
|
|
//
|
|
// Called after the mutation has already committed, so the caller's request
|
|
// context may be canceled by the time this runs (client aborted, deadline
|
|
// fired) -- context.WithoutCancel detaches the re-read from that, matching
|
|
// broadcastEmojiSet in api/emoji_handler.go and broadcastDMOpen in
|
|
// api/dm_handler.go.
|
|
func broadcastRoles(r *http.Request, database *db.DB, hub HubBroadcaster) {
|
|
if hub == nil || database == nil {
|
|
return
|
|
}
|
|
list, err := database.ListRoles(context.WithoutCancel(r.Context()))
|
|
if err != nil {
|
|
// The mutation already committed; clients converge on their next
|
|
// reconnect rather than seeing a failed request.
|
|
slog.Warn("admin: roles_update broadcast skipped, role list unreadable", "err", err)
|
|
return
|
|
}
|
|
hub.BroadcastRolesUpdate(list)
|
|
}
|