feat(rest): implement OAuth2 token auto-refresh for REST catalog#646
Open
lishuxu wants to merge 5 commits into
Open
feat(rest): implement OAuth2 token auto-refresh for REST catalog#646lishuxu wants to merge 5 commits into
lishuxu wants to merge 5 commits into
Conversation
added 2 commits
May 9, 2026 09:46
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that
automatically refreshes tokens before expiration using the
client_credentials grant.
Key components:
- OAuth2AuthSession: manages token lifecycle with shared_mutex for
concurrent read access and background refresh via scheduler
- TokenRefreshScheduler: process-global singleton with a single worker
thread that fires delayed refresh callbacks
- ExpiresAtMillis: JWT exp claim parser for determining token expiry
when expires_in is not provided in the token response
- Base64Decode/Base64UrlDecode added to TransformUtil as public utilities
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that automatically refreshes tokens before expiration using the client_credentials grant. Key components: - OAuth2AuthSession: manages token lifecycle with shared_mutex for concurrent read access and background refresh via scheduler - TokenRefreshScheduler: process-global singleton with a single worker thread that fires delayed refresh callbacks - ExpiresAtMillis: JWT exp claim parser for determining token expiry when expires_in is not provided in the token response - Base64Decode/Base64UrlDecode added to TransformUtil as public utilities
zhjwpku
reviewed
May 9, 2026
zhjwpku
reviewed
May 9, 2026
zhjwpku
reviewed
May 9, 2026
added 3 commits
May 11, 2026 18:05
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that automatically refreshes tokens before expiration using the client_credentials grant.
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that automatically refreshes tokens before expiration using the client_credentials grant.
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that automatically refreshes tokens before expiration using the client_credentials grant.
wgtmac
reviewed
May 15, 2026
| Status Authenticate(std::unordered_map<std::string, std::string>& headers) override { | ||
| std::shared_lock lock(mutex_); | ||
| for (const auto& [key, value] : headers_) { | ||
| headers.insert_or_assign(key, value); |
Member
There was a problem hiding this comment.
Use try_emplace here so a request-specific Authorization header can win, matching DefaultAuthSession and Java’s putIfAbsent behavior.
wgtmac
reviewed
May 15, 2026
| // avoids circular dependency of using an expired token to refresh itself) | ||
| auto empty_session = AuthSession::MakeDefault({}); | ||
|
|
||
| AuthProperties props; |
Member
There was a problem hiding this comment.
Carry audience and resource through to refresh requests too. Some OAuth servers require the same optional params on every token request.
wgtmac
reviewed
May 15, 2026
| {std::string(kAuthorizationHeader), std::string(kBearerPrefix) + token_}}; | ||
|
|
||
| // Update expiration | ||
| if (response.expires_in_secs.has_value()) { |
Member
There was a problem hiding this comment.
Reset expires_at_ before deriving the new expiry, and skip scheduling when the refreshed token has neither expires_in nor JWT exp.
wgtmac
reviewed
May 15, 2026
| .client_id = client_id, | ||
| .client_secret = client_secret, | ||
| .scope = scope, | ||
| .keep_refreshed = true, |
Member
There was a problem hiding this comment.
Pass the parsed token-refresh-enabled value into this config instead of forcing refresh on. Users who disable refresh should not get background token requests.
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
3 participants
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.
Replace the MakeOAuth2 stub with a full OAuth2AuthSession that automatically refreshes tokens before expiration using the client_credentials grant.