Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send SOA with negative responses (RFC2308) #995

Merged
merged 1 commit into from
Jul 13, 2015
Merged

Send SOA with negative responses (RFC2308) #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions command/agent/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ PARSE:
return
INVALID:
d.logger.Printf("[WARN] dns: QName invalid: %s", qName)
d.addSOA(d.domain, resp)
resp.SetRcode(req, dns.RcodeNameError)
}

Expand Down Expand Up @@ -373,6 +374,7 @@ RPC:

// If we have no address, return not found!
if out.NodeServices == nil {
d.addSOA(d.domain, resp)
resp.SetRcode(req, dns.RcodeNameError)
return
}
Expand Down Expand Up @@ -478,6 +480,7 @@ RPC:

// If we have no nodes, return not found!
if len(out.Nodes) == 0 {
d.addSOA(d.domain, resp)
resp.SetRcode(req, dns.RcodeNameError)
return
}
Expand Down
76 changes: 76 additions & 0 deletions command/agent/dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,28 @@ func TestDNS_NodeLookup(t *testing.T) {
if aRec.Hdr.Ttl != 0 {
t.Fatalf("Bad: %#v", in.Answer[0])
}

// lookup a non-existing node, we should receive a SOA
m = new(dns.Msg)
m.SetQuestion("nofoo.node.dc1.consul.", dns.TypeANY)

c = new(dns.Client)
in, _, err = c.Exchange(m, addr.String())
if err != nil {
t.Fatalf("err: %v", err)
}

if len(in.Ns) != 1 {
t.Fatalf("Bad: %#v", in, len(in.Answer))
}

soaRec, ok := in.Ns[0].(*dns.SOA)
if !ok {
t.Fatalf("Bad: %#v", in.Ns[0])
}
if soaRec.Hdr.Ttl != 0 {
t.Fatalf("Bad: %#v", in.Ns[0])
}
}

func TestDNS_CaseInsensitiveNodeLookup(t *testing.T) {
Expand Down Expand Up @@ -542,6 +564,29 @@ func TestDNS_ServiceLookup(t *testing.T) {
if aRec.Hdr.Ttl != 0 {
t.Fatalf("Bad: %#v", in.Extra[0])
}

// lookup a non-existing service, we should receive a SOA
m = new(dns.Msg)
m.SetQuestion("nodb.service.consul.", dns.TypeSRV)

c = new(dns.Client)
addr, _ = srv.agent.config.ClientListener("", srv.agent.config.Ports.DNS)
in, _, err = c.Exchange(m, addr.String())
if err != nil {
t.Fatalf("err: %v", err)
}

if len(in.Ns) != 1 {
t.Fatalf("Bad: %#v", in)
}

soaRec, ok := in.Ns[0].(*dns.SOA)
if !ok {
t.Fatalf("Bad: %#v", in.Ns[0])
}
if soaRec.Hdr.Ttl != 0 {
t.Fatalf("Bad: %#v", in.Ns[0])
}
}

func TestDNS_ServiceLookup_ServiceAddress(t *testing.T) {
Expand Down Expand Up @@ -1771,3 +1816,34 @@ func TestDNS_ServiceLookup_FilterACL(t *testing.T) {
t.Fatalf("Bad: %#v", in)
}
}

func TestDNS_NonExistingLookup(t *testing.T) {
dir, srv := makeDNSServer(t)
defer os.RemoveAll(dir)
defer srv.agent.Shutdown()

addr, _ := srv.agent.config.ClientListener("", srv.agent.config.Ports.DNS)

// lookup a non-existing node, we should receive a SOA
m := new(dns.Msg)
m.SetQuestion("nonexisting.consul.", dns.TypeANY)

c := new(dns.Client)
in, _, err := c.Exchange(m, addr.String())
if err != nil {
t.Fatalf("err: %v", err)
}

if len(in.Ns) != 1 {
t.Fatalf("Bad: %#v", in, len(in.Answer))
}

soaRec, ok := in.Ns[0].(*dns.SOA)
if !ok {
t.Fatalf("Bad: %#v", in.Ns[0])
}
if soaRec.Hdr.Ttl != 0 {
t.Fatalf("Bad: %#v", in.Ns[0])
}

}