8000 Preserve default transport settings for non-validating clients by xtrusia · Pull Request #108 · go-goose/goose · GitHub
[go: up one dir, main page]
Skip to content

Preserve default transport settings for non-validating clients #108

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

Merged
wallyworld merged 4 commits into from
Aug 19, 2026
+109 −9
Merged

Preserve default transport settings for non-validating clients #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dac362e
Preserve transport defaults for insecure clients
xtrusia Aug 9, 2026
8c2aa07
Match fallback transport defaults
xtrusia Aug 11, 2026
5c755e5
Simplify insecure client defaults
xtrusia Aug 18, 2026
210c433
Preserve transport defaults for all clients
xtrusia Aug 19, 2026
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
30 changes: 21 additions & 9 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,29 @@ func WithInsecureHTTPClient(client *http.Client) Option {
}
}

func newHTTPClient(skipVerify bool) *http.Client {
transport, ok := http.DefaultTransport.(*http.Transport)
if ok {
transport = transport.Clone()
} else if skipVerify {
transport = &http.Transport{}
} else {
return &http.Client{Transport: http.DefaultTransport}
}
Comment thread
xtrusia marked this conversation as resolved.
Resolved
if skipVerify {
if transport.TLSClientConfig == nil {
transport.TLSClientConfig = &tls.Config{}
}
transport.TLSClientConfig.InsecureSkipVerify = true
}
return &http.Client{Transport: transport}
}

func newOptions() *options {
return &options{
httpHeadersFunc: goosehttp.DefaultHeaders,
httpClient: &http.Client{},
insecureHTTPClient: &http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
},
httpHeadersFunc: goosehttp.DefaultHeaders,
httpClient: newHTTPClient(false),
insecureHTTPClient: newHTTPClient(true),
}
}

Expand Down
88 changes: 88 additions & 0 deletions client/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package client

import (
"crypto/tls"
"net/http"
"net/url"
"testing"
)

type fakeRoundTripper struct {
http.RoundTripper
}

func TestCustomDefaultTransport(t *testing.T) {
original := http.DefaultTransport
t.Cleanup(func() { http.DefaultTransport = original })
defaultTransport := &fakeRoundTripper{}
http.DefaultTransport = defaultTransport

options := newOptions()
if options.httpClient.Transport != defaultTransport {
t.Fatal("custom default transport was not preserved")
}
insecureTransport, ok := options.insecureHTTPClient.Transport.(*http.Transport)
if !ok || insecureTransport.TLSClientConfig == nil || !insecureTransport.TLSClientConfig.InsecureSkipVerify {
t.Fatalf("unexpected insecure transport: %#v", options.insecureHTTPClient.Transport)
}

NewPublicClient("https://example.invalid", nil)
NewNonValidatingPublicClient("https://example.invalid", nil)
NewNonValidatingPublicClient("https://example.invalid", nil, WithInsecureHTTPClient(&http.Client{}))
}

func TestNewHTTPClientsPreserveDefaultTransport(t *testing.T) {
original := http.DefaultTransport
t.Cleanup(func() { http.DefaultTransport = original })

proxyURL, err := url.Parse("http://proxy.example")
if err != nil {
t.Fatal(err)
}
defaultTransport := &http.Transport{
Proxy: http.ProxyURL(proxyURL),
MaxIdleConns: 42,
TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS12},
}
http.DefaultTransport = defaultTransport

request, err := http.NewRequest(http.MethodGet, "https://example.invalid", nil)
if err != nil {
t.Fatal(err)
}
options := newOptions()
for _, test := range []struct {
name string
client *http.Client
skipVerify bool
}{
{name: "validating", client: options.httpClient},
{name: "non-validating", client: options.insecureHTTPClient, skipVerify: true},
} {
t.Run(test.name, func(t *testing.T) {
transport, ok := test.client.Transport.(*http.Transport)
if !ok {
t.Fatalf("unexpected transport: %#v", test.client.Transport)
}
if transport == defaultTransport {
t.Fatal("default transport was not cloned")
}
if transport.Proxy == nil {
t.Fatal("default proxy setting was not preserved")
}
gotProxyURL, err := transport.Proxy(request)
if err != nil {
t.Fatal(err)
}
if gotProxyURL.String() != proxyURL.String() || transport.MaxIdleConns != 42 {
t.Fatalf("default transport settings were not preserved: %#v", transport)
}
if transport.TLSClientConfig.InsecureSkipVerify != test.skipVerify || transport.TLSClientConfig.MinVersion != tls.VersionTLS12 {
t.Fatalf("unexpected TLS configuration: %#v", transport.TLSClientConfig)
}
})
}
if defaultTransport.TLSClientConfig.InsecureSkipVerify {
t.Fatal("default transport was modified")
}
}
Loading
0