upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-15 08:48:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #51327 from nextcloud/backport/51130/stable30

Browse source 
[stable30] fix: Do not build encrypted password if there is none
This commit is contained in:
Andy Scherzinger 2025-03-28 16:19:52 +01:00 committed by GitHub
commit 5ebcf9b72b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,9 @@ class Store implements IStore {
* @param array $params
*/
public function authenticate(array $params) {
$params['password'] = $this->crypto->encrypt((string)$params['password']);
if ($params['password'] !== null) {
$params['password'] = $this->crypto->encrypt((string)$params['password']);
}
$this->session->set('login_credentials', json_encode($params));
}
@ -97,10 +99,12 @@ class Store implements IStore {
if ($trySession && $this->session->exists('login_credentials')) {
/** @var array $creds */
$creds = json_decode($this->session->get('login_credentials'), true);
try {
$creds['password'] = $this->crypto->decrypt($creds['password']);
} catch (Exception $e) {
//decryption failed, continue with old password as it is
if ($creds['password'] !== null) {
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'],

40
tests/lib/Authentication/LoginCredentials/StoreTest.php
View file

@ -253,4 +253,44 @@ class StoreTest extends TestCase {
$this->store->getLoginCredentials();
}
public function testAuthenticatePasswordlessToken(): void {
$user = 'user987';
$password = null;
$params = [
'run' => true,
'loginName' => $user,
'uid' => $user,
'password' => $password,
];
$this->session->expects($this->once())
->method('set')
->with($this->equalTo('login_credentials'), $this->equalTo(json_encode($params)));
$this->session->expects($this->once())
->method('getId')
->willReturn('sess2233');
$this->tokenProvider->expects($this->once())
->method('getToken')
->with('sess2233')
->will($this->throwException(new PasswordlessTokenException()));
$this->session->expects($this->once())
->method('exists')
->with($this->equalTo('login_credentials'))
->willReturn(true);
$this->session->expects($this->once())
->method('get')
->with($this->equalTo('login_credentials'))
->willReturn(json_encode($params));
$this->store->authenticate($params);
$actual = $this->store->getLoginCredentials();
$expected = new Credentials($user, $user, $password);
$this->assertEquals($expected, $actual);
}
}