Skip to content

oauthex: build defaultDiscoveryTransport lazily instead of at import #1278

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
guglielmo-san merged 2 commits into from
Sep 18, 2026
+11 −2
Merged

oauthex: build defaultDiscoveryTransport lazily instead of at import #1278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76675f5
oauthex: build defaultDiscoveryTransport lazily instead of at import
kilarusravankumar Sep 17, 2026
a13d1c5
Merge branch 'main' into fix/1276-oauthex-proxy-init-cache
guglielmo-san Sep 18, 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
Diff view
13 changes: 11 additions & 2 deletions oauthex/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"net/netip"
"net/url"
"strings"
"sync"
"syscall"
"time"

Expand All @@ -25,7 +26,15 @@ import (

const maxDiscoveryRedirects = 10

var defaultDiscoveryTransport = newDiscoveryTransport(http.DefaultTransport)
// Build this on first use, not when the package loads. Building it checks the
// proxy via http.ProxyFromEnvironment, and net/http only reads the proxy
// environment once and then remembers it for the whole run. If that happened
// at import time, it would lock in the proxy setting before the app had a
// chance to set HTTPS_PROXY. sync.OnceValue waits until first use and still
// builds the transport just once. See #1276.
var defaultDiscoveryTransport = sync.OnceValue(func() http.RoundTripper {
return newDiscoveryTransport(http.DefaultTransport)
})

type httpStatusError struct {
StatusCode int
Expand Down Expand Up @@ -103,7 +112,7 @@ func checkHTTPSOrLoopback(addr string) error {
}

func newDiscoveryClient(c *http.Client) *http.Client {
transport := defaultDiscoveryTransport
transport := defaultDiscoveryTransport()
if c != nil && c.Transport != nil {
// a caller that has taken over dialing or TLS opts out of the checks
if t, ok := c.Transport.(*http.Transport); ok && t.DialContext == nil && t.DialTLSContext == nil {
Expand Down
Loading