Prevent using DefaultTransport

wakatime · May 22, 2021 · e704f09 · e704f09
1 parent 4ce0b50
commit e704f09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 131 deletions.
diff --git a/draft/usage.md b/draft/usage.md
diff --git a/pkg/api/option.go b/pkg/api/option.go
@@ -49,12 +49,7 @@ func WithHostname(hostname string) Option {
 // WithDisableSSLVerify disables verification of insecure certificates.
 func WithDisableSSLVerify() Option {
  return func(c *Client) {
- var transport *http.Transport
- if c.client.Transport == nil {
- transport = http.DefaultTransport.(*http.Transport).Clone()
- } else {
- transport = c.client.Transport.(*http.Transport).Clone()
- }
+ var transport *http.Transport = GetOrCreateTransport(c)
 
  tlsConfig := transport.TLSClientConfig
  tlsConfig.InsecureSkipVerify = true
@@ -88,13 +83,7 @@ func WithNTLM(creds string) (Option, error) {
  return func(c *Client) {
  withAuth(c)
 
- var transport http.RoundTripper
- if c.client.Transport == nil {
- transport = http.DefaultTransport
- } else {
- transport = c.client.Transport.(*http.Transport).Clone()
- }
-
+ var transport *http.Transport = GetOrCreateTransport(c)
  c.client.Transport = ntlmssp.Negotiator{
  RoundTripper: transport,
  }
@@ -134,13 +123,8 @@ func WithProxy(proxyURL string) (Option, error) {
  }
 
  return func(c *Client) {
- transport := http.DefaultTransport.(*http.Transport).Clone()
- if c.client.Transport != nil {
- transport = c.client.Transport.(*http.Transport).Clone()
- }
-
+ var transport *http.Transport = GetOrCreateTransport(c)
  transport.Proxy = http.ProxyURL(u)
-
  c.client.Transport = transport
  }, nil
 }
@@ -166,13 +150,7 @@ func WithSSLCertFile(filepath string) (Option, error) {
 // WithSSLCertPool overrides the default CA cert pool to trust specified cert pool.
 func WithSSLCertPool(caCertPool *x509.CertPool) (Option, error) {
  return func(c *Client) {
- var transport *http.Transport
- if c.client.Transport == nil {
- transport = http.DefaultTransport.(*http.Transport).Clone()
- } else {
- transport = c.client.Transport.(*http.Transport).Clone()
- }
-
+ var transport *http.Transport = GetOrCreateTransport(c)
  tlsConfig := transport.TLSClientConfig
  tlsConfig.RootCAs = caCertPool
  transport.TLSClientConfig = tlsConfig

diff --git a/pkg/api/transport.go b/pkg/api/transport.go
@@ -16,3 +16,11 @@ func NewTransport() *http.Transport {
  ForceAttemptHTTP2: true,
  }
 }
+
+// GetOrCreateTransport gets the client's Transport if already exists, or initializes a new one
+func GetOrCreateTransport(c *Client) *http.Transport {
+ if c.client.Transport != nil {
+ return c.client.Transport.(*http.Transport).Clone()
+ }
+ return NewTransport()
+}