Files
fancy-dns/internal/blocklist/example_test.go
T
developer 9881d2a095 Make the API response contract a test; fix what it found
The console's TypeScript types are hand-written and apiFetch ends in
`JSON.parse(text) as T`, so nothing in the toolchain compared them with the
Go structs. A field that lost its json tag, or a response a struct never had,
showed up as an empty table in a browser and nowhere else: the Go suite was
green and the console was wrong. internal/app/contract_test.go now asserts the
exact JSON key set of every admin endpoint, driven through the real router
with the real hook implementations, plus a test that drives the two write
endpoints with the exact payload web/src builds.

The drift it found, all four fixed here:

blocklist.Source and SourceMeta had no json tags at all, so GET /api/blocklists
sent Go field names ("URL"/"Format") where the console expects snake_case: the
Sources table rendered blank rows and its per-row toggle posted
`name: undefined`. Tagged to match ParseStats.

acl.GroupSummary was flat where the console reads a nested `match` object — the
same shape config.Group has — so every group card read "matches nothing". The
four match fields are nested now, under a new acl.Match.

PUT /api/clients answered 400 `json: unknown field "ptr_suffixes"` to the
console's payload, because config.Group and config.Match carried yaml tags only
and the decoder runs with DisallowUnknownFields. Both structs have json tags
now; the same applies to config.UpstreamServer and UpstreamBootstrap.

PUT /api/upstreams answered 400 `json: unknown field "health"`, because the
console round-trips the whole server object it read, runtime health fields
included. They are accepted and ignored, because the server owns them, and they
are `yaml:"-"` so settings.yaml does not gain runtime state.

Also fixed, each with a test:

A duration on the wire was a nanosecond count. config.Duration had a
MarshalYAML but no MarshalJSON, so bootstraps[].refresh arrived as 30000000000
while the console typed the field as a string, and healthcheck_interval was a
float of seconds in one place and a string in another. Durations on the wire
are duration strings everywhere now — the same spelling config.yaml uses — and a
bare JSON number is still accepted and means seconds, not nanoseconds.
TestDurationJSONForm used to pin the old behaviour and now pins the new one,
saying in its comment that the old behaviour was the bug.

A log row's key set depended on the row. api.LogEntry was omitempty on
client_group, response, upstream and list, so a query with no ACL group
arrived without the key and the console rendered "undefined" where the column
should be empty. The contract test can only pin one shape if the server emits
one, so nothing on that struct is omitempty any more.

A dead peer stayed in the cluster peer list forever. Cluster.seen was only ever
added to and deleted from on an explicit `bye`, so a node that crashed — or
whose Valkey connection died — was reported as a live peer for the life of the
process, and its stale blocklist digest was flagged as divergence forever.
Peers() now reaps peers unheard for peer_ttl*4 and stamps each state with the
receiver's own clock, so clock skew between two machines can neither reap a
healthy peer nor keep a dead one. Discover() ages out the same way on the
publisher's own last_seen stamp, because the keyed Valkey record outlives a
crash: a live node keeps refreshing the key's TTL, so a dead node's field stayed
readable for the life of the fleet.

peer_ttl: 0 would have crashed the process. time.NewTicker(PeerTTL/2) panics on
a non-positive period and `EXPIRE key 0` deletes the heartbeat key, so a config
that left peer_ttl unset would have taken the process down at Start, or made
every instance believe it is alone in the fleet. Both go through peerTTL() and
peerDeadline(), which fall back to the default.

Two cluster tests raced on the wire, not on the product, and one was
environment-dependent rather than wrong. A node that joined after another's
heartbeat was in flight hears about it on the next tick, so "b does not see a"
read immediately after "a sees b" is a coin flip; the divergence test waited for
a digest on the wrong node's view of the fleet; and 127.0.0.1:1 is only
unbindable outside a container that sets
net.ipv4.ip_unprivileged_port_start=0, where it binds and the partial-bind test
fails with both transports up. That test now occupies a port with a live
listener in the test process, which is a deterministic EADDRINUSE on every
machine and every uid.

