[stable30] fix(user_ldap): Avoid extra LDAP request when mapping a user for the first time #50778
+189
−46
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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
…first time Avoids using several LDAP searches to get UUID, display name and internal name, now gets all attributes at the same time. Also avoids extra request to build an unused user object in userExists. Signed-off-by: Côme Chilliet <[email protected]>
…n mapping new user Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: Côme Chilliet <[email protected]>
Avoid surprises by making sure these are lowercased apart from documented special case user displayname. Signed-off-by: Côme Chilliet <[email protected]>
…anager Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: Côme Chilliet <[email protected]> [skip ci]
| } else { | ||
| $mapper = $this->getGroupMapper(); | ||
| $nameAttribute = $this->connection->ldapGroupDisplayName; | ||
| $filter = $this->connection->ldapGroupFilter; | ||
| } | ||
|
|
||
| //let's try to retrieve the Nextcloud name from the mappings table |
There was a problem hiding this comment.
A few lines below...
if (!$autoMapping) {
/* If no auto mapping, stop there */
return false;
}Did not exist in the stable31 version instead a long code block was added:
https://github.com/nextcloud/server/pull/46114/files#diff-90df871fbdee47e27be0de35ab5a48b6577b267c7f4b9d9d3dddb3b8cef6e80dR504
There was a problem hiding this comment.
The rest seems to be the same.
artonge
approved these changes
Feb 12, 2025
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.
Backport of #46114
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.