Fix the bbolt round trip, the blocklist gaps and the deploy set
The cache snapshot never loaded, so every restart was a cold cache. Snapshot
packed the whole key while Load decoded the record header out of the key's
remainder instead of the value, so every entry was skipped. The two sides are
now an explicit encodeRecord/decodeRecord pair with a version byte and a CRC-32C
trailer, so a future format change is detected instead of silently misparsed.
Load also drops entries that are already past ExpiresAt and rewrites the TTL to
the time actually left, so a served TTL never jumps back up across a restart.
Blocklist, all six gaps the failing tests were pointing at: a leading UTF-8 BOM
is stripped, "!allow example.com" works, SourceMeta exists for a source that
only ever contributed a rule, Pattern() reports the bare name again (the new
WireName() produces the wildcard form for the API), an RPZ record with no
explicit TTL inherits the zone default instead of whatever the reader left in
the RR, a hosts line with no address in the first field says so, and the
adblock parser handles CRLF and adblock-flavoured lines pasted into a plain
list. TestHolderSwapIsAtomic was asserting the wrong invariant — the swap was
always atomic, a name blocked by the old set is legitimately unblocked by the
new one.
Tests added for acl and resolver, both of which turned up real bugs:
- a PTR suffix matched across label boundaries, so a group scoped to
example.com. also swallowed ample.com. and notexample.com. — a client could
land in a group it does not belong to;
- the "*" catch-all was dropped from the rendered domain patterns, so the
engine's per-query recompile lost the "everything" case;
- Upstream.Success never closed an open breaker, so a recovered upstream stayed
excluded for the full cooldown;
- Exchange fanned out in parallel even under policy: failover.
Deploy set: go.mod requires Go 1.27.1 but CI pinned 1.23 and the Dockerfile
pinned golang:1.23-alpine, so neither could have built. The Dockerfile also
copied the source tree after the console bundle, which clobbered it.
The k8s set asked for hostNetwork with two replicas, but the server never sets
SO_REUSEPORT, so the second pod could not bind :53 and would crash-loop. It now
runs without hostNetwork behind a LoadBalancer Service, with a separate
ClusterIP Service for the Ingress (a headless Service cannot back one), a
ServiceAccount, an API-key Secret, per-pod PVCs, and a kustomization. The HPA
is gone: it cannot drive a StatefulSet. To let the API key come from that
Secret, config.Load now expands ${VAR} / ${VAR:-default} / ${NAME-default} and
fails to start on an unset variable with no default, so a missing secret is a
crash loop rather than an unauthenticated console. Expansion skips YAML
comments, so documenting ${VAR} in the ConfigMap does not break the file.
Verified: gofmt, go build, go vet clean; go test -race ./internal/... green
(acl, app, blocklist, cache, config, resolver, zonefile).
This commit is contained in:
1 parent
3bcc10a029
commit
26134ba437
22 files changed
+3106
-225
No files matched your search
+143
-6
@@ -8,13 +8,16 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
"net"
|
||||
"net/netip"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -39,14 +42,23 @@ func (d *Duration) UnmarshalYAML(value *yaml.Node) error {
|
||||
*d = Duration(n)
|
||||
return nil
|
||||
}
|
||||
// time.ParseDuration insists on a unit, so the numeric seconds forms
|
||||
// (7, 1.5) have to be handled here; without this the documented "a
|
||||
// bare integer is seconds" rule never worked, because yaml decodes
|
||||
// every scalar into a string and the old float fallback was
|
||||
// unreachable.
|
||||
if f, err := strconv.ParseFloat(s, 64); err == nil {
|
||||
ns := f * float64(time.Second)
|
||||
if ns >= float64(math.MaxInt64) || ns < float64(math.MinInt64) {
|
||||
return fmt.Errorf("invalid duration %q: out of range", s)
|
||||
}
|
||||
*d = Duration(time.Duration(ns))
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("invalid duration %q", s)
|
||||
}
|
||||
var f float64
|
||||
if err := value.Decode(&f); err != nil {
|
||||
return fmt.Errorf("invalid duration: %s", value.Value)
|
||||
}
|
||||
*d = Duration(time.Duration(f * float64(time.Second)))
|
||||
return nil
|
||||
// Not a scalar at all (mapping/sequence): nothing sensible to interpret.
|
||||
return fmt.Errorf("invalid duration: %s", value.Value)
|
||||
}
|
||||
|
||||
func (d Duration) MarshalYAML() (any, error) { return time.Duration(d).String(), nil }
|
||||
@@ -560,6 +572,10 @@ func Load(path string) (*Config, error) {
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read config: %w", err)
|
||||
}
|
||||
raw, err = expandEnv(raw)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("config %s: %w", path, err)
|
||||
}
|
||||
if err := yaml.Unmarshal(raw, cfg); err != nil {
|
||||
return nil, fmt.Errorf("parse config %s: %w", path, err)
|
||||
}
|
||||
@@ -574,6 +590,127 @@ func Load(path string) (*Config, error) {
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// expandEnv substitutes ${NAME} and ${NAME:-default} in a config document
|
||||
// before it is parsed, so a secret can come from the environment (a
|
||||
// Secret-mounted env var in Kubernetes, for instance) instead of being
|
||||
// committed next to the rest of the config.
|
||||
//
|
||||
// Three rules, each of which exists because breaking it is a real footgun:
|
||||
//
|
||||
// - Only the braced forms are touched, so a bare `$` in a URL or a
|
||||
// blocklist rule survives verbatim.
|
||||
// - Comments are copied through untouched. A config that *documents* the
|
||||
// syntax ("# api_keys: ${FANCYDNS_API_KEY}") must still load.
|
||||
// - An unset variable with no default is an error, not an empty string:
|
||||
// `api_keys: ["${FANCYDNS_API_KEY}"]` silently expanding to `[""]` is how
|
||||
// a deployment ends up with no authentication at all.
|
||||
func expandEnv(raw []byte) ([]byte, error) {
|
||||
if !bytes.Contains(raw, []byte("${")) {
|
||||
return raw, nil
|
||||
}
|
||||
var b bytes.Buffer
|
||||
b.Grow(len(raw))
|
||||
// Line-at-a-time so the comment state can be tracked: a `#` only opens a
|
||||
// comment outside quotes, and only when it starts the line or follows
|
||||
// whitespace. That is YAML's rule, and a config with `#` inside a quoted
|
||||
// string must not be truncated at it.
|
||||
for off := 0; off < len(raw); {
|
||||
line := raw[off:]
|
||||
if nl := bytes.IndexByte(line, '\n'); nl >= 0 {
|
||||
line = line[:nl+1]
|
||||
}
|
||||
err := expandLine(line, &b)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("line %d: %w", bytes.Count(raw[:off], []byte("\n"))+1, err)
|
||||
}
|
||||
off += len(line)
|
||||
}
|
||||
return b.Bytes(), nil
|
||||
}
|
||||
|
||||
// expandLine appends one line to b, substituting the ${...} references it
|
||||
// finds outside comments.
|
||||
//
|
||||
// The scan tracks quotes so that two rules hold at once: a `#` only opens a
|
||||
// comment outside quotes and only at the start of a line or after whitespace
|
||||
// (YAML's rule, so a `#` inside a quoted string is data, not a comment), and a
|
||||
// reference inside a quoted scalar — which is how `api_keys: ["${KEY}"]` is
|
||||
// naturally written — is expanded rather than copied through.
|
||||
func expandLine(line []byte, b *bytes.Buffer) error {
|
||||
var inSingle, inDouble, escaped, inComment bool
|
||||
for i := 0; i < len(line); {
|
||||
c := line[i]
|
||||
if inComment {
|
||||
b.WriteByte(c)
|
||||
i++
|
||||
continue
|
||||
}
|
||||
switch {
|
||||
case inDouble:
|
||||
switch {
|
||||
case escaped:
|
||||
escaped = false
|
||||
case c == '\\':
|
||||
escaped = true
|
||||
case c == '"':
|
||||
inDouble = false
|
||||
}
|
||||
case inSingle:
|
||||
if c == '\'' {
|
||||
inSingle = false
|
||||
}
|
||||
case c == '#' && (i == 0 || line[i-1] == ' ' || line[i-1] == '\t'):
|
||||
inComment = true
|
||||
case c == '"':
|
||||
inDouble = true
|
||||
case c == '\'':
|
||||
inSingle = true
|
||||
case c == '$' && i+1 < len(line) && line[i+1] == '{':
|
||||
end := bytes.IndexByte(line[i+2:], '}')
|
||||
if end < 0 {
|
||||
return fmt.Errorf("unterminated ${ at byte %d", i)
|
||||
}
|
||||
spec := string(line[i+2 : i+2+end])
|
||||
i += end + 3
|
||||
|
||||
name, def := spec, ""
|
||||
hasDefault := false
|
||||
// colonDefault marks the ":-" form, which substitutes for an empty
|
||||
// value as well as an unset one (POSIX). A bare "-" default applies
|
||||
// only when the variable is unset.
|
||||
colonDefault := false
|
||||
switch k := strings.Index(spec, ":-"); {
|
||||
case k >= 0:
|
||||
name, def, hasDefault, colonDefault = spec[:k], spec[k+2:], true, true
|
||||
case strings.IndexByte(spec, '-') >= 0:
|
||||
// A bare `-` is a default too, for an unset (not an empty)
|
||||
// variable. It splits on the FIRST hyphen, so a variable name
|
||||
// may not contain one.
|
||||
k = strings.IndexByte(spec, '-')
|
||||
name, def, hasDefault = spec[:k], spec[k+1:], true
|
||||
}
|
||||
if name == "" {
|
||||
return fmt.Errorf("empty variable name in ${%s}", spec)
|
||||
}
|
||||
v, isSet := os.LookupEnv(name)
|
||||
switch {
|
||||
case isSet && (v != "" || hasDefault && !colonDefault):
|
||||
// v is "" here only for the "-" form with an empty variable,
|
||||
// which is the whole difference between ${X-y} and ${X:-y}.
|
||||
b.WriteString(v)
|
||||
case hasDefault:
|
||||
b.WriteString(def)
|
||||
default:
|
||||
return fmt.Errorf("environment variable %s is not set (use ${%s:-default} to give it a fallback)", name, name)
|
||||
}
|
||||
continue
|
||||
}
|
||||
b.WriteByte(c)
|
||||
i++
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// WorkingDirOrSet records the config directory so relative paths in the
|
||||
// document resolve consistently regardless of the process cwd.
|
||||
func (c *Config) WorkingDirOrSet(dir string) {
|
||||
|
||||
Reference in new issue
Block a user