More stuff

This commit is contained in:
Miek Gieben
2016-03-29 08:17:45 +01:00
parent acca8fc017
commit a3fc72f7b6
3 changed files with 58 additions and 24 deletions

View File

@@ -1,6 +1,9 @@
package file
import "github.com/miekg/dns"
import (
"github.com/miekg/coredns/middleware/file/tree"
"github.com/miekg/dns"
)
// Result is the result of a Lookup
type Result int
@@ -8,18 +11,17 @@ type Result int
const (
Success Result = iota
NameError
NoData // aint no offical NoData return code.
NoData
ServerFailure
)
// Lookup looks up qname and qtype in the zone, when do is true DNSSEC are included as well.
// Two sets of records are returned, one for the answer and one for the additional section.
func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR, Result) {
// Three sets of records are returned, one for the answer, one for authority and one for the additional section.
func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
var rr dns.RR
mk, known := dns.TypeToRR[qtype]
if !known {
an, ad, _ := z.lookupSOA(do)
return an, ad, NameError
// Uhm...? rr = new(RFC3597) ??
return nil, nil, nil, ServerFailure
} else {
rr = mk()
}
@@ -32,8 +34,7 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR,
rr.Header().Name = qname
elem := z.Tree.Get(rr)
if elem == nil {
an, ad, _ := z.lookupSOA(do)
return an, ad, NameError
return z.nameError(elem, rr, do)
}
rrs := elem.Types(dns.TypeCNAME)
@@ -44,8 +45,7 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR,
rrs = elem.Types(qtype)
if len(rrs) == 0 {
an, ad, _ := z.lookupSOA(do)
return an, ad, NoData
return z.noData(elem, do)
}
if do {
sigs := elem.Types(dns.TypeRRSIG)
@@ -54,21 +54,53 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR,
rrs = append(rrs, sigs...)
}
}
return rrs, nil, Success
return rrs, nil, nil, Success
}
func (z *Zone) lookupSOA(do bool) ([]dns.RR, []dns.RR, Result) {
func (z *Zone) noData(elem *tree.Elem, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
soa, _, _, _ := z.lookupSOA(do)
nsec := z.lookupNSEC(elem, do)
return nil, append(soa, nsec...), nil, Success
}
func (z *Zone) nameError(elem *tree.Elem, rr dns.RR, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
if do {
ret := append([]dns.RR{z.SOA}, z.SIG...)
return ret, nil, Success
return nil, ret, nil, Success
}
return []dns.RR{z.SOA}, nil, Success
// NSECs!
return nil, []dns.RR{z.SOA}, nil, Success
}
func (z *Zone) lookupCNAME(rrs []dns.RR, rr dns.RR, do bool) ([]dns.RR, []dns.RR, Result) {
func (z *Zone) lookupSOA(do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
if do {
ret := append([]dns.RR{z.SOA}, z.SIG...)
return ret, nil, nil, Success
}
return []dns.RR{z.SOA}, nil, nil, Success
}
// lookupNSEC looks up nsec and sigs.
func (z *Zone) lookupNSEC(elem *tree.Elem, do bool) []dns.RR {
if !do {
return nil
}
nsec := elem.Types(dns.TypeNSEC)
if do {
sigs := elem.Types(dns.TypeRRSIG)
sigs = signatureForSubType(sigs, dns.TypeNSEC)
if len(sigs) > 0 {
nsec = append(nsec, sigs...)
}
}
return nsec
}
func (z *Zone) lookupCNAME(rrs []dns.RR, rr dns.RR, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
elem := z.Tree.Get(rr)
if elem == nil {
return rrs, nil, Success
return rrs, nil, nil, Success
}
extra := cnameForType(elem.All(), rr.Header().Rrtype)
if do {
@@ -78,7 +110,7 @@ func (z *Zone) lookupCNAME(rrs []dns.RR, rr dns.RR, do bool) ([]dns.RR, []dns.RR
extra = append(extra, sigs...)
}
}
return rrs, extra, Success
return rrs, nil, extra, Success
}
func cnameForType(targets []dns.RR, origQtype uint16) []dns.RR {