internal/server/counters_test.go covers the counter-key layer that no other
test touched: the "<transport>.<field>" keyspace, that the aggregate folds only
the known fields, and that the snapshot is safe while counters move.

Two pinned behaviours changed on purpose, each with a test that says so:

An RPZ record did not cover the name it names. rpzRule gave a bare owner name
the subdomain form (*.name), so analytics.example.org. in a policy zone blocked
cdn.analytics.example.org. and left analytics.example.org. resolving normally —
and an rpz-passthru. record did not allowlist its own domain either. RPZ
semantics say the record applies to the domain and everything under it, so a
bare owner now takes the apex form **.name; an owner written with an explicit *.
is still strict, so a zone that wants subdomain-only behaviour can still ask for
it. This changes which queries get blocked for an existing policy zone, which is
why it wanted a decision. TestExampleRPZZoneCoversTheApexItNames pins both
halves and the example zone now says which half it relies on.

metrics.OutcomeLocal had no producer. The engine reported a local-zone answer as
qlog.ActionAllow, which outcomeFor mapped to OutcomeUpstream, so every locally
answered query was counted as an upstream one and the outcome="local" series was
never published — the dashboard's local column was permanently empty.
Response.Local is now set on the local-zone path and outcomeFor consults it
first. That moves published counters, so the README's metrics section says so
too.
2026-09-27 18:42:59 +00:00

159 lines
5.9 KiB
Go

