Auth: Support Gitlab OIDC scopes #69890
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
Jguer
requested review from
alexanderzobnin and
gamab
and removed request for
a team
pkg/login/social/generic_oauth.go
Outdated
| @@ -218,64 +214,16 @@ func (s *SocialGenericOAuth) extractFromToken(token *oauth2.Token) *UserInfoJson | |||
|
|
|||
| idToken := token.Extra(idTokenAttribute) | |||
| if idToken == nil { | |||
| s.log.Debug("No id_token found", "token", token) | |||
| s.log.Debug("No id_token found", "token", idToken) | |||
There was a problem hiding this comment.
Why do we need to log empty token?
There was a problem hiding this comment.
typo, thanks for pointing it out
Jguer
commented
Jun 12, 2023
| } | ||
| }() | ||
|
|
||
| rawJSON, err = io.ReadAll(fr) |
There was a problem hiding this comment.
Should we also validate the format of the uncompressed data ?
jmatosgrafana
approved these changes
Jun 13, 2023
IevaVasiljeva
approved these changes
Jun 13, 2023
| } | ||
|
|
||
| rawJSON, err := base64.RawURLEncoding.DecodeString(matched[2]) | ||
| rawJSON, err := s.retrieveRawIDToken(idToken) |
There was a problem hiding this comment.
Nice! It's much neater with ID token parsing logic tucked away.
Comment on lines
+217
to
+234
| payload: `{ | ||
| "iss": "https://gitlab.com", | ||
| "sub": "12345678", | ||
| "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583", | ||
| "exp": 1686124040, | ||
| "iat": 1686123920, | ||
| "auth_time": 1686119303, | ||
| "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70", | ||
| "name": "John Doe", | ||
| "nickname": "johndoe", | ||
| "preferred_username": "johndoe", | ||
| "email": "johndoe@example.com", | ||
| "email_verified": true, | ||
| "profile": "https://gitlab.com/johndoe", | ||
| "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png", | ||
| "groups_direct": [ | ||
| "admins" | ||
| ] |
There was a problem hiding this comment.
nit: could you only specify whether the email has or has not been verified for each test instead of specifying the full payload? Just to make them more readable.
Jguer
force-pushed
the
jguer/gitlab-oauth-openid
branch
from
3383bed
to
b8ca0e9
Compare
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.
What is this feature?
Why do we need this feature?
Reduces the amount of access Grafana requires to GitLab.
Who is this feature for?
Instances using GitLab OAuth
Please check that: