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
144 lines
6.0 KiB
Go
144 lines
6.0 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"log/slog"
|
|
"net/http"
|
|
|
|
"github.com/J3vb/OwnCord/Server/auth"
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
"github.com/J3vb/OwnCord/Server/permissions"
|
|
)
|
|
|
|
// ─── Middleware ───────────────────────────────────────────────────────────────
|
|
|
|
// RequireAdminAuth is the exported admin gate for surfaces outside this
|
|
// package (api/router.go's plugin admin handler). Those routes stay
|
|
// ADMINISTRATOR-only, so it chains the perimeter check with an explicit
|
|
// ADMINISTRATOR requirement rather than exposing the widened perimeter.
|
|
func RequireAdminAuth(database *db.DB) func(http.Handler) http.Handler {
|
|
perimeter := adminAuthMiddleware(database)
|
|
administrator := requirePerm(permissions.Administrator)
|
|
return func(next http.Handler) http.Handler {
|
|
return perimeter(administrator(next))
|
|
}
|
|
}
|
|
|
|
// adminAuthMiddleware validates the Bearer token and requires at least one
|
|
// moderation-capable bit (permissions.AdminPerimeter) — not ADMINISTRATOR, so
|
|
// a Moderator role can reach the routes its bits allow. Individual route
|
|
// groups re-check the specific bit they need via requirePerm.
|
|
// On success it stores the *db.User, *db.Role and *db.Session in the request
|
|
// context so downstream handlers can retrieve them without re-querying.
|
|
func adminAuthMiddleware(database *db.DB) func(http.Handler) http.Handler {
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
token, ok := auth.ExtractBearerToken(r)
|
|
if !ok {
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "missing or invalid authorization header")
|
|
return
|
|
}
|
|
|
|
hash := auth.HashToken(token)
|
|
// Resolve the bearer token: login session first, then API token. An
|
|
// API token inherits its owning user's role, so a token whose user
|
|
// clears the perimeter authenticates here too and /admin/api/*
|
|
// works for headless clients.
|
|
user, role, sess, err := auth.ResolveTokenHash(r.Context(), database, hash)
|
|
if err != nil {
|
|
switch {
|
|
case errors.Is(err, auth.ErrTokenExpired):
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "session has expired")
|
|
case errors.Is(err, auth.ErrUserNotFound):
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "user not found")
|
|
case errors.Is(err, auth.ErrRoleNotFound):
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "role not found")
|
|
case errors.Is(err, auth.ErrTokenNotFound):
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "invalid or expired session")
|
|
default:
|
|
// A wrapped DB error, not one of the sentinels above (mirrors
|
|
// api.AuthMiddleware). A DB outage is not a bad token:
|
|
// answering 401 here would make the client treat a live,
|
|
// valid session as expired — the desktop client's doFetch
|
|
// 401 sink clears auth and deletes the stored credential for
|
|
// a session that was never revoked. Log it and report the
|
|
// failure as a server-side fault instead.
|
|
slog.ErrorContext(r.Context(), "admin: token resolution failed", "error", err)
|
|
writeErr(w, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "authentication service temporarily unavailable")
|
|
}
|
|
return
|
|
}
|
|
|
|
// F1: reject effectively-banned users before any further processing,
|
|
// as api.AuthMiddleware does — a ban must revoke admin-panel access
|
|
// immediately, not only once the session expires. Deliberately placed
|
|
// AFTER ResolveTokenHash so it also covers the API-token path this
|
|
// commit introduces; gating only the session branch would let a
|
|
// banned administrator keep working through a bot token.
|
|
if auth.IsEffectivelyBanned(user) {
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN", "your account has been suspended")
|
|
return
|
|
}
|
|
|
|
if !permissions.HasAnyPerm(role.Permissions, permissions.AdminPerimeter) {
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN", "moderation permission required")
|
|
return
|
|
}
|
|
|
|
ctx := context.WithValue(r.Context(), adminUserKey, user)
|
|
ctx = context.WithValue(ctx, adminRoleKey, role)
|
|
ctx = context.WithValue(ctx, adminSessionKey, sess) // nil for API-token principals; consumers guard nil
|
|
ctx = context.WithValue(ctx, adminTokenHashKey, hash)
|
|
next.ServeHTTP(w, r.WithContext(ctx))
|
|
})
|
|
}
|
|
}
|
|
|
|
// requirePerm gates a route group on a single server-wide permission bit.
|
|
// ADMINISTRATOR bypasses via permissions.HasServerPerm. The role comes from
|
|
// the request context (set by adminAuthMiddleware), so no extra query runs.
|
|
func requirePerm(perm int64) func(http.Handler) http.Handler {
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
role, ok := r.Context().Value(adminRoleKey).(*db.Role)
|
|
if !ok || role == nil {
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "not authenticated")
|
|
return
|
|
}
|
|
if !permissions.HasServerPerm(role.Permissions, perm) {
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN",
|
|
permissions.Name(perm)+" permission required")
|
|
return
|
|
}
|
|
next.ServeHTTP(w, r)
|
|
})
|
|
}
|
|
}
|
|
|
|
// ownerOnlyMiddleware wraps a handler to require Owner role (position == 100).
|
|
// It reads the user from context (set by adminAuthMiddleware) rather than
|
|
// re-authenticating, avoiding redundant DB queries and session-expiry gaps.
|
|
func ownerOnlyMiddleware(database *db.DB, next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
user, ok := r.Context().Value(adminUserKey).(*db.User)
|
|
if !ok || user == nil {
|
|
writeErr(w, http.StatusUnauthorized, "UNAUTHORIZED", "not authenticated")
|
|
return
|
|
}
|
|
|
|
role, err := database.GetRoleByID(r.Context(), user.RoleID)
|
|
if err != nil || role == nil {
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN", "role not found")
|
|
return
|
|
}
|
|
|
|
if role.Position < permissions.OwnerRolePosition {
|
|
writeErr(w, http.StatusForbidden, "FORBIDDEN", "owner role required")
|
|
return
|
|
}
|
|
|
|
next.ServeHTTP(w, r)
|
|
})
|
|
}
|