H6/H7/M3/M4/M7: hardening + behavior documentation
H6 — TSIG replay-window test. New TestCheckTSIG_BadStatus_Refused verifies that when miekg/dns reports a TSIG verification failure via ResponseWriter.TsigStatus (the channel for fudge-window violations, bad MACs, expired timestamps), our plugin refuses. The fudge tolerance itself is miekg/dns's default (300s); documented in tsig.go so operators know the dependency. H7 — No-op UPDATE policy: documented explicitly in update.go. We do NOT bump the SOA on a no-op (deduped) UPDATE — forcing downstream secondaries to AXFR identical content wastes bandwidth and contradicts RFC 2136's intent. Callers wanting to force a serial bump can send a throwaway add+delete pair (touch-UPDATE pattern). M3 — Delete-by-exact-match ignores TTL and class per RFC 2136 §2.5.4. The previous rr.String() comparison included TTL, so an UPDATE with CLASS=NONE TTL=0 (the protocol-required encoding for a delete) failed to match stored RRs at CLASS=IN with non-zero TTL. Now we normalize both sides (TTL=0, class=IN) before invoking dns.IsDuplicate. M4 — validateZoneFiles now actually parses each zone at startup (loadRRs invocation). Previously it only stat()'d the file; corrupt zone content sailed through startup and produced SERVFAIL on the first UPDATE with no startup-time signal. Combined with H3+H4's invariant checks, this turns silent zone corruption into immediate startup failure. M7 — Commit-message sanitization. RR names are attacker-controlled (TSIG only authenticates the sender; the payload is hostile by default). Control characters in commit messages could inject newlines into git log or ANSI sequences into downstream log renderers. New sanitizeForCommitMessage escapes \n, \r, \t, and other C0 controls. New tests: - TestCheckTSIG_BadStatus_Refused (H6) - TestUpdate_DeleteRR_IgnoresTTL (M3) - TestSanitizeForCommitMessage (M7)
This commit is contained in:
parent
d9dad01798
commit
6ab2b6af6d
5 changed files with 185 additions and 15 deletions
15
setup.go
15
setup.go
|
|
@ -272,8 +272,16 @@ func parse(c *caddy.Controller) (*RFC2136, error) {
|
|||
}
|
||||
|
||||
// validateZoneFiles ensures every configured zone has an accessible
|
||||
// file on disk at the expected path. Catches typos at CoreDNS startup
|
||||
// rather than the first UPDATE.
|
||||
// AND parseable file on disk at the expected path. Catches both typos
|
||||
// (file missing) and corrupt zone content at CoreDNS startup rather
|
||||
// than on the first UPDATE — the operator gets an immediate signal
|
||||
// instead of discovering the breakage minutes later when ACME fires.
|
||||
//
|
||||
// Hamilton M4: the previous version only stat()'d the file. A zone
|
||||
// with a syntax error sailed through startup, then the first UPDATE
|
||||
// returned SERVFAIL with no startup-time signal. We now run the same
|
||||
// loadRRs + assertSingleApexSOA path the UPDATE handler uses, so any
|
||||
// parse-time or SOA-invariant failure surfaces at startup.
|
||||
func (p *RFC2136) validateZoneFiles() error {
|
||||
for zone, zf := range p.zones {
|
||||
st, err := os.Stat(zf.Path)
|
||||
|
|
@ -283,6 +291,9 @@ func (p *RFC2136) validateZoneFiles() error {
|
|||
if st.IsDir() {
|
||||
return fmt.Errorf("zone %q: %s is a directory, expected a regular file", zone, zf.Path)
|
||||
}
|
||||
if _, _, err := zf.loadRRs(); err != nil {
|
||||
return fmt.Errorf("zone %q at %s: %w", zone, zf.Path, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue