Fix JWT OIDC decode yet again #3466
Merged
Conversation
This file contains 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
PBENCH-1182 JWT added yet another `DecodeError` in our API Key validation path in some recent update. Instead of continuing to add specific errors to be converted into a specific internal exception, just handle all exceptions in the primary OIDC decode by attempting the token as an API key. If that fails, report the API key validation error, and re-raise the original OIDC error. (Note that `verify_auth` will in turn just report this error and act as if no authentication token was given.)
dbutenhof
added
Server
API
webbnh
approved these changes
Jun 16, 2023
dbutenhof
commented
Jun 16, 2023
There was a problem hiding this comment.
(I'm sad to see the API Key validation call back inside the except block for the OIDC access token validation, but I concede that it's expedient.)
I know; and I considered storing the exception in a local and retaining more or less the old structure; but I decided that wasn't worth it. (And would have been less clear when scanning the code anyway.)
Thank you for that. I figured that you'd reached that conclusion, and I don't disagree with it. |
riya-17
approved these changes
Jun 16, 2023
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.
PBENCH-1182
JWT added yet another
DecodeErrorin our API Key validation path in some recent update. Instead of continuing to add specific errors to be converted into a specific internal exception, just handle all exceptions in the primary OIDC decode by attempting the token as an API key. If that fails, report the API key validation error, and re-raise the original OIDC error.(Note that
verify_authwill in turn just report this error and act as if no authentication token was given.)