The Web App can be pointed at more than one DriverVault, but a server it
adds is only ever identified by the URL that was typed into the connect
dialog. Nothing on the other end says what it is called, so the switcher
has no name to show that the operator did not invent locally.
So the server now carries one. SERVER_NAME joins the config, defaulting to
"DriverVault API Server" so /api/health always has something a client can
display rather than an empty string every caller has to special-case.
GET/PUT /api/admin/server-config follow the pb-config and webapp-config
shape exactly: superadmin only, applied at runtime and then persisted to
.env, with the same "applied but could not be saved" warning when the write
fails. There is no /test sibling, because a name is a label and not an
address - there is nothing to probe. The length cap counts runes rather
than bytes, so a 64-character Polish or Danish name is not cut off at the
halfway mark.
/api/health reports it, unauthenticated, which is the point of the whole
change: a client adding this server by URL can label it from the probe it
already makes, instead of needing a second and authenticated call before it
can draw the entry.
In the panel it is a new API Server tab, first in the superadmin group
since it is this server itself, ahead of the PocketBase and Web App tabs
that describe what it talks to. Strings in all three languages, and the
route table in the README and the API reference tab both grow the two new
endpoints.
Known gap, deliberately not closed here: the compose files do not pass
SERVER_NAME, so under Docker a rename from the panel writes the container's
.env and no volume keeps it - it reverts to the default the next time the
container is recreated. Wiring it as ${SERVER_NAME:-} would make the host
.env authoritative, at the cost of the other trap the previous commit
documented, where the environment silently overrides the panel on every
restart. That is a call about the deployment, not about this endpoint.
Verified by new tests over the handler: the rename applies at runtime,
lands in .env, reaches /api/health, is rejected without touching .env when
blank or over-long, and accepts a name of exactly the limit in multi-byte
runes. go build, go vet and go test ./... pass. Drove the built panel in a
browser against a stub backend - the tab renders, loads the current name,
saves, and reads correctly in Polish - and ran the rebuilt api-server.exe
and webapp.exe end to end, confirming the embedded bundle really contains
the new tab and that SERVER_NAME reaches /api/health through both the
server itself and the Web App's proxy.
Not verified: no Docker build, so the images still serve the old panel
until they are rebuilt and pushed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
224 lines
7.5 KiB
Go
224 lines
7.5 KiB
Go
// Package config loads server configuration from environment variables,
|
|
// optionally seeded from a .env file in the working directory. The PocketBase
|
|
// connection is also editable at runtime from the panel, which persists the
|
|
// change back into the same .env via UpdateEnvFile.
|
|
package config
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
)
|
|
|
|
// Config holds all runtime configuration for the API Server.
|
|
type Config struct {
|
|
Addr string
|
|
PocketBaseURL string
|
|
WebAppURL string
|
|
AllowOrigins []string
|
|
|
|
// ServerName is this server's display name. It is what clients that can be
|
|
// pointed at more than one DriverVault call this one — the Web App's server
|
|
// switcher labels an added server with it — so it is reported by /api/health
|
|
// rather than kept for the panel alone.
|
|
ServerName string
|
|
|
|
// UsersCollection is the PocketBase auth collection holding app users.
|
|
UsersCollection string
|
|
|
|
// Superuser service account. Every privileged flow (user/organization
|
|
// management, all car-domain database access) runs through it. Optional at
|
|
// startup: when unset those endpoints return 503 and a superadmin can still
|
|
// log in to the panel to configure it.
|
|
PocketBaseAdminEmail string
|
|
PocketBaseAdminPassword string
|
|
|
|
// OCPP control endpoint (Anker Solix charger control). OCPPRequireTLS rejects
|
|
// charger connections that did not arrive over TLS (a plaintext ws:// carries
|
|
// the charger's Basic-auth token in the clear); disable only for local dev.
|
|
// OCPPPublicURL, when set, is the canonical ws(s):// base an operator points
|
|
// the charger at, instead of deriving it from request headers.
|
|
OCPPRequireTLS bool
|
|
OCPPPublicURL string
|
|
|
|
// Bootstrap controls the on-startup PocketBase schema setup: when true (the
|
|
// default) the server creates any missing collections and reconciles existing
|
|
// ones against the desired schema, then ensures the super-admin below exists.
|
|
// It requires a configured service account; without one it is a no-op.
|
|
Bootstrap bool
|
|
|
|
// Super-admin account created during bootstrap when both fields are set and no
|
|
// user with that email exists yet. Existing accounts are left untouched.
|
|
SuperAdminEmail string
|
|
SuperAdminPassword string
|
|
SuperAdminName string
|
|
}
|
|
|
|
// EnvFile is the .env path (relative to the working directory) that Load reads
|
|
// and that runtime settings changes persist back into.
|
|
const EnvFile = ".env"
|
|
|
|
// DefaultServerName labels a server whose operator has not named one, so
|
|
// /api/health always carries something a client can display.
|
|
const DefaultServerName = "DriverVault API Server"
|
|
|
|
// AdminConfigured reports whether a service account has been supplied.
|
|
func (c Config) AdminConfigured() bool {
|
|
return c.PocketBaseAdminEmail != "" && c.PocketBaseAdminPassword != ""
|
|
}
|
|
|
|
// Load reads configuration from environment variables, applying sensible
|
|
// defaults. A .env file, if present in the working directory, is loaded first.
|
|
func Load() Config {
|
|
loadDotEnv(EnvFile)
|
|
|
|
return Config{
|
|
Addr: normalizeAddr(firstEnv("API_ADDR", "PORT"), ":8080"),
|
|
PocketBaseURL: strings.TrimRight(firstEnvOr("http://10.2.1.10:8027", "POCKETBASE_URL", "PB_URL"), "/"),
|
|
WebAppURL: strings.TrimRight(getenv("WEBAPP_URL", "http://localhost:8090"), "/"),
|
|
AllowOrigins: splitCSV(firstEnvOr("*", "CORS_ALLOW_ORIGINS", "CORS_ORIGINS")),
|
|
ServerName: strings.TrimSpace(getenv("SERVER_NAME", DefaultServerName)),
|
|
UsersCollection: getenv("AUTH_USERS_COLLECTION", "users"),
|
|
PocketBaseAdminEmail: firstEnv("POCKETBASE_ADMIN_EMAIL", "PB_ADMIN_EMAIL"),
|
|
PocketBaseAdminPassword: firstEnv("POCKETBASE_ADMIN_PASSWORD", "PB_ADMIN_PASSWORD"),
|
|
OCPPRequireTLS: boolEnv("OCPP_REQUIRE_TLS", true),
|
|
OCPPPublicURL: strings.TrimRight(getenv("OCPP_PUBLIC_URL", ""), "/"),
|
|
Bootstrap: boolEnv("PB_BOOTSTRAP", true),
|
|
SuperAdminEmail: firstEnv("DRIVERVAULT_SUPERADMIN_EMAIL", "SUPERADMIN_EMAIL"),
|
|
SuperAdminPassword: firstEnv("DRIVERVAULT_SUPERADMIN_PASSWORD", "SUPERADMIN_PASSWORD"),
|
|
SuperAdminName: getenv("DRIVERVAULT_SUPERADMIN_NAME", "Administrator"),
|
|
}
|
|
}
|
|
|
|
// boolEnv reads a boolean environment variable, accepting the common truthy and
|
|
// falsey spellings and falling back to def when unset or unrecognized.
|
|
func boolEnv(key string, def bool) bool {
|
|
switch strings.ToLower(strings.TrimSpace(os.Getenv(key))) {
|
|
case "":
|
|
return def
|
|
case "1", "true", "yes", "on":
|
|
return true
|
|
case "0", "false", "no", "off":
|
|
return false
|
|
default:
|
|
return def
|
|
}
|
|
}
|
|
|
|
// normalizeAddr accepts either a full listen address (":8080") or a bare port
|
|
// ("8080", which is what the legacy PORT variable held) and returns a listen
|
|
// address.
|
|
func normalizeAddr(v, def string) string {
|
|
if v == "" {
|
|
return def
|
|
}
|
|
if strings.Contains(v, ":") {
|
|
return v
|
|
}
|
|
return ":" + v
|
|
}
|
|
|
|
// UpdateEnvFile persists the given KEY=VALUE pairs into the .env file at path,
|
|
// replacing existing keys in place and appending new ones, while preserving all
|
|
// other lines (comments, ordering, unrelated keys). The file is created if it
|
|
// does not exist. Written with 0600 perms since it holds secrets.
|
|
func UpdateEnvFile(path string, updates map[string]string) error {
|
|
existing, _ := os.ReadFile(path) // missing file → start empty
|
|
|
|
remaining := make(map[string]string, len(updates))
|
|
for k, v := range updates {
|
|
remaining[k] = v
|
|
}
|
|
|
|
var out []string
|
|
for _, line := range strings.Split(string(existing), "\n") {
|
|
trimmed := strings.TrimSpace(line)
|
|
if trimmed == "" || strings.HasPrefix(trimmed, "#") {
|
|
out = append(out, line)
|
|
continue
|
|
}
|
|
key, _, ok := strings.Cut(trimmed, "=")
|
|
key = strings.TrimSpace(key)
|
|
if ok {
|
|
if v, found := remaining[key]; found {
|
|
out = append(out, key+"="+v)
|
|
delete(remaining, key)
|
|
continue
|
|
}
|
|
}
|
|
out = append(out, line)
|
|
}
|
|
// Append any keys that weren't already present.
|
|
for k, v := range remaining {
|
|
out = append(out, k+"="+v)
|
|
}
|
|
|
|
content := strings.Join(out, "\n")
|
|
if !strings.HasSuffix(content, "\n") {
|
|
content += "\n"
|
|
}
|
|
return os.WriteFile(path, []byte(content), 0o600)
|
|
}
|
|
|
|
func getenv(key, def string) string {
|
|
if v := os.Getenv(key); v != "" {
|
|
return v
|
|
}
|
|
return def
|
|
}
|
|
|
|
// firstEnv returns the first of keys that is set to a non-empty value. It lets
|
|
// the modern POCKETBASE_* names take precedence while the legacy PB_* names from
|
|
// older deployments keep working.
|
|
func firstEnv(keys ...string) string {
|
|
for _, k := range keys {
|
|
if v := os.Getenv(k); v != "" {
|
|
return v
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// firstEnvOr is firstEnv with a fallback when none of the keys are set.
|
|
func firstEnvOr(def string, keys ...string) string {
|
|
if v := firstEnv(keys...); v != "" {
|
|
return v
|
|
}
|
|
return def
|
|
}
|
|
|
|
func splitCSV(s string) []string {
|
|
parts := strings.Split(s, ",")
|
|
out := make([]string, 0, len(parts))
|
|
for _, p := range parts {
|
|
if p = strings.TrimSpace(p); p != "" {
|
|
out = append(out, p)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// loadDotEnv loads KEY=VALUE pairs from a .env file into the process env if they
|
|
// are not already set. It is intentionally minimal (no quoting rules beyond
|
|
// trimming surrounding quotes).
|
|
func loadDotEnv(path string) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return // .env is optional
|
|
}
|
|
for _, line := range strings.Split(string(data), "\n") {
|
|
line = strings.TrimSpace(line)
|
|
if line == "" || strings.HasPrefix(line, "#") {
|
|
continue
|
|
}
|
|
key, val, ok := strings.Cut(line, "=")
|
|
if !ok {
|
|
continue
|
|
}
|
|
key = strings.TrimSpace(key)
|
|
val = strings.Trim(strings.TrimSpace(val), `"'`)
|
|
if _, exists := os.LookupEnv(key); !exists {
|
|
_ = os.Setenv(key, val)
|
|
}
|
|
}
|
|
}
|