* middleware/file: correctly parse the stanza Parsing the file stanza would give precedence to 'transfer' and ignore other bits if it wasn't specified. This change fixes the parsing. The actually external CNAME retrieval is working fine (once the upstream is correctly parsed). This wasn't caught in tests, because we lack a parsing test for this. Fixes #657 * Add tests
94 lines
2.2 KiB
Go
94 lines
2.2 KiB
Go
package test
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"log"
|
|
"testing"
|
|
|
|
"github.com/coredns/coredns/middleware/proxy"
|
|
"github.com/coredns/coredns/middleware/test"
|
|
"github.com/coredns/coredns/request"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func TestZoneExternalCNAMELookupWithoutProxy(t *testing.T) {
|
|
t.Parallel()
|
|
log.SetOutput(ioutil.Discard)
|
|
|
|
name, rm, err := TempFile(".", exampleOrg)
|
|
if err != nil {
|
|
t.Fatalf("Failed to create zone: %s", err)
|
|
}
|
|
defer rm()
|
|
|
|
// Corefile with for example without proxy section.
|
|
corefile := `example.org:0 {
|
|
file ` + name + `
|
|
}
|
|
`
|
|
i, err := CoreDNSServer(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
|
|
udp, _ := CoreDNSServerPorts(i, 0)
|
|
if udp == "" {
|
|
t.Fatalf("Could not get UDP listening port")
|
|
}
|
|
defer i.Stop()
|
|
|
|
p := proxy.NewLookup([]string{udp})
|
|
state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
|
|
|
|
resp, err := p.Lookup(state, "cname.example.org.", dns.TypeA)
|
|
if err != nil {
|
|
t.Fatalf("Expected to receive reply, but didn't: %s", err)
|
|
}
|
|
// There should only be a CNAME in the answer section.
|
|
if len(resp.Answer) != 1 {
|
|
t.Fatalf("Expected 1 RR in answer section got %d", len(resp.Answer))
|
|
}
|
|
}
|
|
|
|
func TestZoneExternalCNAMELookupWithProxy(t *testing.T) {
|
|
t.Parallel()
|
|
log.SetOutput(ioutil.Discard)
|
|
|
|
name, rm, err := TempFile(".", exampleOrg)
|
|
if err != nil {
|
|
t.Fatalf("Failed to create zone: %s", err)
|
|
}
|
|
defer rm()
|
|
|
|
// Corefile with for example without proxy section.
|
|
corefile := `example.org:0 {
|
|
file ` + name + ` {
|
|
upstream 8.8.8.8
|
|
}
|
|
}
|
|
`
|
|
i, err := CoreDNSServer(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
|
|
udp, _ := CoreDNSServerPorts(i, 0)
|
|
if udp == "" {
|
|
t.Fatalf("Could not get UDP listening port")
|
|
}
|
|
defer i.Stop()
|
|
|
|
p := proxy.NewLookup([]string{udp})
|
|
state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
|
|
|
|
resp, err := p.Lookup(state, "cname.example.org.", dns.TypeA)
|
|
if err != nil {
|
|
t.Fatalf("Expected to receive reply, but didn't: %s", err)
|
|
}
|
|
// There should be a CNAME *and* an IP address in the answer section.
|
|
// For now, just check that we have 2 RRs
|
|
if len(resp.Answer) != 2 {
|
|
t.Fatalf("Expected 2 RRs in answer section got %d", len(resp.Answer))
|
|
}
|
|
}
|