commit f9d50953b94c15936a72a39a205b3d72ea6dee41
author Xiangdong Ji <xiangdong.ji@gmail.com> Mon Jun 28 20:27:30 2021 +0800
committer Damien Neil <dneil@google.com> Tue Jun 29 21:54:24 2021 +0000
tree d6815e75e7060401892667134fe50bf70cf17002
parent e294b8a49e5ff157041b4ac6c3c3413dafd13673

net: fix failure of TestCVE202133195

TestCVE202133195 fails in testing LookupSRV if /etc/resolv.conf sets the option
'ndots' larger than the number of dots in the domain name under query.

Fix the issue by making the input domain name in test codes 'rooted' to skip search
list qualifying.

Fixes #46955

Change-Id: I1909fa7e54e9c9af57623e57cafc905729ff99fa
Reviewed-on: https://go-review.googlesource.com/c/go/+/330842
Reviewed-by: Damien Neil <dneil@google.com>
Run-TryBot: Damien Neil <dneil@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Dmitri Shuralyov <dmitshur@golang.org>

src/net/dnsclient_unix_test.go

diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index a59be7f..d69107a 100644
--- a/src/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
@@ -1921,12 +1921,12 @@
 		t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err, expected)
 	}
 
-	_, _, err = r.LookupSRV(context.Background(), "hdr", "tcp", "golang.org")
-	if expected := "lookup golang.org: SRV header name is invalid"; err == nil || err.Error() != expected {
+	_, _, err = r.LookupSRV(context.Background(), "hdr", "tcp", "golang.org.")
+	if expected := "lookup golang.org.: SRV header name is invalid"; err == nil || err.Error() != expected {
 		t.Errorf("Resolver.LookupSRV returned unexpected error, got %q, want %q", err, expected)
 	}
-	_, _, err = LookupSRV("hdr", "tcp", "golang.org")
-	if expected := "lookup golang.org: SRV header name is invalid"; err == nil || err.Error() != expected {
+	_, _, err = LookupSRV("hdr", "tcp", "golang.org.")
+	if expected := "lookup golang.org.: SRV header name is invalid"; err == nil || err.Error() != expected {
 		t.Errorf("LookupSRV returned unexpected error, got %q, want %q", err, expected)
 	}