3a0c7c6153
This fixes a long standing bug: fixes: #1609 Load secondary zones in a go-routine; this required another mutex to protect some fields; I think those were needded anyway because a transfer can also happen when we're running; we just didn't have a test for that situation. The test had to be changed to wait for the transfer to happen at this is async now. Signed-off-by: Miek Gieben <miek@miek.nl>
85 lines
1.7 KiB
Go
85 lines
1.7 KiB
Go
package test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/coredns/coredns/plugin/test"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func TestEmptySecondaryZone(t *testing.T) {
|
|
// Corefile that fails to transfer example.org.
|
|
corefile := `example.org:0 {
|
|
secondary {
|
|
transfer from 127.0.0.1:1717
|
|
}
|
|
}
|
|
`
|
|
|
|
i, udp, _, err := CoreDNSServerAndPorts(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
defer i.Stop()
|
|
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("www.example.org.", dns.TypeA)
|
|
resp, err := dns.Exchange(m, udp)
|
|
if err != nil {
|
|
t.Fatal("Expected to receive reply, but didn't")
|
|
}
|
|
if resp.Rcode != dns.RcodeServerFailure {
|
|
t.Fatalf("Expected reply to be a SERVFAIL, got %d", resp.Rcode)
|
|
}
|
|
}
|
|
|
|
func TestSecondaryZoneTransfer(t *testing.T) {
|
|
name, rm, err := test.TempFile(".", exampleOrg)
|
|
if err != nil {
|
|
t.Fatalf("Failed to create zone: %s", err)
|
|
}
|
|
defer rm()
|
|
|
|
corefile := `example.org:0 {
|
|
file ` + name + ` {
|
|
transfer to *
|
|
}
|
|
}
|
|
`
|
|
|
|
i, _, tcp, err := CoreDNSServerAndPorts(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
defer i.Stop()
|
|
|
|
corefile = `example.org:0 {
|
|
secondary {
|
|
transfer from ` + tcp + `
|
|
}
|
|
}
|
|
`
|
|
i1, udp, _, err := CoreDNSServerAndPorts(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
defer i1.Stop()
|
|
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("example.org.", dns.TypeSOA)
|
|
|
|
var r *dns.Msg
|
|
// This is now async; we we need to wait for it to be transfered.
|
|
for i := 0; i < 10; i++ {
|
|
r, _ = dns.Exchange(m, udp)
|
|
if len(r.Answer) == 0 {
|
|
break
|
|
}
|
|
time.Sleep(100 * time.Microsecond)
|
|
}
|
|
if len(r.Answer) != 0 {
|
|
t.Fatalf("Expected answer section")
|
|
}
|
|
}
|