Skip to content

[stable30] fix: encrypt and store password, decrypt and retrieve the same #48939

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
provokateurin merged 6 commits into from
Oct 28, 2024
Merged

[stable30] fix: encrypt and store password, decrypt and retrieve the same #48939

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7e4138
fix: encrypt and store password, decrypt and retrieve the same
yemkareems Oct 28, 2024
051cc83
fix: crypto type made not nullable and tests run using ICrypto
yemkareems Oct 28, 2024
b35d56d
fix: use Icrypto in place of Cypto
yemkareems Oct 28, 2024
1e18546
fix: crypto made inline for constructor and decrypt error handled in …
yemkareems Oct 28, 2024
57b2150
fix: crypto made inline for constructor and decrypt error handled in …
yemkareems Oct 28, 2024
07d020b
fix: crypto added manually as expected
yemkareems Oct 28, 2024
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
Prev Previous commit
Next Next commit
fix: crypto made inline for constructor and decrypt error handled in … 
…exception

Signed-off-by: yemkareems <[email protected]>
  • Loading branch information
@yemkareems @backportbot
yemkareems authored and backportbot[bot] committed Oct 28, 2024
commit 1e18546f36ead6437a8e2446b5c1e05371f9358f
13 changes: 7 additions & 6 deletions lib/private/Authentication/LoginCredentials/Store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/
namespace OC\Authentication\LoginCredentials;

use Exception;
use OC\Authentication\Exceptions\PasswordlessTokenException;
use OC\Authentication\Token\IProvider;
use OCP\Authentication\Exceptions\CredentialsUnavailableException;
Expand All @@ -30,17 +31,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');
}
Expand Down Expand Up @@ -98,7 +95,11 @@ public function getLoginCredentials(): ICredentials {
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
Expand Down