fix proxyDialAddr and add more tests for it

Author: peterguy

internal/api/proxy.go

@@ -24,14 +24,14 @@ func (c *connWithBufferedReader) Read(p []byte) (int, error) {
 // proxyDialAddr returns proxyURL.Host with a default port appended if one is
 // not already present (443 for https, 80 for http).
 func proxyDialAddr(proxyURL *url.URL) string {
-	addr := proxyURL.Host
-	if _, _, err := net.SplitHostPort(addr); err != nil {
-		if proxyURL.Scheme == "https" {
-			return net.JoinHostPort(addr, "443")
-		}
-		return net.JoinHostPort(addr, "80")
+	// net.SplitHostPort returns an error when the input doesn't contain a port
+	if _, _, err := net.SplitHostPort(proxyURL.Host); err == nil {
+		return proxyURL.Host
+	}
+	if proxyURL.Scheme == "https" {
+		return net.JoinHostPort(proxyURL.Hostname(), "443")
 	}
-	return addr
+	return net.JoinHostPort(proxyURL.Hostname(), "80")
 }
 
 // withProxyTransport modifies the given transport to handle proxying of unix, socks5 and http connections.

internal/api/proxy_test.go

@@ -416,10 +416,19 @@ func TestProxyDialAddr(t *testing.T) {
 		{"https without port", "https://proxy.example.com", "proxy.example.com:443"},
 		{"http with port", "http://proxy.example.com:8080", "proxy.example.com:8080"},
 		{"http without port", "http://proxy.example.com", "proxy.example.com:80"},
+		{"ipv4 with port", "http://192.168.1.100:3128", "192.168.1.100:3128"},
+		{"ipv4 without port https", "https://10.0.0.1", "10.0.0.1:443"},
+		{"ipv4 without port http", "http://172.16.0.5", "172.16.0.5:80"},
+		{"ipv6 with port", "http://[::1]:8080", "[::1]:8080"},
+		{"ipv6 without port https", "https://[2001:db8::1]", "[2001:db8::1]:443"},
+		{"ipv6 without port http", "http://[fe80::1]", "[fe80::1]:80"},
+		{"localhost with port", "http://localhost:9090", "localhost:9090"},
+		{"localhost without port https", "https://localhost", "localhost:443"},
+		{"localhost without port http", "http://localhost", "localhost:80"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			u, err := url.Parse(tt.url)
+			u, err := url.ParseRequestURI(tt.url)
 			if err != nil {
 				t.Fatalf("parse URL: %v", err)
 			}