upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Use cache in LDAP backend's checkPassword

Browse source 
Signed-off-by: Akhil <akhil@e.email>
This commit is contained in:
Akhil 2022-12-22 16:43:24 +05:30 committed by Akhil
parent 13a72d0f0e
commit b1230cd53d
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/user_ldap/lib/User_LDAP.php
View file

@ -76,11 +76,12 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
* @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;
}
@ -95,6 +96,9 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
}
$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);
@ -138,16 +142,11 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
* @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) {
@ -165,7 +164,6 @@ class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, I
}
$this->access->cacheUserExists($user->getUsername());
$user->processAttributes($ldapRecord);
$user->markLogin();
return $user->getUsername();

4
apps/user_ldap/tests/User_LDAPTest.php
View file

@ -148,6 +148,10 @@ class User_LDAPTest extends TestCase {
->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'))