Skip to content

refactor(x): replace toStdConfig with tls.ToGoTLSConfig in httpconnect #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikolaikabanenkov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(x): replace toStdConfig with tls.ToGoTLSConfig in httpconnect #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions x/httpconnect/connect_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
// ConnectClient is a [transport.StreamDialer] that establishes an HTTP CONNECT tunnel over an abstract HTTP transport.
//
// The package also includes transport builders:
// - NewHTTPProxyTransport
// - NewHTTP3ProxyTransport
// [NewHTTPProxyTransport],
// [NewHTTP3ProxyTransport].
//
// Options:
// - WithHeaders appends the provided headers to every CONNECT request.
// [WithHeaders] appends the provided headers to every CONNECT request.
type ConnectClient struct {
proxyRT ProxyRoundTripper
headers http.Header
Expand Down
36 changes: 9 additions & 27 deletions x/httpconnect/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"net"
"net/http"

"golang.getoutline.org/sdk/transport"
"golang.getoutline.org/sdk/transport/tls"
"github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3"
"golang.getoutline.org/sdk/transport"
"golang.getoutline.org/sdk/transport/tls"
"golang.org/x/net/http2"
)

Expand All @@ -51,7 +51,7 @@ func WithPlainHTTP() TransportOption {
// The proxy address must be in the form "host:port".
//
// For HTTP/1 (plain and over TLS) and HTTP/2 (over TLS) over a stream connection.
// When using TLS, pass WithTLSOptions(tls.WithALPN()) to enable or enforce HTTP/2.
// When using TLS, pass [WithTLSOptions] with [tls.WithALPN] to enable or enforce HTTP/2.
func NewHTTPProxyTransport(dialer transport.StreamDialer, proxyAddr string, opts ...TransportOption) (ProxyRoundTripper, error) {
if dialer == nil {
return nil, errors.New("dialer must not be nil")
Expand All @@ -64,9 +64,9 @@ func NewHTTPProxyTransport(dialer transport.StreamDialer, proxyAddr string, opts
cfg := &transportConfig{}
cfg.applyOptions(opts...)

tlsCfg := tls.ClientConfig{ServerName: host}
tlsCfg := &tls.ClientConfig{ServerName: host}
for _, opt := range cfg.tlsOptions {
opt(host, &tlsCfg)
opt(host, tlsCfg)
}

tr := &http.Transport{
Expand All @@ -80,7 +80,7 @@ func NewHTTPProxyTransport(dialer transport.StreamDialer, proxyAddr string, opts
}

// TLS config must be applied AFTER http2.ConfigureTransport, as it appends h2 to the list of supported protocols.
tr.TLSClientConfig = toStdConfig(tlsCfg)
tr.TLSClientConfig = tls.ToGoTLSConfig(tlsCfg)

sch := schemeHTTPS
if cfg.plainHTTP {
Expand Down Expand Up @@ -110,9 +110,9 @@ func NewHTTP3ProxyTransport(conn net.PacketConn, proxyAddr string, opts ...Trans
cfg := &transportConfig{}
cfg.applyOptions(opts...)

tlsConfig := tls.ClientConfig{ServerName: host}
tlsConfig := &tls.ClientConfig{ServerName: host}
for _, opt := range cfg.tlsOptions {
opt(host, &tlsConfig)
opt(host, tlsConfig)
}

tr := &http3.Transport{
Expand All @@ -124,7 +124,7 @@ func NewHTTP3ProxyTransport(conn net.PacketConn, proxyAddr string, opts ...Trans

return quic.DialEarly(ctx, conn, parsedProxyAddr, tlsCfg, quicCfg)
},
TLSClientConfig: toStdConfig(tlsConfig),
TLSClientConfig: tls.ToGoTLSConfig(tlsConfig),
}

return proxyRT{
Expand Down Expand Up @@ -159,21 +159,3 @@ type proxyRT struct {
func (rt proxyRT) Scheme() string {
return string(rt.scheme)
}

// TODO: Replace with tls.ToGoTLSConfig call once outline-sdk dependency version for this module is bumped.
// It is basically a copy of the implementation ToGoTLSConfig
func toStdConfig(cfg tls.ClientConfig) *stdTLS.Config {
return &stdTLS.Config{
ServerName: cfg.ServerName,
NextProtos: cfg.NextProtos,
ClientSessionCache: cfg.SessionCache,
// Set InsecureSkipVerify to skip the default validation we are
// replacing. This will not disable VerifyConnection.
InsecureSkipVerify: true,
VerifyConnection: func(cs stdTLS.ConnectionState) error {
return cfg.CertVerifier.VerifyCertificate(&tls.CertVerificationContext{
PeerCertificates: cs.PeerCertificates,
})
},
}
}