Skip to content

Commit dd7ba3b

Browse files
rolandshoemakerneild
rolandshoemaker
authored and
neild
committed
net: don't rely on system hosts in TestCVE202133195
Also don't unnecessarily deref the error return. Fixes #46504 Change-Id: I22d14ac76776f8988fa0774bdcb5fcd801ce0185 Reviewed-on: https://go-review.googlesource.com/c/go/+/324190 Trust: David Chase <[email protected]> Trust: Damien Neil <[email protected]> Run-TryBot: David Chase <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Damien Neil <[email protected]>
1 parent 4f572d7 commit dd7ba3b

1 file changed

Lines changed: 20 additions & 19 deletions

File tree

‎src/net/dnsclient_unix_test.go‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,61 +1898,62 @@ func TestCVE202133195(t *testing.T) {
18981898
// Change the default resolver to match our manipulated resolver
18991899
originalDefault := DefaultResolver
19001900
DefaultResolver = &r
1901-
defer func() {
1902-
DefaultResolver = originalDefault
1903-
}()
1901+
defer func() { DefaultResolver = originalDefault }()
1902+
// Redirect host file lookups.
1903+
defer func(orig string) { testHookHostsPath = orig }(testHookHostsPath)
1904+
testHookHostsPath = "testdata/hosts"
19041905

19051906
_, err := r.LookupCNAME(context.Background(), "golang.org")
19061907
if expected := "lookup golang.org: CNAME target is invalid"; err == nil || err.Error() != expected {
1907-
t.Errorf("Resolver.LookupCNAME returned unexpected error, got %q, want %q", err.Error(), expected)
1908+
t.Errorf("Resolver.LookupCNAME returned unexpected error, got %q, want %q", err, expected)
19081909
}
19091910
_, err = LookupCNAME("golang.org")
19101911
if expected := "lookup golang.org: CNAME target is invalid"; err == nil || err.Error() != expected {
1911-
t.Errorf("LookupCNAME returned unexpected error, got %q, want %q", err.Error(), expected)
1912+
t.Errorf("LookupCNAME returned unexpected error, got %q, want %q", err, expected)
19121913
}
19131914

19141915
_, _, err = r.LookupSRV(context.Background(), "target", "tcp", "golang.org")
19151916
if expected := "lookup golang.org: SRV target is invalid"; err == nil || err.Error() != expected {
1916-
t.Errorf("Resolver.LookupSRV returned unexpected error, got %q, want %q", err.Error(), expected)
1917+
t.Errorf("Resolver.LookupSRV returned unexpected error, got %q, want %q", err, expected)
19171918
}
19181919
_, _, err = LookupSRV("target", "tcp", "golang.org")
19191920
if expected := "lookup golang.org: SRV target is invalid"; err == nil || err.Error() != expected {
1920-
t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err.Error(), expected)
1921+
t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err, expected)
19211922
}
19221923

19231924
_, _, err = r.LookupSRV(context.Background(), "hdr", "tcp", "golang.org")
19241925
if expected := "lookup golang.org: SRV header name is invalid"; err == nil || err.Error() != expected {
1925-
t.Errorf("Resolver.LookupSRV returned unexpected error, got %q, want %q", err.Error(), expected)
1926+
t.Errorf("Resolver.LookupSRV returned unexpected error, got %q, want %q", err, expected)
19261927
}
19271928
_, _, err = LookupSRV("hdr", "tcp", "golang.org")
19281929
if expected := "lookup golang.org: SRV header name is invalid"; err == nil || err.Error() != expected {
1929-
t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err.Error(), expected)
1930+
t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err, expected)
19301931
}
19311932

19321933
_, err = r.LookupMX(context.Background(), "golang.org")
19331934
if expected := "lookup golang.org: MX target is invalid"; err == nil || err.Error() != expected {
1934-
t.Errorf("Resolver.LookupMX returned unexpected error, got %q, want %q", err.Error(), expected)
1935+
t.Errorf("Resolver.LookupMX returned unexpected error, got %q, want %q", err, expected)
19351936
}
19361937
_, err = LookupMX("golang.org")
19371938
if expected := "lookup golang.org: MX target is invalid"; err == nil || err.Error() != expected {
1938-
t.Errorf("LookupMX returned unexpected error, got %q, want %q", err.Error(), expected)
1939+
t.Errorf("LookupMX returned unexpected error, got %q, want %q", err, expected)
19391940
}
19401941

19411942
_, err = r.LookupNS(context.Background(), "golang.org")
19421943
if expected := "lookup golang.org: NS target is invalid"; err == nil || err.Error() != expected {
1943-
t.Errorf("Resolver.LookupNS returned unexpected error, got %q, want %q", err.Error(), expected)
1944+
t.Errorf("Resolver.LookupNS returned unexpected error, got %q, want %q", err, expected)
19441945
}
19451946
_, err = LookupNS("golang.org")
19461947
if expected := "lookup golang.org: NS target is invalid"; err == nil || err.Error() != expected {
1947-
t.Errorf("LookupNS returned unexpected error, got %q, want %q", err.Error(), expected)
1948+
t.Errorf("LookupNS returned unexpected error, got %q, want %q", err, expected)
19481949
}
19491950

1950-
_, err = r.LookupAddr(context.Background(), "1.2.3.4")
1951-
if expected := "lookup 1.2.3.4: PTR target is invalid"; err == nil || err.Error() != expected {
1952-
t.Errorf("Resolver.LookupAddr returned unexpected error, got %q, want %q", err.Error(), expected)
1951+
_, err = r.LookupAddr(context.Background(), "192.0.2.42")
1952+
if expected := "lookup 192.0.2.42: PTR target is invalid"; err == nil || err.Error() != expected {
1953+
t.Errorf("Resolver.LookupAddr returned unexpected error, got %q, want %q", err, expected)
19531954
}
1954-
_, err = LookupAddr("1.2.3.4")
1955-
if expected := "lookup 1.2.3.4: PTR target is invalid"; err == nil || err.Error() != expected {
1956-
t.Errorf("LookupAddr returned unexpected error, got %q, want %q", err.Error(), expected)
1955+
_, err = LookupAddr("192.0.2.42")
1956+
if expected := "lookup 192.0.2.42: PTR target is invalid"; err == nil || err.Error() != expected {
1957+
t.Errorf("LookupAddr returned unexpected error, got %q, want %q", err, expected)
19571958
}
19581959
}

0 commit comments

Comments
 (0)