mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
J3vbandClaude Fable 5
a3459e5f80
requireBanAuthority (BAN_MEMBERS + role hierarchy) was wired only into ModerationService.BanUser/UnbanUser — which had zero production callers. The live path, handlePatchUser, ran a raw UPDATE with no hierarchy check, so any admin-panel actor could ban an equal- or higher-ranked user, including the owner. The ban/unban branch now calls the service (dead code becomes THE code — ban path 1 of 3 consolidated), which also audits as user_ban/user_unban, keeping the historical audit vocabulary. Authorization now runs in permission → existence → hierarchy order: an actor without ban authority sees Forbidden, never NotFound, so the ban path cannot enumerate user ids. The role+ban transaction is gone — the ban leg lives in the service, runs first, and a refusal returns before the role change executes, so a rejected ban never half-applies a PATCH. MemStore gains honest BanUser/UnbanUser so the matrix is testable. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
67 lines
2.4 KiB
Go
67 lines
2.4 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
|
|
}
|
|
|
|
// Handler returns the admin panel http.Handler using a nil database.
|
|
//
|
|
// Deprecated: use NewHandler instead. Kept for backwards-compat with any
|
|
// caller that already imported this symbol before Phase 6.
|
|
func Handler() http.Handler {
|
|
return http.FileServer(http.FS(staticFiles))
|
|
}
|