upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 10:03:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix: crypto made inline for constructor and decrypt error handled in exception

Browse source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
This commit is contained in:
yemkareems 2024-10-28 16:32:57 +05:30 committed by backportbot[bot]
parent 13765c0dbf
commit 91cafe42b7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/Authentication/LoginCredentials/Store.php
View file

@ -26,6 +26,7 @@ declare(strict_types=1);
*/
namespace OC\Authentication\LoginCredentials;
use Exception;
use OC\Authentication\Exceptions\PasswordlessTokenException;
use OC\Authentication\Token\IProvider;
use OCP\Authentication\Exceptions\CredentialsUnavailableException;
@ -48,17 +49,13 @@ class Store implements IStore {
/** @var IProvider|null */
private $tokenProvider;
/** @var ICrypto */
private $crypto;
public function __construct(ISession $session,
LoggerInterface $logger,
ICrypto $crypto,
private readonly ICrypto $crypto,
?IProvider $tokenProvider = null) {
$this->session = $session;
$this->logger = $logger;
$this->tokenProvider = $tokenProvider;
$this->crypto = $crypto;
Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
}
@ -116,7 +113,11 @@ class Store implements IStore {
if ($trySession && $this->session->exists('login_credentials')) {
/** @var array $creds */
$creds = json_decode($this->session->get('login_credentials'), true);
$creds['password'] = $this->crypto->decrypt($creds['password']);
try {
$creds['password'] = $this->crypto->decrypt($creds['password']);
} catch (Exception $e) {
//decryption failed, continue with old password as it is
}
return new Credentials(
$creds['uid'],
$creds['loginName'] ?? $this->session->get('loginname') ?? $creds['uid'], // Pre 20 didn't have a loginName property, hence fall back to the session value and then to the UID