mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Claude
7a4e5dc357
`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
100 lines
2.6 KiB
Go
100 lines
2.6 KiB
Go
package api
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"runtime"
|
|
"time"
|
|
|
|
"github.com/J3vb/OwnCord/Server/config"
|
|
"github.com/J3vb/OwnCord/Server/ws"
|
|
)
|
|
|
|
// diagnosticsResponse is returned by GET /api/v1/diagnostics/connectivity.
|
|
type diagnosticsResponse struct {
|
|
Server serverDiag `json:"server"`
|
|
Voice voiceDiag `json:"voice"`
|
|
Client clientDiag `json:"client"`
|
|
}
|
|
|
|
type serverDiag struct {
|
|
Version string `json:"version"`
|
|
Uptime int64 `json:"uptime_s"`
|
|
GoVersion string `json:"go_version"`
|
|
OnlineUsers int `json:"online_users"`
|
|
}
|
|
|
|
type voiceDiag struct {
|
|
Enabled bool `json:"enabled"`
|
|
LiveKitURL string `json:"livekit_url,omitempty"`
|
|
LiveKitHealth bool `json:"livekit_health"`
|
|
NodeIP string `json:"node_ip,omitempty"`
|
|
ProxyPath string `json:"proxy_path"`
|
|
}
|
|
|
|
type clientDiag struct {
|
|
RemoteAddr string `json:"remote_addr"`
|
|
IsPrivateNet bool `json:"is_private_network"`
|
|
}
|
|
|
|
func handleDiagnosticsConnectivity(
|
|
cfg *config.Config,
|
|
ver string,
|
|
hub *ws.Hub,
|
|
) http.HandlerFunc {
|
|
proxyNets := parseCIDRList(cfg.Server.TrustedProxies) // OC-0305: parse once at construction
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
clientAddr := clientIPWithProxies(r, proxyNets)
|
|
|
|
lkHealthy := false
|
|
if ok, _ := hub.LiveKitHealthCheck(r.Context()); ok {
|
|
lkHealthy = true
|
|
}
|
|
|
|
// Strip credentials from LiveKit URL before exposing in diagnostics.
|
|
sanitizedLKURL := ""
|
|
if cfg.Voice.LiveKitURL != "" {
|
|
if parsed, parseErr := url.Parse(cfg.Voice.LiveKitURL); parseErr == nil {
|
|
sanitizedLKURL = parsed.Host
|
|
}
|
|
}
|
|
|
|
resp := diagnosticsResponse{
|
|
Server: serverDiag{
|
|
Version: ver,
|
|
Uptime: int64(time.Since(serverStartTime).Seconds()),
|
|
GoVersion: runtime.Version(),
|
|
OnlineUsers: hub.ClientCount(),
|
|
},
|
|
Voice: voiceDiag{
|
|
Enabled: cfg.Voice.LiveKitURL != "",
|
|
LiveKitURL: sanitizedLKURL,
|
|
LiveKitHealth: lkHealthy,
|
|
NodeIP: cfg.Voice.NodeIP,
|
|
ProxyPath: "/livekit",
|
|
},
|
|
Client: clientDiag{
|
|
RemoteAddr: clientAddr,
|
|
IsPrivateNet: isPrivateIP(clientAddr),
|
|
},
|
|
}
|
|
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|
|
}
|
|
|
|
// isPrivateIP checks if an IP string is in a private/reserved range.
|
|
func isPrivateIP(ip string) bool {
|
|
for _, prefix := range []string{
|
|
"10.", "172.16.", "172.17.", "172.18.", "172.19.",
|
|
"172.20.", "172.21.", "172.22.", "172.23.", "172.24.",
|
|
"172.25.", "172.26.", "172.27.", "172.28.", "172.29.",
|
|
"172.30.", "172.31.", "192.168.", "127.", "::1", "fc", "fd",
|
|
} {
|
|
if len(ip) >= len(prefix) && ip[:len(prefix)] == prefix {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|