mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
J3vbandClaude Fable 5
f2966c2527
Applied from a deadcode (RTA from mains, all build tags) sweep with
per-symbol adversarial verification:
Deleted (nothing but their own self-tests used them):
- admin.Handler (deprecated since Phase 6; production mounts NewHandler)
plus its two self-tests
- ws.Hub.broadcastVoiceStateUpdate + wrapper + two self-tests (pre-V2
leftover; the live voice_state path is the hub voice routines)
- ws.VoiceLeaveEvent + methods ('retained as scaffolding', never
constructed in production; MsgTypeVoiceLeaveBC stays — live via the
leave routine)
- ws.parseIdentity (production calls parseParticipantIdentity directly;
ParseIdentityForTest now exercises the real parser)
- telemetry.Float64 (String/Int64 are used; the float case is covered by
the otel-tagged internal test, re-addable when a caller appears)
Moved into export_test.go so they leave the production binary (all
callers are same-package tests): the eight ws test-client constructors
and voice/E2EE setters from ws/client.go, admin.SetBackupBaseDir
(new admin/export_test.go), api.SecurityHeaders (test-only wrapper;
production uses SecurityHeadersWithTLS — docs/api.md updated to the
real name). Client.getVoiceJoinToken/setVoiceChID inlined into their
existing ForTest wrappers; TestSetVoiceChID_* self-tests deleted.
Kept after verification: updater.SetBaseURL (11 cross-package test call
sites) and telemetry.resetAppMetricsForInit (live under -tags otel —
untagged deadcode false positive).
Full gate green: gofmt/vet, 4 build-tag variants, full suite, deadlock,
race.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
59 lines
2.1 KiB
Go
59 lines
2.1 KiB
Go
// Package admin provides the embedded admin panel static file server and the
|
|
// admin REST API for the OwnCord server.
|
|
package admin
|
|
|
|
import (
|
|
"embed"
|
|
"io/fs"
|
|
"net/http"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/owncord/server/db"
|
|
"github.com/owncord/server/service"
|
|
"github.com/owncord/server/updater"
|
|
)
|
|
|
|
//go:embed static
|
|
var staticFiles embed.FS
|
|
|
|
// NewHandler returns an http.Handler that serves both the admin REST API and
|
|
// the embedded admin panel static files.
|
|
//
|
|
// Routes:
|
|
//
|
|
// /api/* — admin REST API (all require ADMINISTRATOR permission)
|
|
// /* — embedded static files (SPA; index.html for unknown paths)
|
|
func NewHandler(database *db.DB, version string, hub HubBroadcaster, u *updater.Updater, logBuf *RingBuffer, allowedOrigins []string, permInvalidator PermissionInvalidator, mod *service.ModerationService) http.Handler {
|
|
r := chi.NewRouter()
|
|
|
|
// Admin REST API mounted at /api
|
|
r.Mount("/api", NewAdminAPI(database, version, hub, u, logBuf, allowedOrigins, permInvalidator, mod))
|
|
|
|
// Static files — serve from the "static" sub-tree of the embedded FS.
|
|
// The //go:embed static directive in this package embeds as "static/…",
|
|
// not "admin/static/…", so we strip just "static".
|
|
staticFS, err := fs.Sub(staticFiles, "static")
|
|
if err != nil {
|
|
// This is a programming error (wrong embed path) and should never
|
|
// happen in production. Panic so it surfaces immediately in tests.
|
|
panic("admin: failed to create static sub-FS: " + err.Error())
|
|
}
|
|
|
|
// Serve index.html directly for the root path. We read it once at
|
|
// startup instead of using http.FileServer, which has redirect
|
|
// behaviour that conflicts with chi's Mount prefix stripping.
|
|
indexHTML, err := fs.ReadFile(staticFS, "index.html")
|
|
if err != nil {
|
|
panic("admin: failed to read index.html: " + err.Error())
|
|
}
|
|
r.Get("/", func(w http.ResponseWriter, req *http.Request) {
|
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
|
w.Header().Set("Content-Security-Policy",
|
|
"default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'")
|
|
_, _ = w.Write(indexHTML)
|
|
})
|
|
r.Handle("/*", http.FileServer(http.FS(staticFS)))
|
|
|
|
return r
|
|
}
|