oidc: fix bug when matching GitLab environment claims #18338
Merged
Conversation
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
Signed-off-by: Facundo Tuesca <[email protected]>
facutuesca
force-pushed
the
ft/fix-gitlab-oidc-bug
branch
from
c09fdea to
475e2fa
Compare
This was referenced Jul 2, 2025
miketheman
approved these changes
Jul 2, 2025
|
Thanks for the speedy fix, @facutuesca ! |
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.
Bug reported here: #18330
The OIDC publisher lookup refactor in #18169 introduced a bug where we normalize the incoming environment claim (making it lowercase) when doing the DB lookup for matching GitLab publishers.
This means that the lookup would incorrectly fail when the environment was capitalized (e.g:
SomeEnvironment), since it would be lowercased before searching the DB (which contained the correct capitalized version).Inversely, a lookup would incorrectly succeed when the incoming environment claim was capitalized but the environment configured in the Publisher was not. These are different environments (since GitLab's environments are case-sensitive), but by lowercasing the incoming claim, we would match against the publisher with a different (lowercase) claim.
Luckily this second scenario does not result in successful authentication, since this buggy lookup logic is separate from the "claim checking" logic, which happens after a publisher is found, and does not contain the bug.
This PR removes the incorrect
.lower()call, and adds tests for the two scenarios mentioned aboveThis fixes #18330
cc @di @miketheman