fix(op): guard against nil claims for opaque access tokens in token exchange - #959
Merged
wim07101993 merged 3 commits intoAug 27, 2026
Merged
Conversation
…xchange Exchanging an opaque access token (an encrypted tokenID:subject string) panicked, because getTokenIDAndClaims returns nil claims with ok true and the caller dereferenced them unconditionally. Skip the dereference when there are no claims and add a test covering that path.
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a panic in the token-exchange flow when the exchanged access token is opaque (encrypted tokenID:subject) rather than a JWT, by guarding against nil access-token claims and adding a regression test for that path.
Changes:
- Add a nil-check in
GetTokenIDAndSubjectFromTokento avoid dereferencingaccessTokenClaimswhen opaque tokens return(nil, ok=true). - Add a unit test covering opaque access tokens to ensure the function does not panic and correctly returns token ID + subject.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
pkg/op/token_exchange.go |
Adds a nil guard so opaque access tokens don’t cause a panic when claims are absent. |
pkg/op/token_exchange_test.go |
Adds a regression test for the opaque access-token code path. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Co-authored-by: Copilot Autofix powered by AI <[email protected]>
wim07101993
approved these changes
Aug 27, 2026
Member
|
Thank you for the contribution. Will merge. |
|
🎉 This PR is included in version 3.49.3 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
Fixes #704.
Doing a token exchange with an opaque access token panics. When the token is an encrypted tokenID:subject string rather than a JWT, getTokenIDAndClaims returns nil claims with ok true, and GetTokenIDAndSubjectFromToken then dereferences that nil pointer on accessTokenClaims.Claims.
I added a nil guard so opaque tokens come back with empty claims (there are no JWT claims to read in that case), and a test for the opaque path since, as the issue mentions, it wasn't covered before.