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
249 lines
7.3 KiB
Go
249 lines
7.3 KiB
Go
package admin
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/J3vb/OwnCord/Server/auth"
|
|
"github.com/J3vb/OwnCord/Server/db"
|
|
)
|
|
|
|
type revokingSSEWriter struct {
|
|
header http.Header
|
|
statusCode int
|
|
writeCount int
|
|
revoke func()
|
|
cancel func()
|
|
buffer bytes.Buffer
|
|
}
|
|
|
|
func (w *revokingSSEWriter) Header() http.Header {
|
|
if w.header == nil {
|
|
w.header = make(http.Header)
|
|
}
|
|
return w.header
|
|
}
|
|
|
|
func (w *revokingSSEWriter) WriteHeader(statusCode int) {
|
|
w.statusCode = statusCode
|
|
}
|
|
|
|
func (w *revokingSSEWriter) Write(data []byte) (int, error) {
|
|
_, _ = w.buffer.Write(data)
|
|
if bytes.Contains(data, []byte("data: ")) {
|
|
w.writeCount++
|
|
switch w.writeCount {
|
|
case 1:
|
|
if w.revoke != nil {
|
|
w.revoke()
|
|
}
|
|
case 2:
|
|
if w.cancel != nil {
|
|
w.cancel()
|
|
}
|
|
}
|
|
}
|
|
return len(data), nil
|
|
}
|
|
|
|
func (w *revokingSSEWriter) Flush() {}
|
|
|
|
func newLogStreamTestDB(t *testing.T) *db.DB {
|
|
t.Helper()
|
|
|
|
database, err := db.Open(":memory:")
|
|
if err != nil {
|
|
t.Fatalf("db.Open: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.Close() })
|
|
|
|
if err := db.Migrate(database); err != nil {
|
|
t.Fatalf("db.Migrate: %v", err)
|
|
}
|
|
|
|
return database
|
|
}
|
|
|
|
func TestHandleLogStream_BackfillStopsAfterSessionRevocation(t *testing.T) {
|
|
database := newLogStreamTestDB(t)
|
|
logBuf := NewRingBuffer(8)
|
|
logBuf.Write(LogEntry{Timestamp: "2026-03-29T10:00:00Z", Level: "info", Message: "first", Source: "test"})
|
|
logBuf.Write(LogEntry{Timestamp: "2026-03-29T10:00:01Z", Level: "info", Message: "second", Source: "test"})
|
|
|
|
userID, err := database.CreateUser(context.Background(), "owner", "hash", 1)
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
|
|
token, err := auth.GenerateToken()
|
|
if err != nil {
|
|
t.Fatalf("GenerateToken: %v", err)
|
|
}
|
|
tokenHash := auth.HashToken(token)
|
|
if _, err := database.CreateSession(context.Background(), userID, tokenHash, "test", "127.0.0.1"); err != nil {
|
|
t.Fatalf("CreateSession: %v", err)
|
|
}
|
|
|
|
ticket, err := logTickets.issue(tokenHash)
|
|
if err != nil {
|
|
t.Fatalf("issue ticket: %v", err)
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/logs/stream?ticket="+ticket, nil).WithContext(ctx)
|
|
writer := &revokingSSEWriter{
|
|
header: make(http.Header),
|
|
revoke: func() {
|
|
_ = database.DeleteSession(context.Background(), tokenHash)
|
|
},
|
|
cancel: cancel,
|
|
}
|
|
|
|
handleLogStream(database, logBuf).ServeHTTP(writer, req)
|
|
|
|
if writer.statusCode != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200; body = %s", writer.statusCode, writer.buffer.String())
|
|
}
|
|
if writer.writeCount != 1 {
|
|
t.Fatalf("expected backfill to stop after first entry once session was revoked, wrote %d entries; body = %s", writer.writeCount, writer.buffer.String())
|
|
}
|
|
}
|
|
|
|
func TestHandleLogStream_BackfillStopsAfterAPITokenRevocation(t *testing.T) {
|
|
database := newLogStreamTestDB(t)
|
|
logBuf := NewRingBuffer(8)
|
|
logBuf.Write(LogEntry{Timestamp: "2026-07-31T10:00:00Z", Level: "info", Message: "first", Source: "test"})
|
|
logBuf.Write(LogEntry{Timestamp: "2026-07-31T10:00:01Z", Level: "info", Message: "second", Source: "test"})
|
|
|
|
userID, err := database.CreateUser(context.Background(), "owner", "hash", 1)
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
|
|
token, err := auth.GenerateToken()
|
|
if err != nil {
|
|
t.Fatalf("GenerateToken: %v", err)
|
|
}
|
|
tokenHash := auth.HashToken(token)
|
|
tokenID, err := database.CreateAPIToken(context.Background(), userID, tokenHash, "test", nil)
|
|
if err != nil {
|
|
t.Fatalf("CreateAPIToken: %v", err)
|
|
}
|
|
|
|
ticket, err := logTickets.issue(tokenHash)
|
|
if err != nil {
|
|
t.Fatalf("issue ticket: %v", err)
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/logs/stream?ticket="+ticket, nil).WithContext(ctx)
|
|
writer := &revokingSSEWriter{
|
|
header: make(http.Header),
|
|
revoke: func() {
|
|
_, _ = database.RevokeAPIToken(context.Background(), tokenID)
|
|
},
|
|
cancel: cancel,
|
|
}
|
|
|
|
handleLogStream(database, logBuf).ServeHTTP(writer, req)
|
|
|
|
if writer.statusCode != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200; body = %s", writer.statusCode, writer.buffer.String())
|
|
}
|
|
if writer.writeCount != 1 {
|
|
t.Fatalf("expected backfill to stop after first entry once the API token was revoked, wrote %d entries; body = %s", writer.writeCount, writer.buffer.String())
|
|
}
|
|
}
|
|
|
|
// TestHandleLogStream_SurvivesServerWriteTimeout pins the bug described in
|
|
// OC-0013: the handler writes SSE through the ordinary ResponseWriter (no
|
|
// Hijack), so on a real http.Server the connection's write deadline is set
|
|
// exactly once, when headers are read (net/http's conn.readRequest), from
|
|
// srv.WriteTimeout. Nothing in the handler extends that deadline, so once it
|
|
// elapses every further write on the connection silently times out (the
|
|
// handler discards write errors) and the client stops receiving anything.
|
|
//
|
|
// This must run against a real http.Server (httptest.NewUnstartedServer),
|
|
// not httptest.NewRequest/httptest.ResponseRecorder, because a
|
|
// ResponseRecorder has no underlying connection to enforce a write deadline
|
|
// on and so cannot reproduce the failure.
|
|
func TestHandleLogStream_SurvivesServerWriteTimeout(t *testing.T) {
|
|
database := newLogStreamTestDB(t)
|
|
logBuf := NewRingBuffer(64)
|
|
|
|
userID, err := database.CreateUser(context.Background(), "owner", "hash", 1)
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
token, err := auth.GenerateToken()
|
|
if err != nil {
|
|
t.Fatalf("GenerateToken: %v", err)
|
|
}
|
|
tokenHash := auth.HashToken(token)
|
|
if _, err := database.CreateSession(context.Background(), userID, tokenHash, "test", "127.0.0.1"); err != nil {
|
|
t.Fatalf("CreateSession: %v", err)
|
|
}
|
|
|
|
ticket, err := logTickets.issue(tokenHash)
|
|
if err != nil {
|
|
t.Fatalf("issue ticket: %v", err)
|
|
}
|
|
|
|
mux := http.NewServeMux()
|
|
mux.HandleFunc("/logs/stream", handleLogStream(database, logBuf))
|
|
|
|
srv := httptest.NewUnstartedServer(mux)
|
|
// A short stand-in for main.go's srv.WriteTimeout: 30 * time.Second, so
|
|
// the test doesn't have to wait 30s for the deadline to elapse.
|
|
srv.Config.WriteTimeout = 200 * time.Millisecond
|
|
srv.Start()
|
|
defer srv.Close()
|
|
|
|
resp, err := http.Get(srv.URL + "/logs/stream?ticket=" + ticket)
|
|
if err != nil {
|
|
t.Fatalf("GET: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200", resp.StatusCode)
|
|
}
|
|
|
|
// Let the connection's write deadline (set once, at request-header time)
|
|
// elapse before asking the handler to write anything else.
|
|
time.Sleep(400 * time.Millisecond)
|
|
|
|
logBuf.Write(LogEntry{Timestamp: "2026-08-15T00:00:00Z", Level: "info", Message: "after-timeout", Source: "test"})
|
|
|
|
type readResult struct {
|
|
data []byte
|
|
err error
|
|
}
|
|
resultCh := make(chan readResult, 1)
|
|
body := resp.Body
|
|
go func() {
|
|
buf := make([]byte, 4096)
|
|
n, rerr := body.Read(buf)
|
|
resultCh <- readResult{data: buf[:n], err: rerr}
|
|
}()
|
|
|
|
select {
|
|
case res := <-resultCh:
|
|
if res.err != nil {
|
|
t.Fatalf("expected the post-timeout log entry to be delivered, got a read error instead (connection was severed by WriteTimeout): %v", res.err)
|
|
}
|
|
if !bytes.Contains(res.data, []byte("after-timeout")) {
|
|
t.Fatalf("expected the post-timeout entry in the stream, got: %q", res.data)
|
|
}
|
|
case <-time.After(3 * time.Second):
|
|
t.Fatal("timed out waiting for the post-WriteTimeout log entry; stream appears severed by http.Server.WriteTimeout")
|
|
}
|
|
}
|