Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 10:43:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

middleware/file: fix delegations (#376)

Browse Source 
Fix the delegation handling in the *file* and *dnssec* middleware.
Refactor tests a bit and show that they are failling.

Add a Tree printer, cleanups and tests.
Fix wildcard test - should get no answer from empty-non-terminal
This commit is contained in:
Miek Gieben
2016-11-05 14:39:49 +00:00
committed by GitHub
parent d6902cd7a1
commit 2cca527d9f
18 changed files with 658 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
middleware/file/closest.go
View File

@@ -1,66 +1,24 @@
package file
import "github.com/miekg/dns"
import (
"github.com/miekg/coredns/middleware/file/tree"
"github.com/miekg/dns"
)
// ClosestEncloser returns the closest encloser for rr.
func (z *Zone) ClosestEncloser(qname string, qtype uint16) string {
// tree/tree.go does not store a parent *Node pointer, so we can't
// just follow up the tree. TODO(miek): fix.
func (z *Zone) ClosestEncloser(qname string) (*tree.Elem, bool) {
offset, end := dns.NextLabel(qname, 0)
for !end {
elem, _ := z.Tree.Search(qname, qtype)
elem, _ := z.Tree.Search(qname)
if elem != nil {
return elem.Name()
return elem, true
}
qname = qname[offset:]
offset, end = dns.NextLabel(qname, offset)
}
return z.Apex.SOA.Header().Name
}
// nameErrorProof finds the closest encloser and return an NSEC that proofs
// the wildcard does not exist and an NSEC that proofs the name does no exist.
func (z *Zone) nameErrorProof(qname string, qtype uint16) []dns.RR {
elem := z.Tree.Prev(qname)
if elem == nil {
return nil
}
nsec := z.lookupNSEC(elem, true)
nsecIndex := 0
for i := 0; i < len(nsec); i++ {
if nsec[i].Header().Rrtype == dns.TypeNSEC {
nsecIndex = i
break
}
}
// We do this lookup twice, once for wildcard and once for the name proof. TODO(miek): fix
ce := z.ClosestEncloser(qname, qtype)
elem = z.Tree.Prev("*." + ce)
if elem == nil {
// Root?
return nil
}
nsec1 := z.lookupNSEC(elem, true)
nsec1Index := 0
for i := 0; i < len(nsec1); i++ {
if nsec1[i].Header().Rrtype == dns.TypeNSEC {
nsec1Index = i
break
}
}
if len(nsec) == 0 || len(nsec1) == 0 {
return nsec
}
// Check for duplicate NSEC.
if nsec[nsecIndex].Header().Name == nsec1[nsec1Index].Header().Name &&
nsec[nsecIndex].(*dns.NSEC).NextDomain == nsec1[nsec1Index].(*dns.NSEC).NextDomain {
return nsec
}
return append(nsec, nsec1...)
return z.Tree.Search(z.origin)
}