fixup! feat: Server.Run(...) validate addr

jimlambrt · Feb 21, 2024 · d2f9f0a · d2f9f0a
1 parent 5e34c69
commit d2f9f0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -110,7 +110,9 @@ func validateAddr(addr string) (string, error) {
 	}
 
 	// see if we're dealing with a hostname
-	hostnames, _ := net.LookupHost(rawHost)
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+	defer cancel()
+	hostnames, _ := net.DefaultResolver.LookupHost(ctx, rawHost)
 	if len(hostnames) > 0 {
 		if rawHost == "::1" {
 			// special case for localhost

diff --git a/server_internal_test.go b/server_internal_test.go
@@ -150,6 +150,11 @@ func TestValidateAddr(t *testing.T) {
 			addr:     "2001:db8:3333:4444:5555:6666:7777:8888:389",
 			expected: "2001:db8:3333:4444:5555:6666:7777:8888:389",
 		},
+		{
+			name:     "valid-IPv6-literal",
+			addr:     "[2001:db8:3333:4444:5555:6666:7777:8888]:389",
+			expected: "[2001:db8:3333:4444:5555:6666:7777:8888]:389",
+		},
 		{
 			name:     "valid-IPv6-localhost-without-brackets",
 			addr:     "::1:389",