enable new utls conn factory

Author: Snawoot

dialer/h2.go

@@ -32,10 +32,11 @@ func H2ProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Dialer, error)
 	port := u.Port()
 
 	var (
-		tlsConfig *tls.Config
-		err       error
-		h2c       bool
-		scheme    string
+		tlsConfig  *tls.Config
+		tlsFactory func(net.Conn, *tls.Config) net.Conn
+		err        error
+		h2c        bool
+		scheme     string
 	)
 	switch strings.ToLower(u.Scheme) {
 	case "h2c":
@@ -55,6 +56,10 @@ func H2ProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Dialer, error)
 		if err != nil {
 			return nil, fmt.Errorf("TLS configuration failed: %w", err)
 		}
+		tlsFactory, err = tlsutil.TLSFactoryFromURL(u)
+		if err != nil {
+			return nil, fmt.Errorf("TLS configuration failed: %w", err)
+		}
 		scheme = "https"
 	default:
 		return nil, errors.New("unsupported proxy type")
@@ -120,7 +125,7 @@ func H2ProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Dialer, error)
 			if err != nil {
 				return nil, err
 			}
-			conn = tls.Client(conn, tlsConfig)
+			conn = tlsFactory(conn, tlsConfig)
 			return conn, nil
 		}
 	}

dialer/optimistic.go

@@ -17,10 +17,11 @@ import (
 )
 
 type OptimisticHTTPProxyDialer struct {
-	address   string
-	tlsConfig *tls.Config
-	userinfo  *url.Userinfo
-	next      Dialer
+	address    string
+	tlsConfig  *tls.Config
+	tlsFactory func(net.Conn, *tls.Config) net.Conn
+	userinfo   *url.Userinfo
+	next       Dialer
 }
 
 func NewOptimisticHTTPProxyDialer(address string, tlsConfig *tls.Config, userinfo *url.Userinfo, next LegacyDialer) *OptimisticHTTPProxyDialer {
@@ -36,8 +37,11 @@ func OptimisticHTTPProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Di
 	host := u.Hostname()
 	port := u.Port()
 
-	var tlsConfig *tls.Config
-	var err error
+	var (
+		tlsConfig  *tls.Config
+		tlsFactory func(net.Conn, *tls.Config) net.Conn
+		err        error
+	)
 	switch strings.ToLower(u.Scheme) {
 	case "http+optimistic":
 		if port == "" {
@@ -51,13 +55,23 @@ func OptimisticHTTPProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Di
 		if err != nil {
 			return nil, fmt.Errorf("TLS configuration failed: %w", err)
 		}
+		tlsFactory, err = tlsutil.TLSFactoryFromURL(u)
+		if err != nil {
+			return nil, fmt.Errorf("TLS configuration failed: %w", err)
+		}
 	default:
 		return nil, errors.New("unsupported proxy type")
 	}
 
 	address := net.JoinHostPort(host, port)
 
-	return NewOptimisticHTTPProxyDialer(address, tlsConfig, u.User, next), nil
+	return &OptimisticHTTPProxyDialer{
+		address:    address,
+		tlsConfig:  tlsConfig,
+		tlsFactory: tlsFactory,
+		userinfo:   u.User,
+		next:       MaybeWrapWithContextDialer(next),
+	}, nil
 }
 
 func (d *OptimisticHTTPProxyDialer) Dial(network, address string) (net.Conn, error) {
@@ -75,7 +89,7 @@ func (d *OptimisticHTTPProxyDialer) DialContext(ctx context.Context, network, ad
 		return nil, fmt.Errorf("proxy dialer is unable to make connection: %w", err)
 	}
 	if d.tlsConfig != nil {
-		conn = tls.Client(conn, d.tlsConfig)
+		conn = d.tlsFactory(conn, d.tlsConfig)
 	}
 
 	return &futureH1ProxiedConn{

dialer/upstream.go

@@ -21,10 +21,11 @@ import (
 )
 
 type HTTPProxyDialer struct {
-	address   string
-	tlsConfig *tls.Config
-	userinfo  *url.Userinfo
-	next      Dialer
+	address    string
+	tlsConfig  *tls.Config
+	tlsFactory func(net.Conn, *tls.Config) net.Conn
+	userinfo   *url.Userinfo
+	next       Dialer
 }
 
 func NewHTTPProxyDialer(address string, tlsConfig *tls.Config, userinfo *url.Userinfo, next LegacyDialer) *HTTPProxyDialer {
@@ -40,8 +41,11 @@ func HTTPProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Dialer, erro
 	host := u.Hostname()
 	port := u.Port()
 
-	var tlsConfig *tls.Config
-	var err error
+	var (
+		tlsConfig  *tls.Config
+		tlsFactory func(net.Conn, *tls.Config) net.Conn
+		err        error
+	)
 	switch strings.ToLower(u.Scheme) {
 	case "http":
 		if port == "" {
@@ -55,13 +59,23 @@ func HTTPProxyDialerFromURL(u *url.URL, next xproxy.Dialer) (xproxy.Dialer, erro
 		if err != nil {
 			return nil, fmt.Errorf("TLS configuration failed: %w", err)
 		}
+		tlsFactory, err = tlsutil.TLSFactoryFromURL(u)
+		if err != nil {
+			return nil, fmt.Errorf("TLS configuration failed: %w", err)
+		}
 	default:
 		return nil, errors.New("unsupported proxy type")
 	}
 
 	address := net.JoinHostPort(host, port)
 
-	return NewHTTPProxyDialer(address, tlsConfig, u.User, next), nil
+	return &HTTPProxyDialer{
+		address:    address,
+		tlsConfig:  tlsConfig,
+		tlsFactory: tlsFactory,
+		next:       MaybeWrapWithContextDialer(next),
+		userinfo:   u.User,
+	}, nil
 }
 
 func (d *HTTPProxyDialer) Dial(network, address string) (net.Conn, error) {
@@ -79,7 +93,7 @@ func (d *HTTPProxyDialer) DialContext(ctx context.Context, network, address stri
 		return nil, fmt.Errorf("proxy dialer is unable to make connection: %w", err)
 	}
 	if d.tlsConfig != nil {
-		conn = tls.Client(conn, d.tlsConfig)
+		conn = d.tlsFactory(conn, d.tlsConfig)
 	}
 
 	stopGuardEvent := make(chan struct{})