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
210 lines
6.0 KiB
Go
210 lines
6.0 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
"text/tabwriter"
|
|
"time"
|
|
|
|
"github.com/J3vb/OwnCord/Server/auth"
|
|
"github.com/J3vb/OwnCord/Server/config"
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
)
|
|
|
|
// runTokenCLI implements `server token <create|list|revoke>`. It operates
|
|
// directly against the database — no HTTP, no login — so an operator can mint
|
|
// the first API token without any existing credential (the bootstrap path).
|
|
// Returns a process exit code.
|
|
func runTokenCLI(args []string) int {
|
|
if len(args) == 0 {
|
|
tokenUsage()
|
|
return 2
|
|
}
|
|
|
|
cfg, err := config.Load(config.DefaultPath)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: load config: %v\n", err)
|
|
return 1
|
|
}
|
|
// OpenShared: the CLI must work while the server is running (the docs'
|
|
// cron-backup recipe mints tokens against a live server). SQLite WAL makes
|
|
// the concurrent access safe; the single-process lock protects only the
|
|
// server's process-local state, which this CLI never touches.
|
|
database, err := db.OpenShared(cfg.Database.Path)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: open database: %v\n", err)
|
|
return 1
|
|
}
|
|
defer database.Close() //nolint:errcheck
|
|
// Idempotent: ensures the api_tokens table exists even if the server has
|
|
// never started against this database.
|
|
if err := db.Migrate(database); err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: migrate: %v\n", err)
|
|
return 1
|
|
}
|
|
|
|
ctx := context.Background()
|
|
switch args[0] {
|
|
case "create":
|
|
return tokenCreate(ctx, database, args[1:])
|
|
case "list":
|
|
return tokenList(ctx, database, args[1:])
|
|
case "revoke":
|
|
return tokenRevoke(ctx, database, args[1:])
|
|
default:
|
|
fmt.Fprintf(os.Stderr, "unknown token subcommand %q\n", args[0])
|
|
tokenUsage()
|
|
return 2
|
|
}
|
|
}
|
|
|
|
func tokenUsage() {
|
|
fmt.Fprint(os.Stderr, `usage: server token <command>
|
|
|
|
Commands:
|
|
create --label <name> [--user <username>] [--expires <dur>]
|
|
Mint a new API token. Prints the raw token once to stdout — store it
|
|
now, it is never recoverable. Defaults to the owner account and no
|
|
expiry. --expires accepts a Go duration, e.g. 720h.
|
|
list
|
|
List API tokens (never prints raw tokens).
|
|
revoke <id|label>
|
|
Revoke a token by numeric id or by label.
|
|
`)
|
|
}
|
|
|
|
func tokenCreate(ctx context.Context, database *db.DB, args []string) int {
|
|
fs := flag.NewFlagSet("token create", flag.ContinueOnError)
|
|
label := fs.String("label", "", "human-readable label (required)")
|
|
username := fs.String("user", "", "username to bind the token to (default: owner)")
|
|
expires := fs.Duration("expires", 0, "validity duration, e.g. 720h (default: never)")
|
|
if err := fs.Parse(args); err != nil {
|
|
return 2
|
|
}
|
|
if *label == "" {
|
|
fmt.Fprintln(os.Stderr, "error: --label is required")
|
|
return 2
|
|
}
|
|
|
|
var user *db.User
|
|
var err error
|
|
if *username != "" {
|
|
user, err = database.GetUserByUsername(ctx, *username)
|
|
} else {
|
|
user, err = database.GetOwnerUser(ctx)
|
|
}
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: look up user: %v\n", err)
|
|
return 1
|
|
}
|
|
if user == nil {
|
|
if *username != "" {
|
|
fmt.Fprintf(os.Stderr, "error: no user named %q\n", *username)
|
|
} else {
|
|
fmt.Fprintln(os.Stderr, "error: no users exist yet — create the owner account first")
|
|
}
|
|
return 1
|
|
}
|
|
|
|
raw, err := auth.GenerateToken()
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: generate token: %v\n", err)
|
|
return 1
|
|
}
|
|
var expiresAt *time.Time
|
|
if *expires > 0 {
|
|
t := time.Now().Add(*expires)
|
|
expiresAt = &t
|
|
}
|
|
id, err := database.CreateAPIToken(ctx, user.ID, auth.HashToken(raw), *label, expiresAt)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: create token: %v\n", err)
|
|
return 1
|
|
}
|
|
db.WriteAudit(ctx, database, user.ID, "api_token_create", "api_token", id, *label)
|
|
|
|
// Metadata to stderr, raw token alone to stdout — so `... | tail -1` or a
|
|
// capture pipe gets exactly the token.
|
|
fmt.Fprintf(os.Stderr, "Created API token #%d for user %q (label %q).\n", id, user.Username, *label)
|
|
fmt.Fprintln(os.Stderr, "Store this token now — it is shown only once:")
|
|
fmt.Println(raw)
|
|
return 0
|
|
}
|
|
|
|
func tokenList(ctx context.Context, database *db.DB, args []string) int {
|
|
fs := flag.NewFlagSet("token list", flag.ContinueOnError)
|
|
if err := fs.Parse(args); err != nil {
|
|
return 2
|
|
}
|
|
tokens, err := database.ListAPITokens(ctx)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: list tokens: %v\n", err)
|
|
return 1
|
|
}
|
|
if len(tokens) == 0 {
|
|
fmt.Println("no API tokens")
|
|
return 0
|
|
}
|
|
tw := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
|
|
// Buffer-write errors surface via tw.Flush() below, which is checked.
|
|
_, _ = fmt.Fprintln(tw, "ID\tUSER\tLABEL\tCREATED\tLAST USED\tEXPIRES\tREVOKED")
|
|
for _, t := range tokens {
|
|
_, _ = fmt.Fprintf(tw, "%d\t%s\t%s\t%s\t%s\t%s\t%s\n",
|
|
t.ID, t.Username, t.Label, t.CreatedAt,
|
|
orDash(t.LastUsed), orDash(t.ExpiresAt), orDash(t.RevokedAt))
|
|
}
|
|
if err := tw.Flush(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func tokenRevoke(ctx context.Context, database *db.DB, args []string) int {
|
|
fs := flag.NewFlagSet("token revoke", flag.ContinueOnError)
|
|
if err := fs.Parse(args); err != nil {
|
|
return 2
|
|
}
|
|
rest := fs.Args()
|
|
if len(rest) != 1 {
|
|
fmt.Fprintln(os.Stderr, "error: revoke takes exactly one argument (id or label)")
|
|
return 2
|
|
}
|
|
arg := rest[0]
|
|
|
|
var affected int64
|
|
var err error
|
|
if id, perr := strconv.ParseInt(arg, 10, 64); perr == nil {
|
|
affected, err = database.RevokeAPIToken(ctx, id)
|
|
if err == nil && affected > 0 {
|
|
db.WriteAudit(ctx, database, 0, "api_token_revoke", "api_token", id, arg)
|
|
}
|
|
} else {
|
|
affected, err = database.RevokeAPITokenByLabel(ctx, arg)
|
|
if err == nil && affected > 0 {
|
|
db.WriteAudit(ctx, database, 0, "api_token_revoke", "api_token", 0, arg)
|
|
}
|
|
}
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: revoke token: %v\n", err)
|
|
return 1
|
|
}
|
|
if affected == 0 {
|
|
fmt.Fprintf(os.Stderr, "no active token matched %q\n", arg)
|
|
return 1
|
|
}
|
|
fmt.Printf("revoked %d token(s)\n", affected)
|
|
return 0
|
|
}
|
|
|
|
// orDash renders a nullable timestamp column for the list table.
|
|
func orDash(s *string) string {
|
|
if s == nil || *s == "" {
|
|
return "-"
|
|
}
|
|
return *s
|
|
}
|