Skip to content

config: check cross-host redirect before OAuth2 token fetch #921

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
roidelapluie merged 1 commit into from
Jun 11, 2026
+12 −3
Merged

config: check cross-host redirect before OAuth2 token fetch #921

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
15 changes: 12 additions & 3 deletions config/http_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,18 @@ func (rt *oauth2RoundTripper) newOauth2TokenSource(req *http.Request, clientCred
}

func (rt *oauth2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
if isCrossHostRedirect(req) {
// Bypass the OAuth2 transport so no token is attached. Read Base under
// the lock to avoid a data race with concurrent reconfigurations.
rt.mtx.RLock()
base := rt.lastRT.Base
rt.mtx.RUnlock()
if base == nil {
base = http.DefaultTransport
}
return base.RoundTrip(req)
}

var (
secret string
needsInit bool
Expand Down Expand Up @@ -1110,9 +1122,6 @@ func (rt *oauth2RoundTripper) RoundTrip(req *http.Request) (*http.Response, erro
rt.mtx.RLock()
currentRT := rt.lastRT
rt.mtx.RUnlock()
if isCrossHostRedirect(req) {
return currentRT.Base.RoundTrip(req)
}
return currentRT.RoundTrip(req)
}

Expand Down
Loading