Skip to content

Commit

Permalink
net: ignore lame referral responses like libresolv
Browse files Browse the repository at this point in the history
Fixes #15434.

Change-Id: Ia88b740df5418a6d3af1c29a03756f4234f388b0
Reviewed-on: https://go-review.googlesource.com/22428
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
mdempsky committed Apr 26, 2016
1 parent 96b8f70 commit 98b99d5
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 9 deletions.
6 changes: 6 additions & 0 deletions src/net/dnsclient_unix.go
Expand Up @@ -204,6 +204,12 @@ func tryOneName(ctx context.Context, cfg *dnsConfig, name string, qtype uint16)
}
continue
}
// libresolv continues to the next server when it receives
// an invalid referral response. See golang.org/issue/15434.
if msg.rcode == dnsRcodeSuccess && !msg.authoritative && !msg.recursion_available && len(msg.answer) == 0 && len(msg.extra) == 0 {
lastErr = &DNSError{Err: "lame referral", Name: name, Server: server}
continue
}
cname, rrs, err := answer(name, server, msg, qtype)
// If answer errored for rcodes dnsRcodeSuccess or dnsRcodeNameError,
// it means the response in msg was not useful and trying another
Expand Down
86 changes: 77 additions & 9 deletions src/net/dnsclient_unix_test.go
Expand Up @@ -20,6 +20,9 @@ import (
"time"
)

// Test address from 192.0.2.0/24 block, reserved by RFC 5737 for documentation.
const TestAddr uint32 = 0xc0000201

var dnsTransportFallbackTests = []struct {
server string
name string
Expand Down Expand Up @@ -494,10 +497,10 @@ func TestErrorForOriginalNameWhenSearching(t *testing.T) {
t.Fatal(err)
}

d := &fakeDNSConn{}
d := &fakeDNSDialer{}
testHookDNSDialer = func() dnsDialer { return d }

d.rh = func(q *dnsMsg) (*dnsMsg, error) {
d.rh = func(s string, q *dnsMsg) (*dnsMsg, error) {
r := &dnsMsg{
dnsMsgHdr: dnsMsgHdr{
id: q.id,
Expand Down Expand Up @@ -525,6 +528,68 @@ func TestErrorForOriginalNameWhenSearching(t *testing.T) {
}
}

// Issue 15434. If a name server gives a lame referral, continue to the next.
func TestIgnoreLameReferrals(t *testing.T) {
origTestHookDNSDialer := testHookDNSDialer
defer func() { testHookDNSDialer = origTestHookDNSDialer }()

conf, err := newResolvConfTest()
if err != nil {
t.Fatal(err)
}
defer conf.teardown()

if err := conf.writeAndUpdate([]string{"nameserver 192.0.2.1", "nameserver 192.0.2.2"}); err != nil {
t.Fatal(err)
}

d := &fakeDNSDialer{}
testHookDNSDialer = func() dnsDialer { return d }

d.rh = func(s string, q *dnsMsg) (*dnsMsg, error) {
t.Log(s, q)
r := &dnsMsg{
dnsMsgHdr: dnsMsgHdr{
id: q.id,
response: true,
},
question: q.question,
}

if s == "192.0.2.2:53" {
r.recursion_available = true
if q.question[0].Qtype == dnsTypeA {
r.answer = []dnsRR{
&dnsRR_A{
Hdr: dnsRR_Header{
Name: q.question[0].Name,
Rrtype: dnsTypeA,
Class: dnsClassINET,
Rdlength: 4,
},
A: TestAddr,
},
}
}
}

return r, nil
}

addrs, err := goLookupIP(context.Background(), "www.golang.org")
if err != nil {
t.Fatal(err)
}

if got := len(addrs); got != 1 {
t.Fatal("got %d addresses, want 1", got)
}

if got, want := addrs[0].String(), "192.0.2.1"; got != want {
t.Fatal("got address %v, want %v", got, want)
}
}

func BenchmarkGoLookupIP(b *testing.B) {
testHookUninstaller.Do(uninstallTestHooks)
ctx := context.Background()
Expand Down Expand Up @@ -566,13 +631,18 @@ func BenchmarkGoLookupIPWithBrokenNameServer(b *testing.B) {
}
}

type fakeDNSConn struct {
type fakeDNSDialer struct {
// reply handler
rh func(*dnsMsg) (*dnsMsg, error)
rh func(s string, q *dnsMsg) (*dnsMsg, error)
}

func (f *fakeDNSConn) dialDNS(_ context.Context, n, s string) (dnsConn, error) {
return f, nil
func (f *fakeDNSDialer) dialDNS(_ context.Context, n, s string) (dnsConn, error) {
return &fakeDNSConn{f.rh, s}, nil
}

type fakeDNSConn struct {
rh func(s string, q *dnsMsg) (*dnsMsg, error)
s string
}

func (f *fakeDNSConn) Close() error {
Expand All @@ -584,13 +654,11 @@ func (f *fakeDNSConn) SetDeadline(time.Time) error {
}

func (f *fakeDNSConn) dnsRoundTrip(q *dnsMsg) (*dnsMsg, error) {
return f.rh(q)
return f.rh(f.s, q)
}

// UDP round-tripper algorithm should ignore invalid DNS responses (issue 13281).
func TestIgnoreDNSForgeries(t *testing.T) {
const TestAddr uint32 = 0x80420001

c, s := Pipe()
go func() {
b := make([]byte, 512)
Expand Down

0 comments on commit 98b99d5

Please sign in to comment.