Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 16:24:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1685 (#1700)

Browse Source 
Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Create separate function for zone check

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Add tests for zone A records

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Remove pointer from checkZoneForRecord func signature, Add documentation

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Change apex to zone, Update readme information, Add additional tests

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Change zone to apex

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Change readme to reflect apex change

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Correct code comment

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Correct string join for apex.dns

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>
This commit is contained in:
Mario Kleinsasser
2018-04-27 20:36:58 +02:00
committed by Miek Gieben
parent 9d25b6d8b9
commit 13b1f5469a
3 changed files with 134 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugin/backend_lookup.go
View File

@@ -14,7 +14,7 @@ import (
// A returns A records from Backend or an error.
func A(b ServiceBackend, zone string, state request.Request, previousRecords []dns.RR, opt Options) (records []dns.RR, err error) {
services, err := b.Services(state, false, opt)
services, err := checkZoneForRecord(b, zone, state, opt)
if err != nil {
return nil, err
}
@@ -78,7 +78,7 @@ func A(b ServiceBackend, zone string, state request.Request, previousRecords []d
// AAAA returns AAAA records from Backend or an error.
func AAAA(b ServiceBackend, zone string, state request.Request, previousRecords []dns.RR, opt Options) (records []dns.RR, err error) {
services, err := b.Services(state, false, opt)
services, err := checkZoneForRecord(b, zone, state, opt)
if err != nil {
return nil, err
}
@@ -403,4 +403,37 @@ func newAddress(s msg.Service, name string, ip net.IP, what uint16) dns.RR {
return &dns.AAAA{Hdr: hdr, AAAA: ip}
}
func checkZoneForRecord(b ServiceBackend, zone string, state request.Request, opt Options) ([]msg.Service, error) {
var services []msg.Service
var err error
// if the zone name itself is queried we fake the query to search for a special entry
// this is equivalent to the NS search code
if state.Name() == zone {
old := state.QName()
state.Clear()
state.Req.Question[0].Name = dnsutil.Join([]string{"apex.dns", zone})
services, err = b.Services(state, false, opt)
if err != nil {
// it might be possible, that "apex.dns.zone" does not exists
// we set back the query and try it once again to restore the backward compatibility behavior
state.Req.Question[0].Name = old
services, err = b.Services(state, false, opt)
// if it still errors, we return the error
if err != nil {
return services, err
}
}
state.Req.Question[0].Name = old
} else {
services, err = b.Services(state, false, opt)
if err != nil {
return services, err
}
}
return services, err
}
const hostmaster = "hostmaster"