Retry OAuth token refresh on infrastructure 4xx#5170
Open
gkatz2 wants to merge 1 commit intostacklok:mainfrom
Open
Retry OAuth token refresh on infrastructure 4xx#5170gkatz2 wants to merge 1 commit intostacklok:mainfrom
gkatz2 wants to merge 1 commit intostacklok:mainfrom
Conversation
The OAuth token refresh endpoint returns 4xx for infrastructure events (WAF/firewall blocks, rate limits, transient bad-config deploys) as well as for OAuth protocol failures. Today every 4xx is treated as a permanent auth failure, killing the workload until manual re-authentication. A momentary VPN flap that routes a refresh request through a non-allowlisted IP is enough to leave the workload dead. Treat 4xx responses that lack a structured RFC 6749 error code as transient; only 4xx with a populated error code (invalid_grant, invalid_client, etc.) remains permanent. 429 is always transient per HTTP standard. Fixes stacklok#5169 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Greg Katz <gkatz@indeed.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5170 +/- ##
==========================================
- Coverage 67.53% 67.53% -0.01%
==========================================
Files 601 601
Lines 61093 61109 +16
==========================================
+ Hits 41262 41267 +5
- Misses 16714 16725 +11
Partials 3117 3117 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
invalid_grant,invalid_client, etc.) remains permanent. 429 is always transient per HTTP standard.Fixes #5169
Type of change
Test plan
task test)task lint-fix)Added
TestIsTransientNetworkError_AgainstRealOAuth2Library, which exercises the classification function end-to-end throughgolang.org/x/oauth2.Config.TokenSourceagainst anhttptest.Serverreturning each response shape (HTML 403, HTML 401, JSONinvalid_grant, JSONinvalid_client, 429, 503). This pins the assumption thatRetrieveError.ErrorCodeis populated only for parseable RFC 6749 error responses, so a future oauth2 upgrade that changes that behavior would surface here, not in production.API Compatibility
v1beta1API, OR theapi-break-allowedlabel is applied and the migration guidance is described above.Does this introduce a user-facing change?
Remote MCP servers with OAuth authentication now survive transient 4xx token-endpoint events (WAF blocks, rate limits, brief upstream config errors) instead of permanently going dark on the first occurrence.
Special notes for reviewers
Classification rule
golang.org/x/oauth2populatesRetrieveError.ErrorCodeonly when the response body is parseable JSON containing an RFC 6749errorfield. An emptyErrorCodetherefore signals an infrastructure-level response (HTML page from a WAF, CDN, or reverse proxy), not an OAuth protocol failure. The newclassifyOAuthRetrieveErrorhelper applies this rule:ErrorCode: transient (infrastructure error)ErrorCode: permanent (OAuth protocol failure)Scope
Classification only — no changes to retry parameters, monitor lifecycle, or workload state machine. Outages that span longer than a single refresh attempt (e.g. a multi-hour VPN outage that crosses a token expiry boundary) still result in the workload being marked unauthenticated; that's a separable architectural change requiring a new "transiently failing" state and is not part of this fix.
Interaction with #5044
PR #5044 (in flight) emits a DCR remediation hint when classification returns permanent 4xx. This change reduces false triggers of that hint: the hint will fire for
invalid_grant/invalid_client(where DCR creds genuinely may be stale) but no longer for WAF blocks (where the hint would have been misleading). Pure mechanical merge conflict on the same file, no semantic conflict.Generated with Claude Code