LDAP: Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync #83715
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
added
type/bug
backport v10.3.x
|
This PR must be merged before a backport PR will be created. |
2 similar comments
|
This PR must be merged before a backport PR will be created. |
|
This PR must be merged before a backport PR will be created. |
Jguer
changed the title
kalleep
reviewed
Feb 29, 2024
pkg/services/authn/clients/proxy.go
Outdated
Comment on lines
107
to
114
| // Get the authentication information for the user | ||
| authedBy, err := c.authInfoService.GetAuthInfo(ctx, &login.GetAuthInfoQuery{UserId: usr.UserID}) | ||
| if err != nil || authedBy == nil { | ||
| c.log.FromContext(ctx).Warn("Cached user had no valid auth info", "error", err, "userId", string(entry)) | ||
| } else { | ||
| c.log.FromContext(ctx).Debug("User was loaded from cache, skip syncs", "userId", usr.UserID) | ||
| return authn.IdentityFromSignedInUser(authn.NamespacedID(authn.NamespaceUser, usr.UserID), usr, authn.ClientParams{SyncPermissions: true}, authedBy.AuthModule), nil | ||
| } |
There was a problem hiding this comment.
Do we really need this part. We are not doing any syncing.
If we want to always display the correct authenticated by, even when using session, maybe this should be part of user fetch hook instead. Otherwise only auth proxy would always display this info correctly
Then we should probably use that hook to fetch all user info instead of doing it manually here?
There was a problem hiding this comment.
👍 let me see how that looks like
kalleep
reviewed
Feb 29, 2024
Jguer
requested review from
zserge,
mildwonkey and
idafurjes
and removed request for
a team
kalleep
approved these changes
Mar 1, 2024
3 tasks
3 tasks
Jguer
added a commit
that referenced
this pull request
Mar 1, 2024
… able to use LDAP active sync (#83751) LDAP: Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync (#83715) * fix LDAP users authenticated via auth proxy not being able to use ldap sync * simplify id resolution at the cost of no fallthrough * remove unused services * remove unused cache key (cherry picked from commit 2182cc4) Co-authored-by: Jo <joao.guerreiro@grafana.com>
Jguer
added a commit
that referenced
this pull request
Mar 1, 2024
… able to use LDAP active sync (#83750) LDAP: Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync (#83715) * fix LDAP users authenticated via auth proxy not being able to use ldap sync * simplify id resolution at the cost of no fallthrough * remove unused services * remove unused cache key (cherry picked from commit 2182cc4) Co-authored-by: Jo <joao.guerreiro@grafana.com>
This was referenced Mar 27, 2024
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?
Users authenticated with auth proxy via the LDAP client were being stored as auth_proxy (grafana db) users instead of ldap users.
The changes to the auth client should gradually fix this users to have an LDAP entry instead.
(Possible research avenue into changing behavior of search to ignore the latest login method used)
grafana/pkg/services/user/userimpl/store.go
Line 632 in 9c9e5e6
Why do we need this feature?
[Add a description of the problem the feature is trying to solve.]
Who is this feature for?
[Add information on what kind of user the feature is for.]
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: