aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2024-07-09 09:27:10 +0200
committerCôme Chilliet <come.chilliet@nextcloud.com>2024-08-27 10:06:43 +0200
commitd2bc636a79a0bb0fd1939255fe69f440df171da8 (patch)
tree59f58b374b02fe2323c552fa96a9449cf094aa41
parent4fb1d2f3e5efd1272fa41700a489c80b1a367997 (diff)
downloadnextcloud-server-d2bc636a79a0bb0fd1939255fe69f440df171da8.tar.gz
nextcloud-server-d2bc636a79a0bb0fd1939255fe69f440df171da8.zip
fix(user_ldap): Correctly cache that user exists to avoid a request on mapping new user
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--apps/user_ldap/lib/Access.php1
-rw-r--r--apps/user_ldap/lib/User/Manager.php2
-rw-r--r--apps/user_ldap/lib/User_LDAP.php2
3 files changed, 1 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index da09fa0ff07..fbce4092295 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -734,6 +734,7 @@ class Access extends LDAPUtility {
*/
public function cacheUserExists(string $ocName): void {
$this->connection->writeToCache('userExists' . $ocName, true);
+ $this->connection->writeToCache('userExistsOnLDAP' . $ocName, true);
}
/**
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
index a671570be04..227990401c2 100644
--- a/apps/user_ldap/lib/User/Manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -265,9 +265,7 @@ class Manager {
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;
}
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 1f001a33db1..b1065fcf7a7 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -463,7 +463,6 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
$this->access->connection->writeToCache($cacheKey, $displayName);
}
if ($user instanceof OfflineUser) {
- /** @var OfflineUser $user */
$displayName = $user->getDisplayName();
}
return $displayName;
@@ -610,7 +609,6 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
$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',