All checks were successful
shell-lint / shellcheck (pull_request) Successful in 8s
PR build (required check) / build-backend (pull_request) Successful in 1m18s
PR build (required check) / changes (pull_request) Successful in 6s
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / gate (pull_request) Successful in 3s
secrets-guard / encrypted (pull_request) Successful in 5s
PR build (required check) / validate-observability (pull_request) Has been skipped
web/app.py started two long-lived background jobs under a leader election: the
Discord gateway bot and an APScheduler. Both are stateful I/O loops -- reconnect,
RESUME, heartbeat, backoff, interval timers -- living inside an async web app
that also has to serve requests. This moves them into a single Go binary.
Go owns ONLY the stateful I/O. It owns no climate or grading logic: anything
needing data calls back into Python over a new internal-only HTTP surface
(/internal/discord/grade, /internal/jobs/warm-cities, /internal/jobs/indexnow).
Grading depends on polars and the parquet cache; reimplementing it in Go would
make the bot's grades drift from the API's, and the slash-command path
deliberately shares one grade builder so the two can never disagree. The grade
route returns gateway-ready JSON -- including the ephemeral-flag drop that
discord_bot.py used to do -- and Go relays those bytes verbatim without parsing
the embed.
Packaging: the binary is built by a golang:1.26 stage in the backend Dockerfile
and shipped in the SAME image, run as a second compose service off the SAME tag.
The daemon and backend share the /internal/* contract, so they must never skew
versions; one image makes that structural rather than a convention. Its
entrypoint bypasses entrypoint.sh -- the backend owns alembic, and two racing
migrators is a real hazard.
replicas: 1 in the Swarm stack is load-bearing. Discord permits exactly one
gateway connection per bot token; the pin replaces core/singleton.claim_leader
for this workload. update_config uses order: stop-first, since start-first would
briefly run two gateways. autoscale.sh targets ${STACK_NAME}_web only, so it
cannot scale this.
Security: the internal routes compare the token with hmac.compare_digest and the
whole router 404s when THERMOGRAPH_INTERNAL_TOKEN is unset -- fail closed, never
default open. Caddy only routes /api/*, /digest and /discord/interactions to the
backend, so /internal/* was never publicly reachable; the token is defence in
depth. The router mounts before the catch-all frontend proxy so /internal/*
cannot fall through to it. The daemon refuses to start without the token.
Behaviour preserved from the Python, with the reasoning carried into the Go
comments: non-privileged intents (no MESSAGE_CONTENT, so no portal review);
fatal close codes 4004/4010-4014 stop rather than loop; the bot-author and
self-author mention-loop guard; allowed_mentions locked to {"parse":[],
"replied_user":true} so a crafted query cannot turn a reply into an @everyone
ping; the first cron tick deferred one full interval rather than firing at boot,
since warm-cities already runs at deploy time; and no overlapping warm-cities
run, which would double-spend the archive-fetch quota.
Two deliberate improvements over the Python. A close intended for RESUME now
uses 4000 rather than 1000 -- Discord invalidates a session closed 1000/1001, so
the Python's default close silently defeated its own resume. And MESSAGE_CREATE
is handled on a bounded worker pool rather than an unbounded thread hand-off, so
a flood of mentions cannot spawn unbounded work against the backend.
A .dockerignore is added because a disposable backend/.venv was being swallowed
by COPY . /app/ and duplicated again by the chown layer, inflating the image to
1.8 GB; it builds at 578 MB.
Tests: 29 Go gateway tests covering every behaviour the deleted
test_discord_bot.py asserted, plus cron/config/apiclient suites; 10 new Python
tests for the internal routes (fail-closed, auth, flag drop, per-job 409 guard).
Full suite 359 passed / 7 skipped; go build, vet and test -race clean.
138 lines
5.8 KiB
Go
138 lines
5.8 KiB
Go
// Package config loads and validates the daemon's environment. All knobs are
|
|
// env vars because the daemon runs as a sibling container to the web service
|
|
// and shares its /etc/thermograph.env — a config file would be a second source
|
|
// of truth for the same values.
|
|
package config
|
|
|
|
import (
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"errors"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// Defaults mirror the Python scheduler they replace (notifications/scheduler.py):
|
|
// warm-cities daily — a warm cache mostly stays warm, and every already-cached
|
|
// city is a cheap skip; IndexNow every 6h — submit_if_changed() is a no-op when
|
|
// nothing changed, so it can tick more often without spending anything.
|
|
const (
|
|
DefaultWarmCitiesIntervalHours = 24
|
|
DefaultIndexNowIntervalHours = 6
|
|
)
|
|
|
|
// Config is the daemon's fully-resolved configuration. Construct it only via
|
|
// Load so the required/optional split is enforced in one place.
|
|
type Config struct {
|
|
// InternalToken is the shared secret sent as X-Thermograph-Internal-Token
|
|
// on every callback into Python. Required: if it is unset the web app
|
|
// disables its /internal/* routes (fail closed), so a daemon without it
|
|
// could only ever fail every call — better to refuse to start.
|
|
InternalToken string
|
|
|
|
// APIBase is the in-network base URL of the FastAPI app (e.g.
|
|
// http://web:8137). Same env var the frontend already uses for its
|
|
// server-side calls, so there is one name for "where is the backend".
|
|
APIBase string
|
|
|
|
// DiscordEnabled gates the gateway connection. Off by default: a gateway
|
|
// connection is a new persistent behaviour, so it takes an explicit opt-in
|
|
// (THERMOGRAPH_DISCORD_BOT truthy AND a token) rather than piggybacking on
|
|
// the token being present for DMs.
|
|
DiscordEnabled bool
|
|
|
|
// DiscordToken is the bot token; only meaningful when DiscordEnabled.
|
|
DiscordToken string
|
|
|
|
WarmCitiesInterval time.Duration
|
|
IndexNowInterval time.Duration
|
|
}
|
|
|
|
// truthy matches the Python side's _TRUTHY set exactly, so the same env file
|
|
// enables/disables the bot regardless of which process reads it.
|
|
func truthy(s string) bool {
|
|
switch strings.ToLower(strings.TrimSpace(s)) {
|
|
case "1", "true", "yes", "on":
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// intervalHours parses an interval env var. A malformed or non-positive value
|
|
// falls back to the default rather than erroring — mirrors the Python
|
|
// `int(os.environ.get(..., "24") or 24)` behaviour where a bad knob degrades
|
|
// to the documented default instead of taking the process down.
|
|
func intervalHours(raw string, def int) time.Duration {
|
|
hours := def
|
|
if v := strings.TrimSpace(raw); v != "" {
|
|
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
|
hours = n
|
|
}
|
|
}
|
|
return time.Duration(hours) * time.Hour
|
|
}
|
|
|
|
// Load reads the environment and returns a validated Config, or an error that
|
|
// should abort startup. The daemon must never run half-configured: a missing
|
|
// token or API base means every callback would fail, silently, forever.
|
|
func Load() (*Config, error) {
|
|
return load(os.Getenv)
|
|
}
|
|
|
|
// load takes a getenv func so tests can inject an environment without mutating
|
|
// the real one.
|
|
func load(getenv func(string) string) (*Config, error) {
|
|
cfg := &Config{
|
|
InternalToken: strings.TrimSpace(getenv("THERMOGRAPH_INTERNAL_TOKEN")),
|
|
APIBase: strings.TrimSpace(getenv("THERMOGRAPH_API_BASE_INTERNAL")),
|
|
DiscordToken: strings.TrimSpace(getenv("THERMOGRAPH_DISCORD_BOT_TOKEN")),
|
|
}
|
|
if cfg.InternalToken == "" {
|
|
cfg.InternalToken = deriveInternalToken(strings.TrimSpace(getenv("THERMOGRAPH_AUTH_SECRET")))
|
|
}
|
|
if cfg.InternalToken == "" {
|
|
return nil, errors.New("neither THERMOGRAPH_INTERNAL_TOKEN nor THERMOGRAPH_AUTH_SECRET is set; refusing to start (the web app disables /internal/* without a token, so every callback would fail)")
|
|
}
|
|
if cfg.APIBase == "" {
|
|
return nil, errors.New("THERMOGRAPH_API_BASE_INTERNAL is not set; refusing to start (no way to reach the backend)")
|
|
}
|
|
// The gateway needs both the opt-in flag and a token; missing either just
|
|
// disables it — the cron half is still worth running on its own.
|
|
cfg.DiscordEnabled = truthy(getenv("THERMOGRAPH_DISCORD_BOT")) && cfg.DiscordToken != ""
|
|
|
|
cfg.WarmCitiesInterval = intervalHours(getenv("THERMOGRAPH_WARM_CITIES_INTERVAL_HOURS"), DefaultWarmCitiesIntervalHours)
|
|
cfg.IndexNowInterval = intervalHours(getenv("THERMOGRAPH_INDEXNOW_INTERVAL_HOURS"), DefaultIndexNowIntervalHours)
|
|
return cfg, nil
|
|
}
|
|
|
|
// deriveLabel is the domain-separation label for the derived internal token.
|
|
// It MUST match backend/api/internal_routes.py's _DERIVE_LABEL byte-for-byte,
|
|
// or the daemon and the web app compute different tokens and every callback
|
|
// 401s. TestDeriveInternalTokenMatchesPython pins the pair to a shared vector.
|
|
const deriveLabel = "thermograph/internal-api/v1"
|
|
|
|
// deriveInternalToken computes the shared secret from THERMOGRAPH_AUTH_SECRET,
|
|
// which every environment already provisions. This is what lets the daemon
|
|
// stand up with no new vault entry and no operator step -- one less secret to
|
|
// rotate, leak, or forget on a new host. An explicit THERMOGRAPH_INTERNAL_TOKEN
|
|
// still wins when set.
|
|
//
|
|
// HMAC under a distinct label rather than reusing the auth secret directly:
|
|
// ordinary domain separation, so a leak of this token cannot be replayed as the
|
|
// session-signing key it came from, and the derivation is one-way.
|
|
//
|
|
// Returns "" for an empty secret, which the caller turns into a refusal to
|
|
// start. It must never silently invent a token: the web app would have derived
|
|
// a different one (or none), and every call would fail as an auth error rather
|
|
// than as the missing configuration it actually is.
|
|
func deriveInternalToken(authSecret string) string {
|
|
if authSecret == "" {
|
|
return ""
|
|
}
|
|
mac := hmac.New(sha256.New, []byte(authSecret))
|
|
mac.Write([]byte(deriveLabel))
|
|
return hex.EncodeToString(mac.Sum(nil))
|
|
}
|