mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25571 from nextcloud/backport/25460/stable21 

[stable21] Always renew apppasswords on login
This commit is contained in:
Roeland Jago Douma 2021-03-05 09:07:42 +01:00 committed by GitHub
parent 163bf97c3e 0ea266e8bf
commit 01b9988a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/Authentication/Token/PublicKeyTokenProvider.php
View File

@ -414,11 +414,6 @@ class PublicKeyTokenProvider implements IProvider {
public function updatePasswords(string $uid, string $password) { public function updatePasswords(string $uid, string $password) {
$this->cache->clear(); $this->cache->clear();
if (!$this->mapper->hasExpiredTokens($uid)) {
// Nothing to do here
return;
}
// Update the password for all tokens // Update the password for all tokens
$tokens = $this->mapper->getTokenByUser($uid); $tokens = $this->mapper->getTokenByUser($uid);
foreach ($tokens as $t) { foreach ($tokens as $t) {

18
tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
View File

@ -548,8 +548,7 @@ class PublicKeyTokenProviderTest extends TestCase {
IToken::PERMANENT_TOKEN, IToken::PERMANENT_TOKEN,
IToken::REMEMBER); IToken::REMEMBER);
$this->mapper->expects($this->once()) $this->mapper->method('hasExpiredTokens')
->method('hasExpiredTokens')
->with($uid) ->with($uid)
->willReturn(true); ->willReturn(true);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
@ -564,19 +563,4 @@ class PublicKeyTokenProviderTest extends TestCase {
$this->tokenProvider->updatePasswords($uid, 'bar2'); $this->tokenProvider->updatePasswords($uid, 'bar2');
} }
public function testUpdatePasswordsNotRequired() {
$uid = 'myUID';
$this->mapper->expects($this->once())
->method('hasExpiredTokens')
->with($uid)
->willReturn(false);
$this->mapper->expects($this->never())
->method('getTokenByUser');
$this->mapper->expects($this->never())
->method('update');
$this->tokenProvider->updatePasswords($uid, 'bar2');
}
} }