mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
feat: public platform, admin console, templates, landing docs
Projects become publicly browsable after admin approval; management and secret-adjacent reads (logs, variables, exec, connection URLs) require owner/member/admin auth, and platform controls sit behind RequireAdmin. - Backend: OptionalAuth middleware, read/authed/admin route groups, projects.is_approved + service_templates.owner_id migration, visibility-aware sqlc queries, admin overview/users/approval endpoints, EnsureAdminAccount bootstrap (ADMIN_* env), 30 seeded templates with owner CRUD, managed-database connection URLs gated owner+admin, fix DB.Stats() infinite recursion. - Frontend: expandable persisted sidebar + clickable user menu, public landing page with searchable docs browser (GitHub sync, bundled snapshot + localStorage fallback), DocsBrowser shared with /docs, template create/edit/JSON-upload for owned templates, database create dialog, admin console (stats, approvals, project edit/delete, user admin toggles), HA/Security/Usage polish with dead CSS tokens mapped to real theme vars, anonymous-safe gating on every mutation control. - Tests: safe window.localStorage access fixes happy-dom crashes in PlatformShell and canvas storage. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Tomas DvorakandDevin committed
1 parent
8f5789bf93
commit
8b6214a0f5
62 files changed
+4986
-1133
No files matched your search
@@ -0,0 +1,295 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"containr/internal/config"
|
||||
"containr/internal/database"
|
||||
"containr/internal/database/sqlcdb"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Admin account bootstrap
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// EnsureAdminAccount provisions the platform owner account from
|
||||
// ADMIN_EMAIL/ADMIN_PASSWORD (optional ADMIN_NAME). It is idempotent: existing
|
||||
// users are simply promoted to admin. Both the local users row (legacy JWT
|
||||
// login) and the Better Auth account (cookie sessions) are created so either
|
||||
// sign-in path works. Failures are logged, never fatal — the platform must
|
||||
// boot even when auth is misconfigured.
|
||||
func EnsureAdminAccount(ctx context.Context, db *database.DB, cfg *config.Config) {
|
||||
email := strings.ToLower(strings.TrimSpace(cfg.AdminEmail))
|
||||
password := cfg.AdminPassword
|
||||
if email == "" || password == "" {
|
||||
return
|
||||
}
|
||||
if db == nil || db.DB == nil {
|
||||
log.Println("Admin bootstrap skipped: database unavailable")
|
||||
return
|
||||
}
|
||||
name := strings.TrimSpace(cfg.AdminName)
|
||||
if name == "" {
|
||||
name = "Platform Admin"
|
||||
}
|
||||
|
||||
// Local users row (owns resources, is_admin flag, legacy login hash).
|
||||
hashed, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
if err != nil {
|
||||
log.Printf("Admin bootstrap failed: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var userID string
|
||||
err = db.QueryRowContext(ctx, `
|
||||
INSERT INTO users (email, password_hash, name, is_admin)
|
||||
VALUES ($1, $2, $3, true)
|
||||
ON CONFLICT (email) DO UPDATE
|
||||
SET is_admin = true, updated_at = NOW()
|
||||
RETURNING id
|
||||
`, email, string(hashed), name).Scan(&userID)
|
||||
if err != nil {
|
||||
log.Printf("Admin bootstrap failed to upsert user %s: %v", email, err)
|
||||
return
|
||||
}
|
||||
|
||||
// Better Auth account (cookie-session sign-in). Duplicate sign-up returns
|
||||
// an error which we treat as "already provisioned".
|
||||
if err := ensureBetterAuthUser(ctx, name, email, password); err != nil {
|
||||
if errors.Is(err, errBetterAuthUserExists) {
|
||||
log.Printf("Admin account %s already exists in auth service; ensured admin flag", email)
|
||||
} else {
|
||||
log.Printf("Warning: admin bootstrap could not create auth user for %s: %v", email, err)
|
||||
}
|
||||
return
|
||||
}
|
||||
log.Printf("Admin account provisioned: %s", email)
|
||||
}
|
||||
|
||||
// ensureBetterAuthUser calls the Better Auth sign-up endpoint directly. Unlike
|
||||
// createBetterAuthUser it runs outside a request context.
|
||||
func ensureBetterAuthUser(ctx context.Context, name, email, password string) error {
|
||||
endpoint, err := betterAuthSignUpURL()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
body, err := json.Marshal(gin.H{"name": name, "email": email, "password": password})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
request, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.Header.Set("Accept", "application/json")
|
||||
if token := strings.TrimSpace(os.Getenv("BETTER_AUTH_INTERNAL_TOKEN")); token != "" {
|
||||
request.Header.Set("X-Containr-Auth-Internal", token)
|
||||
}
|
||||
|
||||
response, err := (&http.Client{Timeout: 10 * time.Second}).Do(request)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer response.Body.Close()
|
||||
|
||||
if response.StatusCode >= http.StatusOK && response.StatusCode < http.StatusMultipleChoices {
|
||||
return nil
|
||||
}
|
||||
|
||||
var payload map[string]interface{}
|
||||
_ = json.NewDecoder(response.Body).Decode(&payload)
|
||||
message := ""
|
||||
if raw, ok := payload["message"].(string); ok {
|
||||
message = strings.ToLower(raw)
|
||||
} else if raw, ok := payload["error"].(string); ok {
|
||||
message = strings.ToLower(raw)
|
||||
}
|
||||
if strings.Contains(message, "exist") || strings.Contains(message, "already") {
|
||||
return errBetterAuthUserExists
|
||||
}
|
||||
if message == "" {
|
||||
message = http.StatusText(response.StatusCode)
|
||||
}
|
||||
return errors.New(message)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Admin API
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
type adminUserRow struct {
|
||||
ID string `json:"id"`
|
||||
Email string `json:"email"`
|
||||
Name string `json:"name"`
|
||||
AvatarURL string `json:"avatar_url"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
func handleAdminOverview(c *gin.Context) {
|
||||
db := c.MustGet("db").(*database.DB)
|
||||
queries := sqlcdb.New(db.DB)
|
||||
ctx := c.Request.Context()
|
||||
|
||||
count := func(query string) int {
|
||||
var n int
|
||||
if err := db.QueryRowContext(ctx, query).Scan(&n); err != nil {
|
||||
return 0
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
pendingRows, err := queries.ListPendingProjects(ctx)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list pending projects"})
|
||||
return
|
||||
}
|
||||
pending := make([]Project, 0, len(pendingRows))
|
||||
for _, row := range pendingRows {
|
||||
pending = append(pending, mapSQLCProject(row))
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"stats": gin.H{
|
||||
"users": count(`SELECT COUNT(*) FROM users`),
|
||||
"projects": count(`SELECT COUNT(*) FROM projects`),
|
||||
"pending_projects": count(`SELECT COUNT(*) FROM projects WHERE is_approved = false`),
|
||||
"services": count(`SELECT COUNT(*) FROM services`),
|
||||
"running_services": count(`SELECT COUNT(*) FROM services WHERE status = 'running'`),
|
||||
"databases": count(`SELECT COUNT(*) FROM database_services`),
|
||||
"agents": count(`SELECT COUNT(*) FROM node_agents`),
|
||||
"templates": count(`SELECT COUNT(*) FROM service_templates`),
|
||||
"user_templates": count(`SELECT COUNT(*) FROM service_templates WHERE is_official = false`),
|
||||
"cron_jobs": count(`SELECT COUNT(*) FROM cron_jobs`),
|
||||
"deployments_total": count(`SELECT COUNT(*) FROM deployments`),
|
||||
},
|
||||
"pending_projects": pending,
|
||||
})
|
||||
}
|
||||
|
||||
func handleAdminListUsers(c *gin.Context) {
|
||||
db := c.MustGet("db").(*database.DB)
|
||||
|
||||
rows, err := db.QueryContext(c.Request.Context(), `
|
||||
SELECT id, email, name, COALESCE(avatar_url, ''), is_admin, COALESCE(to_char(created_at, 'YYYY-MM-DD"T"HH24:MI:SS"Z"'), '')
|
||||
FROM users
|
||||
ORDER BY created_at ASC
|
||||
`)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list users"})
|
||||
return
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
users := make([]adminUserRow, 0)
|
||||
for rows.Next() {
|
||||
var u adminUserRow
|
||||
if err := rows.Scan(&u.ID, &u.Email, &u.Name, &u.AvatarURL, &u.IsAdmin, &u.CreatedAt); err != nil {
|
||||
continue
|
||||
}
|
||||
users = append(users, u)
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"users": users})
|
||||
}
|
||||
|
||||
func handleAdminSetUserAdmin(c *gin.Context) {
|
||||
db := c.MustGet("db").(*database.DB)
|
||||
targetID := strings.TrimSpace(c.Param("id"))
|
||||
if _, err := uuid.Parse(targetID); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
callerID := optionalUserID(c)
|
||||
if callerID == targetID && !req.IsAdmin {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Cannot revoke your own admin access"})
|
||||
return
|
||||
}
|
||||
|
||||
result, err := db.ExecContext(c.Request.Context(),
|
||||
`UPDATE users SET is_admin = $1, updated_at = NOW() WHERE id = $2`,
|
||||
req.IsAdmin, targetID,
|
||||
)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update user"})
|
||||
return
|
||||
}
|
||||
if n, _ := result.RowsAffected(); n == 0 {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})
|
||||
return
|
||||
}
|
||||
|
||||
LogAudit(callerID, "user", targetID, "set_admin", map[string]interface{}{"is_admin": req.IsAdmin})
|
||||
c.JSON(http.StatusOK, gin.H{"message": "User updated"})
|
||||
}
|
||||
|
||||
func handleAdminSetProjectApproval(c *gin.Context) {
|
||||
db := c.MustGet("db").(*database.DB)
|
||||
queries := sqlcdb.New(db.DB)
|
||||
|
||||
projectID, ok := parseProjectIDParam(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
IsApproved bool `json:"is_approved"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
rows, err := queries.SetProjectApproved(c.Request.Context(), sqlcdb.SetProjectApprovedParams{
|
||||
IsApproved: req.IsApproved,
|
||||
ProjectID: projectID,
|
||||
})
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update project"})
|
||||
return
|
||||
}
|
||||
if rows == 0 {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Project not found"})
|
||||
return
|
||||
}
|
||||
|
||||
action := "unapprove"
|
||||
if req.IsApproved {
|
||||
action = "approve"
|
||||
}
|
||||
LogAudit(optionalUserID(c), "project", projectID.String(), action, nil)
|
||||
|
||||
row, err := queries.GetProjectByIDForUser(c.Request.Context(), sqlcdb.GetProjectByIDForUserParams{
|
||||
ProjectID: projectID,
|
||||
UserID: optionalUserUUID(c),
|
||||
IsAdmin: true,
|
||||
})
|
||||
if err != nil {
|
||||
c.JSON(http.StatusOK, gin.H{"message": "Project updated"})
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"project": mapSQLCProject(row)})
|
||||
}
|
||||
Reference in new issue
Block a user