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.
Purpose
Not all services that support OIDC return all claims within the ID token, some services return claims from the
UserInfo
endpoint. This PR changes the behavior of Teleport to obtain claims from both endpoints and merge them.Implementation
In
ValidateOIDCAuthCallback
, extract claims from both the ID token as well as theUserInfo
endpoint (which is itself obtained from theProviderConfig
) and then merge the two sets of claims and return the merged set.