package blocklist
import (
"path/filepath"
"slices"
"testing"
)
// TestExampleRPZZoneBlocksWhatItSays runs the shipped policy zone through the
// exact path Manager.RefreshAll uses (parseRPZFiles, which prepends a per-file
// $ORIGIN derived from the file name) and pins the rules it produces.
//
// The origin is the reason this is a test and not a doc: a file called
// local.rpz.zone.example is read with the origin "local.", so the relative owner
// `*.doubleclick.net` became `*.doubleclick.net.local.` and the example blocked
// nothing. The example now spells every owner absolutely; if someone "tidies it
// up" back to relative names, the rules below stop matching and this fails.
func TestExampleRPZZoneBlocksWhatItSays(t *testing.T) {
path := filepath.Join("..", "..", "deploy", "zones", "local.rpz.zone.example")
rules, stats, err := parseRPZFiles([]string{path})
if err != nil {
t.Fatalf("parseRPZFiles(%s): %v", path, err)
}
type ruleWant struct {
name string
action Action
response string
}
want := []ruleWant{
{"*.doubleclick.net.", ActionNXDomain, ""},
{"*.ads.example.com.", ActionNXDomain, ""},
{"*.tracker.example.net.", ActionNXDomain, ""},
// A bare owner name takes the apex form, so the record covers the
// domain and everything under it; see
// TestExampleRPZZoneCoversTheApexItNames.
{"**.analytics.example.org.", ActionNXDomain, ""},
{"*.noisy-cdn.example.", ActionDrop, ""},
{"**.metrics.internal.", ActionPassthrough, ""},
{"**.blocked.example.", ActionRedirect, "192.0.2.10"},
}
got := make([]ruleWant, 0, len(rules))
for _, r := range rules {
got = append(got, ruleWant{r.Name, r.Action, r.Response})
if r.TTL != 60 {
t.Errorf("rule %q has TTL %d, want the zone's $TTL 60", r.Name, r.TTL)
}
}
if !slices.Equal(got, want) {
t.Fatalf("rules mismatch\n got: %+v\nwant: %+v", got, want)
}
if stats.Rules != len(want) {
t.Errorf("stats.Rules = %d, want %d", stats.Rules, len(want))
}
// The A and the AAAA share an owner, so one of them is deduplicated
// rather than compiled twice.
if stats.Duplicates != 1 {
t.Errorf("stats.Duplicates = %d, want 1 (the second blocked.example. record)", stats.Duplicates)
}
}
// TestExampleRPZZoneMatchesTheNamesItNames builds the Set an instance would
// actually consult, so the pin above is about lookups and not only about the
// parser's output. A rule that exists but does not match is still a blocklist
// that does nothing.
func TestExampleRPZZoneMatchesTheNamesItNames(t *testing.T) {
path := filepath.Join("..", "..", "deploy", "zones", "local.rpz.zone.example")
rules, _, err := parseRPZFiles([]string{path})
if err != nil {
t.Fatalf("parseRPZFiles(%s): %v", path, err)
}
b := NewBuilder()
for _, r := range rules {
b.Add(r, "local-rpz", nil)
}
set := b.Build()
blocked := []string{
"www.doubleclick.net.",
"a.b.doubleclick.net.",
// These three carry an explicit "*." owner in the example, so only
// names below them are covered; the apex gap is pinned separately.
"cdn.ads.example.com.",
"pixel.tracker.example.net.",
"cdn.noisy-cdn.example.",
}
for _, name := range blocked {
e := set.Match(name)
if e == nil {
t.Errorf("%s is not matched by the example policy zone", name)
continue
}
if e.IsAllow() {
t.Errorf("%s matched an allow rule, want a block", name)
}
}
if e := set.Match("x.metrics.internal."); e == nil || !e.IsAllow() {
t.Errorf("x.metrics.internal. = %v, want the rpz-passthru allow rule", e)
}
if e := set.Match("unrelated.example."); e != nil {
t.Errorf("unrelated.example. matched %v, want no rule", e)
}
}
// TestExampleRPZZoneCoversTheApexItNames pins RPZ semantics on the shipped
// policy zone: a record names a domain, and it applies to that domain AND
// everything below it.
//
// This was a real gap, pinned rather than fixed for several rounds: rpzRule
// gave a bare owner name the strict-subdomain form ("*.name"), so
// `analytics.example.org.` blocked cdn.analytics.example.org. and left
// analytics.example.org. resolving normally. DECIDED: rpzRule now uses the
// apex form ("**.name") for a bare owner, which is what RFC 7766 says. An
// owner written with an explicit "*." is still strict, so a zone that wants
// subdomain-only behaviour can ask for it.
func TestExampleRPZZoneCoversTheApexItNames(t *testing.T) {
path := filepath.Join("..", "..", "deploy", "zones", "local.rpz.zone.example")
rules, _, err := parseRPZFiles([]string{path})
if err != nil {
t.Fatalf("parseRPZFiles(%s): %v", path, err)
}
b := NewBuilder()
for _, r := range rules {
b.Add(r, "local-rpz", nil)
}
set := b.Build()
// The record for analytics.example.org. was written with a bare owner, so
// it covers the apex as well as its children.
for _, name := range []string{"analytics.example.org.", "cdn.analytics.example.org."} {
e := set.Match(name)
if e == nil {
t.Errorf("%s is not matched by the example policy zone", name)
continue
}
if e.IsAllow() {
t.Errorf("%s matched an allow rule, want a block", name)
}
}
// The same on the allow side: an rpz-passthru. for a bare owner must
// allowlist the apex too, or a name on the blocklist stays blocked.
if e := set.Match("metrics.internal."); e == nil || !e.IsAllow() {
t.Errorf("metrics.internal. = %v, want the rpz-passthru allow rule to cover the apex", e)
}
// A bare-owner redirect covers its apex as well, which is the point of
// pointing a name at a landing page.
if e := set.Match("blocked.example."); e == nil || e.Action != ActionRedirect {
t.Errorf("blocked.example. = %v, want the redirect to cover the apex", e)
}
// The example's other records carry an explicit "*." owner, so they stay
// strict and the pin above is not masking a blanket change of behaviour.
for _, name := range []string{"doubleclick.net.", "ads.example.com."} {
if e := set.Match(name); e != nil {
t.Errorf("%s matched %v; an explicit \"*.\" owner must stay strict", name, e)
}
}
}