added option to set headers for connect request;

cffi_src/factory.go

@@ -388,6 +388,10 @@ func getTlsClient(requestInput RequestInput, sessionId string, withSession bool)
 		options = append(options, tls_client.WithDefaultHeaders(requestInput.DefaultHeaders))
 	}
 
+	if requestInput.ConnectHeaders != nil && len(requestInput.ConnectHeaders) != 0 {
+		options = append(options, tls_client.WithConnectHeaders(requestInput.ConnectHeaders))
+	}
+
 	if requestInput.ServerNameOverwrite != nil && *requestInput.ServerNameOverwrite != "" {
 		options = append(options, tls_client.WithServerNameOverwrite(*requestInput.ServerNameOverwrite))
 	}

cffi_src/types.go

@@ -58,6 +58,7 @@ type RequestInput struct {
 	HeaderOrder                 []string            `json:"headerOrder"`
 	Headers                     map[string]string   `json:"headers"`
 	DefaultHeaders              map[string][]string `json:"defaultHeaders"`
+	ConnectHeaders              map[string][]string `json:"connectHeaders"`
 	InsecureSkipVerify          bool                `json:"insecureSkipVerify"`
 	IsByteRequest               bool                `json:"isByteRequest"`
 	IsByteResponse              bool                `json:"isByteResponse"`

client.go

@@ -73,6 +73,7 @@ func NewHttpClient(logger Logger, options ...HttpClientOption) (HttpClient, erro
 		badPinHandler:      nil,
 		customRedirectFunc: nil,
 		defaultHeaders:     make(http.Header),
+		connectHeaders:     make(http.Header),
 		clientProfile:      profiles.DefaultClientProfile,
 		timeout:            time.Duration(DefaultTimeoutSeconds) * time.Second,
 	}
@@ -122,7 +123,7 @@ func buildFromConfig(logger Logger, config *httpClientConfig) (*http.Client, ban
 	dialer = newDirectDialer(config.timeout, config.localAddr, config.dialer)
 
 	if config.proxyUrl != "" {
-		proxyDialer, err := newConnectDialer(config.proxyUrl, config.timeout, config.localAddr, config.dialer, logger)
+		proxyDialer, err := newConnectDialer(config.proxyUrl, config.timeout, config.localAddr, config.dialer, config.connectHeaders, logger)
 		if err != nil {
 			return nil, nil, profiles.ClientProfile{}, err
 		}
@@ -233,7 +234,7 @@ func (c *httpClient) applyProxy() error {
 
 	if c.config.proxyUrl != "" {
 		c.logger.Debug("proxy url %s supplied - using proxy connect dialer", c.config.proxyUrl)
-		proxyDialer, err := newConnectDialer(c.config.proxyUrl, c.config.timeout, c.config.localAddr, c.config.dialer, c.logger)
+		proxyDialer, err := newConnectDialer(c.config.proxyUrl, c.config.timeout, c.config.localAddr, c.config.dialer, c.config.connectHeaders, c.logger)
 		if err != nil {
 			c.logger.Error("failed to create proxy connect dialer: %s", err.Error())
 			return err

client_options.go

@@ -44,6 +44,7 @@ type httpClientConfig struct {
 	insecureSkipVerify          bool
 	certificatePins             map[string][]string
 	defaultHeaders              http.Header
+	connectHeaders              http.Header
 	badPinHandler               BadPinHandlerFunc
 	proxyUrl                    string
 	serverNameOverwrite         string
@@ -258,3 +259,10 @@ func WithBandwidthTracker() HttpClientOption {
 		config.enabledBandwidthTracker = true
 	}
 }
+
+// WithConnectHeaders configures a client to use the specified headers for the CONNECT request.
+func WithConnectHeaders(headers http.Header) HttpClientOption {
+	return func(config *httpClientConfig) {
+		config.connectHeaders = headers
+	}
+}

connect.go

@@ -94,7 +94,7 @@ type connectDialer struct {
 // newConnectDialer creates a dialer to issue CONNECT requests and tunnel traffic via HTTP/S proxy.
 // proxyUrlStr must provide Scheme and Host, may provide credentials and port.
 // Example: https://username:[email protected]:443
-func newConnectDialer(proxyUrlStr string, timeout time.Duration, localAddr *net.TCPAddr, configDialer net.Dialer, logger Logger) (proxy.ContextDialer, error) {
+func newConnectDialer(proxyUrlStr string, timeout time.Duration, localAddr *net.TCPAddr, configDialer net.Dialer, connectHeaders http.Header, logger Logger) (proxy.ContextDialer, error) {
 	proxyUrl, err := url.Parse(proxyUrlStr)
 	if err != nil {
 		return nil, err
@@ -132,7 +132,7 @@ func newConnectDialer(proxyUrlStr string, timeout time.Duration, localAddr *net.
 		ProxyUrl:          *proxyUrl,
 		Dialer:            _dialer,
 		Timeout:           timeout,
-		DefaultHeader:     make(http.Header),
+		DefaultHeader:     connectHeaders,
 		EnableH2ConnReuse: true,
 	}
 

tests/header_order_test.go

@@ -2,10 +2,11 @@ package tests
 
 import (
 	"encoding/json"
-	"github.com/bogdanfinn/tls-client/profiles"
 	"io"
 	"testing"
 
+	"github.com/bogdanfinn/tls-client/profiles"
+
 	http "github.com/bogdanfinn/fhttp"
 	tls_client "github.com/bogdanfinn/tls-client"
 	"github.com/stretchr/testify/assert"