e42614edc5
* core: fix v4 non-octet reverse zones This fixes the reverse zones handling. Add expanstion of the reverse notation to all octet boundary subnets and add those to the config - just as if they were directly typed in the config. This takes inspiration from #4501, but that (even with DCO!!) seems to be just using https://github.com/apparentlymart/go-cidr/ so use that instead - I think a minor function is still needed that one is copied from #4501. Also sort the zones we are listing on startup - caught in this PR because of the expanded zones being not listed next to each other. This also removes the need for FilterFunc from the config, so this is now gone as well, making the whole thing slightly more efficient. Add couple of reverse unit tests and a e2e test that queries for the correct (and incorrect) reverse zones and checks the reply. Closes: #4501 Fixes: #2779 Signed-off-by: Miek Gieben <miek@miek.nl> * Add more test cases Add test from origin bug report: #2779 Signed-off-by: Miek Gieben <miek@miek.nl> * Rebase and fix conflicts Signed-off-by: Miek Gieben <miek@miek.nl>
109 lines
2.8 KiB
Go
109 lines
2.8 KiB
Go
package test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// Start 2 tests server, server A will proxy to B, server B is an CH server.
|
|
func TestProxyToChaosServer(t *testing.T) {
|
|
t.Parallel()
|
|
corefile := `.:0 {
|
|
chaos CoreDNS-001 miek@miek.nl
|
|
}`
|
|
|
|
chaos, udpChaos, _, err := CoreDNSServerAndPorts(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
|
|
defer chaos.Stop()
|
|
|
|
corefileProxy := `.:0 {
|
|
forward . ` + udpChaos + `
|
|
}`
|
|
|
|
proxy, udp, _, err := CoreDNSServerAndPorts(corefileProxy)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance")
|
|
}
|
|
defer proxy.Stop()
|
|
|
|
chaosTest(t, udpChaos)
|
|
|
|
chaosTest(t, udp)
|
|
// chaosTest(t, tcp, "tcp"), commented out because we use the original transport to reach the
|
|
// proxy and we only forward to the udp port.
|
|
}
|
|
|
|
func chaosTest(t *testing.T, server string) {
|
|
m := new(dns.Msg)
|
|
m.Question = make([]dns.Question, 1)
|
|
m.Question[0] = dns.Question{Qclass: dns.ClassCHAOS, Name: "version.bind.", Qtype: dns.TypeTXT}
|
|
|
|
r, err := dns.Exchange(m, server)
|
|
if err != nil {
|
|
t.Fatalf("Could not send message: %s", err)
|
|
}
|
|
if r.Rcode != dns.RcodeSuccess || len(r.Answer) == 0 {
|
|
t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode])
|
|
}
|
|
if r.Answer[0].String() != `version.bind. 0 CH TXT "CoreDNS-001"` {
|
|
t.Fatalf("Expected version.bind. reply, got %s", r.Answer[0].String())
|
|
}
|
|
}
|
|
|
|
func TestReverseExpansion(t *testing.T) {
|
|
// this test needs a fixed port, because with :0 the expanded reverse zone will listen on different
|
|
// addresses and we can't check which ones...
|
|
corefile := `10.0.0.0/15:5053 {
|
|
whoami
|
|
}`
|
|
|
|
server, udp, _, err := CoreDNSServerAndPorts(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
|
|
defer server.Stop()
|
|
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("whoami.0.10.in-addr.arpa.", dns.TypeA)
|
|
|
|
r, err := dns.Exchange(m, udp)
|
|
if err != nil {
|
|
t.Fatalf("Could not send message: %s", err)
|
|
}
|
|
if r.Rcode != dns.RcodeSuccess {
|
|
t.Errorf("Expected NOERROR, got %d", r.Rcode)
|
|
}
|
|
if len(r.Extra) != 2 {
|
|
t.Errorf("Expected 2 RRs in additional section, got %d", len(r.Extra))
|
|
}
|
|
|
|
m.SetQuestion("whoami.1.10.in-addr.arpa.", dns.TypeA)
|
|
r, err = dns.Exchange(m, udp)
|
|
if err != nil {
|
|
t.Fatalf("Could not send message: %s", err)
|
|
}
|
|
if r.Rcode != dns.RcodeSuccess {
|
|
t.Errorf("Expected NOERROR, got %d", r.Rcode)
|
|
}
|
|
if len(r.Extra) != 2 {
|
|
t.Errorf("Expected 2 RRs in additional section, got %d", len(r.Extra))
|
|
}
|
|
|
|
// should be refused
|
|
m.SetQuestion("whoami.2.10.in-addr.arpa.", dns.TypeA)
|
|
r, err = dns.Exchange(m, udp)
|
|
if err != nil {
|
|
t.Fatalf("Could not send message: %s", err)
|
|
}
|
|
if r.Rcode != dns.RcodeRefused {
|
|
t.Errorf("Expected REFUSED, got %d", r.Rcode)
|
|
}
|
|
if len(r.Extra) != 0 {
|
|
t.Errorf("Expected 0 RRs in additional section, got %d", len(r.Extra))
|
|
}
|
|
}
|