upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #31218 from nextcloud/techdebt/noid/use-cache-also-for-userbackend-getpassword

Browse source 
Use the cache also for UserBackend::getPassword
This commit is contained in:
Joas Schilling 2022-03-02 11:41:32 +01:00 committed by GitHub
commit 18bafefb00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/private/User/Database.php
View file

@ -193,7 +193,13 @@ class Database extends ABackend implements
$hasher = \OC::$server->getHasher();
$hashedPassword = $hasher->hash($password);
return $this->updatePassword($uid, $hashedPassword);
$return = $this->updatePassword($uid, $hashedPassword);
if ($return) {
$this->cache[$uid]['password'] = $hashedPassword;
}
return $return;
}
return false;
@ -329,28 +335,16 @@ class Database extends ABackend implements
* returns the user id or false
*/
public function checkPassword(string $loginName, string $password) {
$this->fixDI();
$found = $this->loadUser($loginName);
$qb = $this->dbConn->getQueryBuilder();
$qb->select('uid', 'password')
->from($this->table)
->where(
$qb->expr()->eq(
'uid_lower', $qb->createNamedParameter(mb_strtolower($loginName))
)
);
$result = $qb->execute();
$row = $result->fetch();
$result->closeCursor();
if ($row) {
$storedHash = $row['password'];
if ($found && is_array($this->cache[$loginName])) {
$storedHash = $this->cache[$loginName]['password'];
$newHash = '';
if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
if (!empty($newHash)) {
$this->updatePassword($loginName, $newHash);
}
return (string)$row['uid'];
return (string)$this->cache[$loginName]['uid'];
}
}
@ -375,7 +369,7 @@ class Database extends ABackend implements
}
$qb = $this->dbConn->getQueryBuilder();
$qb->select('uid', 'displayname')
$qb->select('uid', 'displayname', 'password')
->from($this->table)
->where(
$qb->expr()->eq(
@ -391,6 +385,7 @@ class Database extends ABackend implements
$this->cache[$uid] = [
'uid' => (string)$row['uid'],
'displayname' => (string)$row['displayname'],
'password' => (string)$row['password'],
];
} else {
$this->cache[$uid] = false;