Skip to content

fix(user_ldap): Avoid extra LDAP request when mapping a user for the first time #46114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 6 commits into from
Sep 3, 2024
Merged

fix(user_ldap): Avoid extra LDAP request when mapping a user for the first time #46114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fb1d2f
fix(user_ldap): Avoid extra LDAP request when mapping a user for the …
come-nc Jun 25, 2024
d2bc636
fix(user_ldap): Correctly cache that user exists to avoid a request o…
come-nc Jul 9, 2024
fffba1c
fix(ldap): Fix user_ldap attribute casing to fix tests
come-nc Jul 29, 2024
eb27243
fix(user_ldap): Lowercase value for all attributes in configuration
come-nc Aug 27, 2024
c3029c7
fix(user_ldap): Fix user_ldap tests by mocking new method exists in m…
come-nc Aug 27, 2024
36479df
chore: composer run cs:fix
come-nc Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(user_ldap): Correctly cache that user exists to avoid a request o… 
…n mapping new user

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Aug 27, 2024
commit d2bc636a79a0bb0fd1939255fe69f440df171da8
1 change: 1 addition & 0 deletions apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,7 @@ public function cacheUserHome(string $ocName, $home): void {
*/
public function cacheUserExists(string $ocName): void {
$this->connection->writeToCache('userExists' . $ocName, true);
$this->connection->writeToCache('userExistsOnLDAP' . $ocName, true);
}

/**
Expand Down
2 changes: 0 additions & 2 deletions apps/user_ldap/lib/User/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,7 @@ public function exists($id): bool {
if ($this->isDeletedUser($id)) {
return true;
}
$this->logger->debug('username2dn({id})', ['id' => $id]);
$dn = $this->access->username2dn($id);
$this->logger->debug('end username2dn({id})', ['id' => $id]);
if ($dn !== false) {
return true;
}
Expand Down
2 changes: 0 additions & 2 deletions apps/user_ldap/lib/User_LDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ public function getDisplayName($uid) {
$this->access->connection->writeToCache($cacheKey, $displayName);
}
if ($user instanceof OfflineUser) {
/** @var OfflineUser $user */
$displayName = $user->getDisplayName();
}
return $displayName;
Expand Down Expand Up @@ -610,7 +609,6 @@ public function createUser($username, $password) {
$uuid,
true
);
$this->access->cacheUserExists($username);
} else {
$this->logger->warning(
'Failed to map created LDAP user with userid {userid}, because UUID could not be determined',
Expand Down