core/go-dns
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align resolve.all payload with RFC

Browse source
This commit is contained in:
Virgil 2026-04-04 03:14:35 +00:00
parent 3efa3308a5
commit 833db1974d
2 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
service.go
View file

@ -45,13 +45,10 @@ type NameRecords struct {
// fmt.Println(result.A, result.NS)
// // ["10.10.10.10"] ["ns.charon.lthn"]
type ResolveAllResult struct {
A []string `json:"a"`
AAAA []string `json:"aaaa"`
TXT []string `json:"txt"`
NS []string `json:"ns"`
DS []string `json:"ds"`
DNSKEY []string `json:"dnskey"`
RRSIG []string `json:"rrsig"`
A []string `json:"a"`
AAAA []string `json:"aaaa"`
TXT []string `json:"txt"`
NS []string `json:"ns"`
}
// ResolveAddressResult is the payload returned by `dns.resolve`.
@ -1149,7 +1146,7 @@ func normalizeReverseLookupInput(value string) (string, bool) {
// Missing names still return empty arrays so the action payload stays stable.
//
// result, ok := service.ResolveAll("missing.charon.lthn")
// // result = dns.ResolveAllResult{A: []string{}, AAAA: []string{}, TXT: []string{}, NS: []string{}, DS: []string{}, DNSKEY: []string{}, RRSIG: []string{}}
// // result = dns.ResolveAllResult{A: []string{}, AAAA: []string{}, TXT: []string{}, NS: []string{}}
func (service *Service) ResolveAll(name string) (ResolveAllResult, bool) {
if service == nil {
return ResolveAllResult{}, false
@ -1317,25 +1314,19 @@ func (service *Service) findRecordWithMatch(name string) (NameRecords, bool, boo
func resolveResult(record NameRecords) ResolveAllResult {
return ResolveAllResult{
A: normalizeRecordValues(record.A),
AAAA: normalizeRecordValues(record.AAAA),
TXT: normalizeRecordValues(record.TXT),
NS: normalizeRecordValues(record.NS),
DS: normalizeRecordValues(record.DS),
DNSKEY: normalizeRecordValues(record.DNSKEY),
RRSIG: normalizeRecordValues(record.RRSIG),
A: normalizeRecordValues(record.A),
AAAA: normalizeRecordValues(record.AAAA),
TXT: normalizeRecordValues(record.TXT),
NS: normalizeRecordValues(record.NS),
}
}
func emptyResolveAllResult() ResolveAllResult {
return ResolveAllResult{
A: []string{},
AAAA: []string{},
TXT: []string{},
NS: []string{},
DS: []string{},
DNSKEY: []string{},
RRSIG: []string{},
A: []string{},
AAAA: []string{},
TXT: []string{},
NS: []string{},
}
}

19
service_test.go
View file

@ -2645,7 +2645,7 @@ func TestServiceResolveAllReturnsStableShapeForDerivedZoneApex(t *testing.T) {
if err != nil {
t.Fatalf("expected derived apex payload to marshal: %v", err)
}
if string(raw) != `{"a":[],"aaaa":[],"txt":[],"ns":["ns.charon.lthn"],"ds":[],"dnskey":[],"rrsig":[]}` {
if string(raw) != `{"a":[],"aaaa":[],"txt":[],"ns":["ns.charon.lthn"]}` {
t.Fatalf("expected stable JSON shape for derived apex, got %s", raw)
}
}
@ -2680,7 +2680,7 @@ func TestServiceResolveAllReturnsEmptyArraysForMissingRecordValues(t *testing.T)
if err != nil {
t.Fatalf("expected result to marshal: %v", err)
}
if string(raw) != `{"a":["10.10.10.10"],"aaaa":[],"txt":[],"ns":[],"ds":[],"dnskey":[],"rrsig":[]}` {
if string(raw) != `{"a":["10.10.10.10"],"aaaa":[],"txt":[],"ns":[]}` {
t.Fatalf("expected empty arrays in JSON, got %s", raw)
}
}
@ -2700,12 +2700,12 @@ func TestServiceResolveAllReturnsEmptyArraysForMissingName(t *testing.T) {
if err != nil {
t.Fatalf("expected result to marshal: %v", err)
}
if string(raw) != `{"a":[],"aaaa":[],"txt":[],"ns":[],"ds":[],"dnskey":[],"rrsig":[]}` {
if string(raw) != `{"a":[],"aaaa":[],"txt":[],"ns":[]}` {
t.Fatalf("expected empty arrays in JSON, got %s", raw)
}
}
func TestServiceResolveAllIncludesDNSSECRecords(t *testing.T) {
func TestServiceResolveAllOmitsDNSSECRecords(t *testing.T) {
service := NewService(ServiceOptions{
Records: map[string]NameRecords{
"gateway.charon.lthn": {
@ -2724,14 +2724,11 @@ func TestServiceResolveAllIncludesDNSSECRecords(t *testing.T) {
if len(result.A) != 1 || result.A[0] != "10.10.10.10" {
t.Fatalf("unexpected A records in dns.resolve.all payload: %#v", result.A)
}
if len(result.DS) != 1 || result.DS[0] != "60485 8 2 A1B2C3D4E5F60718293A4B5C6D7E8F9012345678" {
t.Fatalf("expected DS payload in resolve.all, got %#v", result.DS)
if len(result.AAAA) != 0 || len(result.TXT) != 0 {
t.Fatalf("expected resolve.all to keep empty non-present record types, got %#v", result)
}
if len(result.DNSKEY) != 1 || result.DNSKEY[0] != "257 3 13 AA==" {
t.Fatalf("expected DNSKEY payload in resolve.all, got %#v", result.DNSKEY)
}
if len(result.RRSIG) != 1 || result.RRSIG[0] != "A 8 2 3600 20260101000000 20250101000000 12345 gateway.charon.lthn. AA==" {
t.Fatalf("expected RRSIG payload in resolve.all, got %#v", result.RRSIG)
if len(result.NS) != 1 || result.NS[0] != "ns.gateway.charon.lthn" {
t.Fatalf("expected resolve.all to synthesize the zone apex NS, got %#v", result.NS)
}
}