Add preferred_username support (OIDC provider) #420
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
ffdybuster
requested review from
JoelSpeed,
steakunderscore and
loshz
as code owners
JoelSpeed
reviewed
Feb 29, 2020
| @@ -350,6 +351,10 @@ func (p *OAuthProxy) redeemCode(host, code string) (s *sessionsapi.SessionState, | |||
| s.Email, err = p.provider.GetEmailAddress(s) | |||
| } | |||
|
|
|||
| if s.PreferredUsername == "" { | |||
| s.PreferredUsername, err = p.provider.GetPreferredUsername(s) | |||
There was a problem hiding this comment.
This error is currently unchecked, and, for most providers, will always error, can we add a check on this error similar to the one below for s.User
There was a problem hiding this comment.
Sure! I've added it in ae34f54.
ffdybuster
force-pushed
the
add-preferred-username
branch
from
ae34f54
to
9545890
Compare
|
(Rebased to resolve conflicts.) |
|
@JoelSpeed thanks a lot for reviewing and merging! :) |
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.
Description
This PR adds a new claim,
preferred_username. I added code for the OIDC provider to support it and tested it with dex (dexidp/dex#1566).Motivation and Context
Since #282 doesn't look like it will get done anytime soon, and since I really need
preferred_username, I created this PR to add this specific claim. I don't really know the other connectors next to OIDC (and can't test them), so I only added support in there. I don't think the PR will break any of the other providers (the claim is returned empty for them and thus the headers will not be added).How Has This Been Tested?
I've build the docker container and ran it in our system for almost a day without problems. Our system uses dex via OIDC provider, and is used from Nginx via
auth_request.Checklist: