-
-
- Dashboard
-
-
- Update Available!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | ID | Username | Role | Status | Banned | Actions |
|---|
-
-
-
-
-
-
-
-
-
-
-
-
-
- | ID | Name | Type | Category | Archived | Actions |
|---|
-
-
-
-
-
-
-
- Audit Log
-
-
-
- | Time | Actor | Action | Target | Detail |
|---|
-
-
-
-
-
-
-
- Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Backups
-
-
-
-
-
-
Backup History
-
- | Name | Size | Date | Actions |
|---|
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Server/admin/update_handlers_test.go b/Server/admin/update_handlers_test.go
index b5f0dfb8..a31402ad 100644
--- a/Server/admin/update_handlers_test.go
+++ b/Server/admin/update_handlers_test.go
@@ -30,7 +30,7 @@ func TestAdminAPI_CheckUpdate_OK(t *testing.T) {
u.SetBaseURL(mockGH.URL)
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodGet, "/updates", token, nil)
@@ -63,7 +63,7 @@ func TestAdminAPI_CheckUpdate_UpToDate(t *testing.T) {
u.SetBaseURL(mockGH.URL)
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodGet, "/updates", token, nil)
@@ -80,7 +80,7 @@ func TestAdminAPI_CheckUpdate_UpToDate(t *testing.T) {
func TestAdminAPI_CheckUpdate_Unauthenticated(t *testing.T) {
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, nil)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil)
w := doRequest(t, handler, http.MethodGet, "/updates", "", nil)
if w.Code != http.StatusUnauthorized {
@@ -90,7 +90,7 @@ func TestAdminAPI_CheckUpdate_Unauthenticated(t *testing.T) {
func TestAdminAPI_ApplyUpdate_RequiresOwner(t *testing.T) {
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, nil)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil)
// Create admin user (not owner - role 2)
adminUID, _ := database.CreateUser("adminonly2", "hash", 2)
@@ -110,7 +110,7 @@ func TestAdminAPI_ApplyUpdate_RequiresOwner(t *testing.T) {
func TestAdminAPI_ApplyUpdate_NilUpdater(t *testing.T) {
database := openAdminTestDB(t)
// nil updater — the endpoint should return 503
- handler := admin.NewAdminAPI(database, "1.0.0", nil, nil)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
@@ -123,7 +123,7 @@ func TestAdminAPI_ApplyUpdate_NilUpdater(t *testing.T) {
// in the 503 response.
func TestAdminAPI_ApplyUpdate_NilUpdater_ErrorCode(t *testing.T) {
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, nil)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
@@ -155,7 +155,7 @@ func TestAdminAPI_ApplyUpdate_NoUpdateAvailable(t *testing.T) {
u.SetBaseURL(mockGH.URL)
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
@@ -186,7 +186,7 @@ func TestAdminAPI_ApplyUpdate_CheckFails(t *testing.T) {
u.SetBaseURL(mockGH.URL)
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
@@ -214,7 +214,7 @@ func TestAdminAPI_ApplyUpdate_MissingAssets(t *testing.T) {
u.SetBaseURL(mockGH.URL)
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
@@ -235,7 +235,7 @@ func TestAdminAPI_ApplyUpdate_MissingAssets(t *testing.T) {
// unauthenticated requests to POST /updates/apply.
func TestAdminAPI_ApplyUpdate_Unauthenticated(t *testing.T) {
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, nil)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, nil, nil)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", "", nil)
if w.Code != http.StatusUnauthorized {
@@ -286,7 +286,7 @@ func TestAdminAPI_ApplyUpdate_DownloadFails(t *testing.T) {
// the important thing is that the code path is executed.
database := openAdminTestDB(t)
- handler := admin.NewAdminAPI(database, "1.0.0", nil, u)
+ handler := admin.NewAdminAPI(database, "1.0.0", nil, u, nil)
token := createAdminUser(t, database)
w := doRequest(t, handler, http.MethodPost, "/updates/apply", token, nil)
diff --git a/Server/api/router.go b/Server/api/router.go
index b287b82b..ace2057e 100644
--- a/Server/api/router.go
+++ b/Server/api/router.go
@@ -20,7 +20,7 @@ import (
// NewRouter builds and returns the fully configured HTTP handler and the
// WebSocket hub (so the caller can call hub.GracefulStop on shutdown).
-func NewRouter(cfg *config.Config, database *db.DB, ver string) (http.Handler, *ws.Hub) {
+func NewRouter(cfg *config.Config, database *db.DB, ver string, logBuf *admin.RingBuffer) (http.Handler, *ws.Hub) {
r := chi.NewRouter()
// Middleware stack.
@@ -82,7 +82,7 @@ func NewRouter(cfg *config.Config, database *db.DB, ver string) (http.Handler, *
// Admin panel: static files + REST API (Phase 6).
u := updater.NewUpdater(ver, cfg.GitHub.Token, "J3vb", "OwnCord")
- r.Mount("/admin", admin.NewHandler(database, ver, hub, u))
+ r.Mount("/admin", admin.NewHandler(database, ver, hub, u, logBuf))
// Client auto-update endpoint (unauthenticated).
MountClientUpdateRoute(r, u)
diff --git a/Server/api/router_test.go b/Server/api/router_test.go
index e7537fbe..0fa99358 100644
--- a/Server/api/router_test.go
+++ b/Server/api/router_test.go
@@ -32,7 +32,7 @@ func setupRouter(t *testing.T) http.Handler {
},
}
- handler, _ := api.NewRouter(cfg, database, "test")
+ handler, _ := api.NewRouter(cfg, database, "test", nil)
return handler
}
diff --git a/Server/main.go b/Server/main.go
index d7b8955d..8d038238 100644
--- a/Server/main.go
+++ b/Server/main.go
@@ -18,6 +18,7 @@ import (
"syscall"
"time"
+ "github.com/owncord/server/admin"
"github.com/owncord/server/api"
"github.com/owncord/server/auth"
"github.com/owncord/server/config"
@@ -28,11 +29,15 @@ import (
var version = "dev"
func main() {
- log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
- Level: slog.LevelInfo,
- }))
+ // Create ring buffer for admin log viewer, then build a multi-handler
+ // that tees log records to both stdout (INFO+) and the ring buffer (DEBUG+).
+ logBuf := admin.NewRingBuffer(2000)
+ stdoutHandler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo})
+ multiHandler := admin.NewMultiHandler(stdoutHandler, logBuf, slog.LevelDebug)
+ log := slog.New(multiHandler)
+ slog.SetDefault(log)
- if err := run(log); err != nil {
+ if err := run(log, logBuf); err != nil {
_, _ = fmt.Fprintf(os.Stderr, "\n [ERROR] %v\n\n", err)
log.Error("server exited with error", "error", err)
os.Exit(1)
@@ -40,7 +45,7 @@ func main() {
}
// run is the real entrypoint — separated for testability.
-func run(log *slog.Logger) error {
+func run(log *slog.Logger, logBuf *admin.RingBuffer) error {
// Clean up old binary from a previous update.
if exePath, err := os.Executable(); err == nil {
oldPath := exePath + ".old"
@@ -64,7 +69,17 @@ func run(log *slog.Logger) error {
return fmt.Errorf("creating data dir %s: %w", cfg.Server.DataDir, mkdirErr)
}
- // ── 3. Open database + run migrations ─────────────────────────────────
+ // ── 3. TLS ────────────────────────────────────────────────────────────
+ tlsResult, err := auth.LoadOrGenerate(cfg.TLS)
+ if err != nil {
+ return fmt.Errorf("configuring TLS: %w", err)
+ }
+ tlsCfg := tlsResult.TLSConfig
+
+ // Print startup banner first so it appears above all init logs.
+ printBanner(cfg, version, tlsCfg != nil)
+
+ // ── 4. Open database + run migrations ─────────────────────────────────
database, err := db.Open(cfg.Database.Path)
if err != nil {
return fmt.Errorf("opening database: %w", err)
@@ -87,15 +102,8 @@ func run(log *slog.Logger) error {
log.Info("cleared stale voice states")
}
- // ── 4. TLS ─────────────────────────────────────────────────────────────
- tlsResult, err := auth.LoadOrGenerate(cfg.TLS)
- if err != nil {
- return fmt.Errorf("configuring TLS: %w", err)
- }
- tlsCfg := tlsResult.TLSConfig
-
// ── 5. Build HTTP router ───────────────────────────────────────────────
- router, hub := api.NewRouter(cfg, database, version)
+ router, hub := api.NewRouter(cfg, database, version, logBuf)
// ── 6. Start server ────────────────────────────────────────────────────
addr := fmt.Sprintf(":%d", cfg.Server.Port)
@@ -150,9 +158,6 @@ func run(log *slog.Logger) error {
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
defer stop()
- // Print startup banner.
- printBanner(cfg, version, tlsCfg != nil)
-
// Start serving in a goroutine.
serveErr := make(chan error, 1)
go func() {