Add test cases for non-tls+sni

libp2p · Jan 23, 2025 · bddc624 · bddc624
1 parent 927145d
commit bddc624
Showing 1 changed file with 63 additions and 65 deletions.
diff --git a/p2p/transport/websocket/websocket_test.go b/p2p/transport/websocket/websocket_test.go
@@ -552,76 +552,74 @@ func TestResolveMultiaddr(t *testing.T) {
 	}
 }
 
-func TestHTTPSProxyDoesSocks(t *testing.T) {
-	proxyServer, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-	proxyServerErr := make(chan error, 1)
-
-	go func() {
-		defer proxyServer.Close()
-		c, err := proxyServer.Accept()
-		if err != nil {
-			proxyServerErr <- err
-			return
-		}
-		defer c.Close()
-
-		req := [32]byte{}
-		_, err = io.ReadFull(c, req[:3])
-		if err != nil {
-			proxyServerErr <- err
-			return
-		}
-
-		// Handshake a SOCKS5 client: https://www.rfc-editor.org/rfc/rfc1928.html#section-3
-		if !bytes.Equal([]byte{0x05, 0x01, 0x00}, req[:3]) {
-			t.Log("expected SOCKS5 connect request")
-			proxyServerErr <- err
-			return
-		}
-		_, err = c.Write([]byte{0x05, 0x00})
-		if err != nil {
-			proxyServerErr <- err
-			return
-		}
-
-		expectedBytes := "\x05\x01\x00\x03\x0bexample.com"
-		_, err = io.ReadFull(c, req[:len(expectedBytes)])
-		if err != nil {
-			proxyServerErr <- err
-			return
-		}
-		if !bytes.Equal([]byte(expectedBytes), req[:len(expectedBytes)]) {
-			t.Log("expected SOCKS5 connect request")
-			proxyServerErr <- err
-			return
-		}
+func TestSocksProxy(t *testing.T) {
+	testCases := []string{
+		"/ip4/1.2.3.4/tcp/1/ws",                     // No TLS
+		"/ip4/1.2.3.4/tcp/1/tls/ws",                 // TLS no SNI
+		"/ip4/1.2.3.4/tcp/1/tls/sni/example.com/ws", // TLS with an SNI
+	}
 
-		proxyServerErr <- nil
-	}()
+	for _, tc := range testCases {
+		t.Run(tc, func(t *testing.T) {
+			proxyServer, err := net.Listen("tcp", "127.0.0.1:0")
+			require.NoError(t, err)
+			proxyServerErr := make(chan error, 1)
 
-	orig := gws.DefaultDialer.Proxy
-	defer func() { gws.DefaultDialer.Proxy = orig }()
+			go func() {
+				defer proxyServer.Close()
+				c, err := proxyServer.Accept()
+				if err != nil {
+					proxyServerErr <- err
+					return
+				}
+				defer c.Close()
+
+				req := [32]byte{}
+				_, err = io.ReadFull(c, req[:3])
+				if err != nil {
+					proxyServerErr <- err
+					return
+				}
+
+				// Handshake a SOCKS5 client: https://www.rfc-editor.org/rfc/rfc1928.html#section-3
+				if !bytes.Equal([]byte{0x05, 0x01, 0x00}, req[:3]) {
+					t.Log("expected SOCKS5 connect request")
+					proxyServerErr <- err
+					return
+				}
+				_, err = c.Write([]byte{0x05, 0x00})
+				if err != nil {
+					proxyServerErr <- err
+					return
+				}
+
+				proxyServerErr <- nil
+			}()
 
-	proxyUrl, err := url.Parse("socks5://" + proxyServer.Addr().String())
-	require.NoError(t, err)
-	gws.DefaultDialer.Proxy = http.ProxyURL(proxyUrl)
+			orig := gws.DefaultDialer.Proxy
+			defer func() { gws.DefaultDialer.Proxy = orig }()
 
-	tlsConfig := &tls.Config{InsecureSkipVerify: true} // Our test server doesn't have a cert signed by a CA
-	_, u := newSecureUpgrader(t)
-	tpt, err := New(u, &network.NullResourceManager{}, nil, WithTLSClientConfig(tlsConfig))
-	require.NoError(t, err)
+			proxyUrl, err := url.Parse("socks5://" + proxyServer.Addr().String())
+			require.NoError(t, err)
+			gws.DefaultDialer.Proxy = http.ProxyURL(proxyUrl)
 
-	// This can be any wss address. We aren't actually going to dial it.
-	maToDial := ma.StringCast("/ip4/1.2.3.4/tcp/1/tls/sni/example.com/ws")
-	_, err = tpt.Dial(context.Background(), maToDial, "")
-	require.ErrorContains(t, err, "failed to read connect reply from SOCKS5 proxy", "This should error as we don't have a real socks server")
+			tlsConfig := &tls.Config{InsecureSkipVerify: true} // Our test server doesn't have a cert signed by a CA
+			_, u := newSecureUpgrader(t)
+			tpt, err := New(u, &network.NullResourceManager{}, nil, WithTLSClientConfig(tlsConfig))
+			require.NoError(t, err)
 
-	select {
-	case <-time.After(1 * time.Second):
-	case err := <-proxyServerErr:
-		if err != nil {
-			t.Fatal(err)
-		}
+			// This can be any wss address. We aren't actually going to dial it.
+			maToDial := ma.StringCast(tc)
+			_, err = tpt.Dial(context.Background(), maToDial, "")
+			require.ErrorContains(t, err, "failed to read connect reply from SOCKS5 proxy", "This should error as we don't have a real socks server")
+
+			select {
+			case <-time.After(1 * time.Second):
+			case err := <-proxyServerErr:
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+		})
 	}
 }