Skip to content

Modify user_ldap checkPassword to not fetch records from ldap each time because of extremely high CPU usage! #35867

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
skjnldsv merged 1 commit into from
Aug 16, 2024
Merged

Modify user_ldap checkPassword to not fetch records from ldap each time because of extremely high CPU usage! #35867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 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 @@ -76,11 +76,12 @@ public function canChangeAvatar($uid) {
* @return string|false
* @throws \Exception
*/
public function loginName2UserName($loginName) {
public function loginName2UserName($loginName, bool $forceLdapRefetch = false) {
$cacheKey = 'loginName2UserName-' . $loginName;
$username = $this->access->connection->getFromCache($cacheKey);

if ($username !== null) {
$ignoreCache = ($username === false && $forceLdapRefetch);
if ($username !== null && !$ignoreCache) {
return $username;
}

Expand All @@ -95,6 +96,9 @@ public function loginName2UserName($loginName) {
}
$username = $user->getUsername();
$this->access->connection->writeToCache($cacheKey, $username);
if ($forceLdapRefetch) {
$user->processAttributes($ldapRecord);
}
return $username;
} catch (NotOnLDAP $e) {
$this->access->connection->writeToCache($cacheKey, false);
Expand Down Expand Up @@ -138,16 +142,11 @@ public function getLDAPUserByLoginName($loginName) {
* @return false|string
*/
public function checkPassword($uid, $password) {
try {
$ldapRecord = $this->getLDAPUserByLoginName($uid);
} catch (NotOnLDAP $e) {
$this->logger->debug(
$e->getMessage(),
['app' => 'user_ldap', 'exception' => $e]
);
$username = $this->loginName2UserName($uid, true);
if ($username === false) {
return false;
}
$dn = $ldapRecord['dn'][0];
$dn = $this->access->username2dn($username);
$user = $this->access->userManager->get($dn);

if (!$user instanceof User) {
Expand All @@ -165,7 +164,6 @@ public function checkPassword($uid, $password) {
}

$this->access->cacheUserExists($user->getUsername());
$user->processAttributes($ldapRecord);
$user->markLogin();

return $user->getUsername();
Expand Down
4 changes: 4 additions & 0 deletions apps/user_ldap/tests/User_LDAPTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ private function prepareAccessForCheckPassword($noDisplayName = false) {
->method('dn2username')
->with($this->equalTo('dnOfRoland,dc=test'))
->willReturn($retVal);
$this->access->expects($this->any())
->method('username2dn')
->with($this->equalTo('gunslinger'))
->willReturn('dnOfRoland,dc=test');
$this->access->expects($this->any())
->method('stringResemblesDN')
->with($this->equalTo('dnOfRoland,dc=test'))
Expand Down