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

[agent/codex:gpt-5.4-mini] Read docs/RFC.md fully. Find ONE feature described in the sp... #64

Merged
Virgil merged 1 commit from main into dev 2026-04-03 22:20:52 +00:00
Conversation 3 Commits 1 Files changed 2 +13 -5
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
serve.go
View file

@ -301,9 +301,9 @@ func (handler *dnsRequestHandler) ServeDNS(responseWriter dnsprotocol.ResponseWr
}
case dnsprotocol.TypeANY:
if found {
appendAnyAnswers(reply, question.Name, lookupName, record)
appendAnyAnswers(reply, question.Name, lookupName, record, handler.service.ZoneApex())
} else if normalizeName(lookupName) == handler.service.ZoneApex() && handler.service.ZoneApex() != "" {
appendAnyAnswers(reply, question.Name, lookupName, NameRecords{})
appendAnyAnswers(reply, question.Name, lookupName, NameRecords{}, handler.service.ZoneApex())
} else {
goto noRecord
}
@ -378,7 +378,7 @@ func parsePTRIP(name string) (string, bool) {
return "", false
}
func appendAnyAnswers(reply *dnsprotocol.Msg, questionName string, lookupName string, record NameRecords) {
func appendAnyAnswers(reply *dnsprotocol.Msg, questionName string, lookupName string, record NameRecords, zoneApex string) {
for _, value := range record.A {
parsedIP := net.ParseIP(value)
if parsedIP == nil || parsedIP.To4() == nil {
@ -417,7 +417,7 @@ func appendAnyAnswers(reply *dnsprotocol.Msg, questionName string, lookupName st
}
}
if normalizeName(lookupName) == normalizeName(questionName) && normalizeName(lookupName) != "" {
if normalizeName(lookupName) == normalizeName(zoneApex) && normalizeName(zoneApex) != "" {
if len(record.NS) == 0 {
reply.Answer = append(reply.Answer, &dnsprotocol.NS{
Hdr: dnsprotocol.RR_Header{Name: questionName, Rrtype: dnsprotocol.TypeNS, Class: dnsprotocol.ClassINET, Ttl: defaultDNSTTL},

10
service_test.go
View file

@ -1529,6 +1529,9 @@ func TestServiceServeAnswersANYWithAllRecordTypes(t *testing.T) {
TXT: []string{"v=lthn1 type=gateway"},
NS: []string{"ns.gateway.charon.lthn"},
},
"node.charon.lthn": {
A: []string{"10.10.10.11"},
},
},
})
@ -1546,7 +1549,7 @@ func TestServiceServeAnswersANYWithAllRecordTypes(t *testing.T) {
t.Fatalf("unexpected ANY rcode: %d", response.Rcode)
}
var sawA, sawAAAA, sawTXT, sawNS bool
var sawA, sawAAAA, sawTXT, sawNS, sawSOA bool
for _, answer := range response.Answer {
switch rr := answer.(type) {
case *dnsprotocol.A:
@ -1557,12 +1560,17 @@ func TestServiceServeAnswersANYWithAllRecordTypes(t *testing.T) {
sawTXT = len(rr.Txt) == 1 && rr.Txt[0] == "v=lthn1 type=gateway"
case *dnsprotocol.NS:
sawNS = rr.Ns == "ns.gateway.charon.lthn."
case *dnsprotocol.SOA:
sawSOA = true
}
}
if !sawA || !sawAAAA || !sawTXT || !sawNS {
t.Fatalf("expected ANY answer to include A, AAAA, TXT, and NS records, got %#v", response.Answer)
}
if sawSOA {
t.Fatalf("expected ANY answer for a non-apex name to omit SOA, got %#v", response.Answer)
}
}
func TestServiceServeResolvesWildcardAndPTRRecords(t *testing.T) {