Skip to content

Commit 7193b88

Browse files
TMHSDigitalclaude
andcommitted
refactor(lab): table-drive dnsserver.build and labzone.parseLine (#164)
build now takes its answers from a table keyed by query type, with the CNAME step and authority SOA in their own helpers (gocognit 50 -> 14). parseLine dispatches to directive, failure and record-type tables, and the "known: ..." lists in its errors are built from them in the old order (41 -> 2/11). Adding a record type or directive is one entry. Behaviour is unchanged: the new tests passed on the old code first, and a temporary side-by-side check of old and new build matched byte for byte over 768 query/reply combinations. TestParseErrors now asserts the exact message for every branch (37 cases), TestParseRecords covers every accepted line, and TestReplies gains CNAME/AAAA and SOA cases. Fixes #164 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LpkeXSPwrzd7ZCuX3no7gD
1 parent d6d4954 commit 7193b88

4 files changed

Lines changed: 341 additions & 137 deletions

File tree

‎internal/dnsserver/server.go‎

Lines changed: 87 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -454,65 +454,105 @@ func build(qh dnsmessage.Header, question dnsmessage.Question, q Query, r Reply)
454454

455455
answered := 0
456456
if r.RCode == dnsmessage.RCodeSuccess && !hdr.Truncated {
457-
rh := func(name dnsmessage.Name, t dnsmessage.Type) dnsmessage.ResourceHeader {
458-
return dnsmessage.ResourceHeader{Name: name, Type: t, Class: dnsmessage.ClassINET, TTL: 60}
459-
}
460-
owner := question.Name
461-
if r.CNAME != "" {
462-
target, err := dnsmessage.NewName(fqdn(r.CNAME))
463-
if err != nil {
464-
return nil, err
465-
}
466-
if err := b.CNAMEResource(rh(owner, dnsmessage.TypeCNAME), dnsmessage.CNAMEResource{CNAME: target}); err != nil {
467-
return nil, err
468-
}
469-
answered++
470-
owner = target
471-
}
472-
switch q.Type {
473-
case dnsmessage.TypeA:
474-
for _, a := range r.A {
475-
ip, err := netip.ParseAddr(a)
476-
if err != nil || !ip.Is4() {
477-
continue
478-
}
479-
if err := b.AResource(rh(owner, dnsmessage.TypeA), dnsmessage.AResource{A: ip.As4()}); err != nil {
480-
return nil, err
481-
}
482-
answered++
483-
}
484-
case dnsmessage.TypeAAAA:
485-
for _, a := range r.AAAA {
486-
ip, err := netip.ParseAddr(a)
487-
if err != nil || !ip.Is6() || ip.Is4In6() {
488-
continue
489-
}
490-
if err := b.AAAAResource(rh(owner, dnsmessage.TypeAAAA), dnsmessage.AAAAResource{AAAA: ip.As16()}); err != nil {
491-
return nil, err
492-
}
493-
answered++
494-
}
457+
n, err := addAnswers(&b, question.Name, q.Type, r)
458+
if err != nil {
459+
return nil, err
495460
}
461+
answered = n
496462
}
497463

498464
// Negative answers (NXDOMAIN, and NOERROR without records: NODATA) carry
499465
// the zone's SOA, as real authoritative servers send.
500466
if answered == 0 && !hdr.Truncated && (r.RCode == dnsmessage.RCodeSuccess || r.RCode == dnsmessage.RCodeNameError) {
501-
if err := b.StartAuthorities(); err != nil {
467+
if err := addSOA(&b, q.Name); err != nil {
502468
return nil, err
503469
}
504-
zone, err := dnsmessage.NewName(fqdn(zoneOf(q.Name)))
470+
}
471+
return b.Finish()
472+
}
473+
474+
// answerBuilder adds r's records of one query type, owned by owner, and
475+
// returns how many it added. Values that are not valid for the type are
476+
// skipped.
477+
type answerBuilder func(b *dnsmessage.Builder, owner dnsmessage.Name, r Reply) (int, error)
478+
479+
// answerBuilders holds one builder per query type the server answers; a new
480+
// record type is one entry here. Other types get only the CNAME, if any.
481+
var answerBuilders = map[dnsmessage.Type]answerBuilder{
482+
dnsmessage.TypeA: addA,
483+
dnsmessage.TypeAAAA: addAAAA,
484+
}
485+
486+
// rrHeader is the header every answer record carries.
487+
func rrHeader(name dnsmessage.Name, t dnsmessage.Type) dnsmessage.ResourceHeader {
488+
return dnsmessage.ResourceHeader{Name: name, Type: t, Class: dnsmessage.ClassINET, TTL: 60}
489+
}
490+
491+
// addAnswers adds r's CNAME, if any, then the records of type qtype, owned by
492+
// the CNAME target when there is one. It returns how many records it added.
493+
func addAnswers(b *dnsmessage.Builder, owner dnsmessage.Name, qtype dnsmessage.Type, r Reply) (int, error) {
494+
answered := 0
495+
if r.CNAME != "" {
496+
target, err := dnsmessage.NewName(fqdn(r.CNAME))
505497
if err != nil {
506-
return nil, err
498+
return 0, err
507499
}
508-
mname, _ := dnsmessage.NewName("ns." + fqdn(zoneOf(q.Name)))
509-
rname, _ := dnsmessage.NewName("hostmaster." + fqdn(zoneOf(q.Name)))
510-
soa := dnsmessage.SOAResource{NS: mname, MBox: rname, Serial: 1, Refresh: 3600, Retry: 600, Expire: 86400, MinTTL: 60}
511-
if err := b.SOAResource(dnsmessage.ResourceHeader{Name: zone, Type: dnsmessage.TypeSOA, Class: dnsmessage.ClassINET, TTL: 60}, soa); err != nil {
512-
return nil, err
500+
if err := b.CNAMEResource(rrHeader(owner, dnsmessage.TypeCNAME), dnsmessage.CNAMEResource{CNAME: target}); err != nil {
501+
return 0, err
513502
}
503+
answered++
504+
owner = target
514505
}
515-
return b.Finish()
506+
add, ok := answerBuilders[qtype]
507+
if !ok {
508+
return answered, nil
509+
}
510+
n, err := add(b, owner, r)
511+
return answered + n, err
512+
}
513+
514+
// addAddrs adds one record per value that parses as an address keep accepts.
515+
func addAddrs(values []string, keep func(netip.Addr) bool, add func(netip.Addr) error) (int, error) {
516+
n := 0
517+
for _, v := range values {
518+
ip, err := netip.ParseAddr(v)
519+
if err != nil || !keep(ip) {
520+
continue
521+
}
522+
if err := add(ip); err != nil {
523+
return n, err
524+
}
525+
n++
526+
}
527+
return n, nil
528+
}
529+
530+
func addA(b *dnsmessage.Builder, owner dnsmessage.Name, r Reply) (int, error) {
531+
return addAddrs(r.A, netip.Addr.Is4, func(ip netip.Addr) error {
532+
return b.AResource(rrHeader(owner, dnsmessage.TypeA), dnsmessage.AResource{A: ip.As4()})
533+
})
534+
}
535+
536+
func addAAAA(b *dnsmessage.Builder, owner dnsmessage.Name, r Reply) (int, error) {
537+
isV6 := func(ip netip.Addr) bool { return ip.Is6() && !ip.Is4In6() }
538+
return addAddrs(r.AAAA, isV6, func(ip netip.Addr) error {
539+
return b.AAAAResource(rrHeader(owner, dnsmessage.TypeAAAA), dnsmessage.AAAAResource{AAAA: ip.As16()})
540+
})
541+
}
542+
543+
// addSOA adds the authority section holding the SOA of name's zone.
544+
func addSOA(b *dnsmessage.Builder, name string) error {
545+
if err := b.StartAuthorities(); err != nil {
546+
return err
547+
}
548+
zone, err := dnsmessage.NewName(fqdn(zoneOf(name)))
549+
if err != nil {
550+
return err
551+
}
552+
mname, _ := dnsmessage.NewName("ns." + fqdn(zoneOf(name)))
553+
rname, _ := dnsmessage.NewName("hostmaster." + fqdn(zoneOf(name)))
554+
soa := dnsmessage.SOAResource{NS: mname, MBox: rname, Serial: 1, Refresh: 3600, Retry: 600, Expire: 86400, MinTTL: 60}
555+
return b.SOAResource(dnsmessage.ResourceHeader{Name: zone, Type: dnsmessage.TypeSOA, Class: dnsmessage.ClassINET, TTL: 60}, soa)
516556
}
517557

518558
func fqdn(name string) string {

‎internal/dnsserver/transport_test.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,9 @@ func TestReplies(t *testing.T) {
399399
replies := map[string]Reply{
400400
"a.example.com": {A: []string{"192.0.2.1", "nope", "2001:db8::1"}, AAAA: []string{"2001:db8::1"}},
401401
"aaaa.example.com": {AAAA: []string{"2001:db8::1", "192.0.2.1", "::ffff:192.0.2.1"}, A: []string{"192.0.2.1"}},
402-
"alias.example.com": {CNAME: "target.example.net", A: []string{"192.0.2.5"}},
402+
"alias.example.com": {CNAME: "target.example.net", A: []string{"192.0.2.5"}, AAAA: []string{"2001:db8::5", "bad"}},
403+
"bare.example.com": {CNAME: "target.example.net."},
404+
"nxalias.example.com": {RCode: dnsmessage.RCodeNameError, CNAME: "target.example.net", A: []string{"192.0.2.5"}},
403405
"nx.sub.example.com": NXDomain,
404406
"empty.example.com": {},
405407
"example.com": {},
@@ -422,7 +424,11 @@ func TestReplies(t *testing.T) {
422424
{"a.example.com.", dnsmessage.TypeA, dnsmessage.RCodeSuccess, []string{"a.example.com. TypeA 192.0.2.1"}, ""},
423425
{"aaaa.example.com.", dnsmessage.TypeAAAA, dnsmessage.RCodeSuccess, []string{"aaaa.example.com. TypeAAAA 2001:db8::1"}, ""},
424426
{"alias.example.com.", dnsmessage.TypeA, dnsmessage.RCodeSuccess, []string{"alias.example.com. TypeCNAME target.example.net.", "target.example.net. TypeA 192.0.2.5"}, ""},
427+
{"alias.example.com.", dnsmessage.TypeAAAA, dnsmessage.RCodeSuccess, []string{"alias.example.com. TypeCNAME target.example.net.", "target.example.net. TypeAAAA 2001:db8::5"}, ""},
425428
{"alias.example.com.", dnsmessage.TypeTXT, dnsmessage.RCodeSuccess, []string{"alias.example.com. TypeCNAME target.example.net."}, ""},
429+
{"bare.example.com.", dnsmessage.TypeA, dnsmessage.RCodeSuccess, []string{"bare.example.com. TypeCNAME target.example.net."}, ""},
430+
{"nxalias.example.com.", dnsmessage.TypeA, dnsmessage.RCodeNameError, nil, "example.com."},
431+
{"a.example.com.", dnsmessage.TypeAAAA, dnsmessage.RCodeSuccess, []string{"a.example.com. TypeAAAA 2001:db8::1"}, ""},
426432
{"a.example.com.", dnsmessage.TypeTXT, dnsmessage.RCodeSuccess, nil, "example.com."},
427433
{"nx.sub.example.com.", dnsmessage.TypeA, dnsmessage.RCodeNameError, nil, "example.com."},
428434
{"empty.example.com.", dnsmessage.TypeA, dnsmessage.RCodeSuccess, nil, "example.com."},

0 commit comments

Comments
 (0)