Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-31 10:13:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/file/auto: Write CNAME answer to client even if target lookup is SERVFAIL (#4863)

Browse Source 
* write cname answer to client even if target lookup is servfail

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

* fix existing unit test expectations

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver
2021-09-14 04:08:22 -04:00
committed by GitHub
parent 8f7162c42b
commit 158ad2d738
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/auto/auto.go
View File

@@ -82,7 +82,14 @@ func (a Auto) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
case file.Delegation:
m.Authoritative = false
case file.ServerFailure:
return dns.RcodeServerFailure, nil
// If the result is SERVFAIL and the answer is non-empty, then the SERVFAIL came from an
// external CNAME lookup and the answer contains the CNAME with no target record. We should
// write the CNAME record to the client instead of sending an empty SERVFAIL response.
if len(m.Answer) == 0 {
return dns.RcodeServerFailure, nil
}
// The rcode in the response should be the rcode received from the target lookup. RFC 6604 section 3
m.Rcode = dns.RcodeServerFailure
}
w.WriteMsg(m)

9
plugin/file/file.go
View File

@@ -99,7 +99,14 @@ func (f File) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
case Delegation:
m.Authoritative = false
case ServerFailure:
return dns.RcodeServerFailure, nil
// If the result is SERVFAIL and the answer is non-empty, then the SERVFAIL came from an
// external CNAME lookup and the answer contains the CNAME with no target record. We should
// write the CNAME record to the client instead of sending an empty SERVFAIL response.
if len(m.Answer) == 0 {
return dns.RcodeServerFailure, nil
}
// The rcode in the response should be the rcode received from the target lookup. RFC 6604 section 3
m.Rcode = dns.RcodeServerFailure
}
w.WriteMsg(m)

2
plugin/file/lookup.go
View File

@@ -383,7 +383,7 @@ Redo:
func (z *Zone) doLookup(ctx context.Context, state request.Request, target string, qtype uint16) ([]dns.RR, Result) {
m, e := z.Upstream.Lookup(ctx, state, target, qtype)
if e != nil {
return nil, Success
return nil, ServerFailure
}
if m == nil {
return nil, Success

12
plugin/file/lookup_test.go
View File

@@ -117,6 +117,14 @@ var dnsTestCases = []test.Case{
},
Ns: miekAuth,
},
{
Qname: "ext-cname.miek.nl.", Qtype: dns.TypeA,
Answer: []dns.RR{
test.CNAME("ext-cname.miek.nl. 1800 IN CNAME example.com."),
},
Rcode: dns.RcodeServerFailure,
Ns: miekAuth,
},
}
const (
@@ -218,4 +226,6 @@ archive IN CNAME a
dname IN DNAME x
srv IN SRV 10 10 8080 a.miek.nl.
mx IN MX 10 a.miek.nl.`
mx IN MX 10 a.miek.nl.
ext-cname IN CNAME example.com.`

7
test/file_upstream_test.go
View File

@@ -77,10 +77,17 @@ func TestFileUpstreamError(t *testing.T) {
},
"srvfail": {
Qname: "srvfail.example.org.", Qtype: dns.TypeA,
Answer: []dns.RR{
test.CNAME("srvfail.example.org. 3600 IN CNAME srvfail.example.net."),
},
Rcode: dns.RcodeServerFailure,
},
"srvfail-chain": {
Qname: "chain2.example.org.", Qtype: dns.TypeA,
Answer: []dns.RR{
test.CNAME("chain2.example.org. 3600 IN CNAME srvfail.example.org."),
test.CNAME("srvfail.example.org. 3600 IN CNAME srvfail.example.net."),
},
Rcode: dns.RcodeServerFailure,
},
"nodata": {