Skip to content

Bound kernel login token exchange with a timeout #202

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
masnwilliams wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −1
Open

Bound kernel login token exchange with a timeout #202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36425b
Bound kernel login token exchange with a timeout
masnwilliams Jul 13, 2026
75a1057
Merge branch 'main' into hypeship/login-token-timeout
masnwilliams Jul 13, 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
9 changes: 8 additions & 1 deletion pkg/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ const (

// OAuth scopes - openid for the MCP server flow
DefaultScope = "openid email"

// tokenExchangeTimeout bounds the token/refresh HTTP calls so a stalled auth
// server surfaces as an error instead of hanging the CLI indefinitely.
tokenExchangeTimeout = 30 * time.Second
)

// OAuthConfig represents the OAuth2 configuration
Expand Down Expand Up @@ -311,6 +315,9 @@ func (oc *OAuthConfig) exchangeCodeForTokens(ctx context.Context, code, orgID st
opts = append(opts, oauth2.SetAuthURLParam("org_id", orgID))
}

ctx, cancel := context.WithTimeout(ctx, tokenExchangeTimeout)
defer cancel()

token, err := oc.Config.Exchange(ctx, code, opts...)
if err != nil {
return nil, fmt.Errorf("failed to exchange code for token: %w", err)
Expand Down Expand Up @@ -349,7 +356,7 @@ func RefreshTokens(ctx context.Context, tokens *TokenStorage) (*TokenStorage, er

req.Header.Set("Content-Type", "application/x-www-form-urlencoded")

client := &http.Client{}
client := &http.Client{Timeout: tokenExchangeTimeout}
resp, err := client.Do(req)
if err != nil {
return nil, fmt.Errorf("failed to send refresh request: %w", err)
Expand Down
Loading