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

SetPassword on PublicKeyTokens 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-05-29 12:18:10 +02:00
parent 4c0d710479
commit 4bbc21cb21
No known key found for this signature in database
GPG Key ID: F941078878347C0C
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,19 @@ class PublicKeyTokenProvider implements IProvider {
} }
public function setPassword(IToken $token, string $tokenId, string $password) { public function setPassword(IToken $token, string $tokenId, string $password) {
// Kill all temp tokens except the current token if (!($token instanceof PublicKeyToken)) {
throw new InvalidTokenException();
}
// Update pass for all permanent tokens by rencrypting // Update the password for all tokens
$tokens = $this->mapper->getTokenByUser($token->getUID());
foreach ($tokens as $t) {
$publicKey = $token->getPublicKey();
$t->setPassword($this->encryptPassword($password, $publicKey));
$this->updateToken($t);
}
//TODO: should we also do this for temp tokens?
} }
public function rotate(IToken $token, string $oldTokenId, string $newTokenId): IToken { public function rotate(IToken $token, string $oldTokenId, string $newTokenId): IToken {

10
tests/lib/Authentication/Token/DefaultTokenProviderTest.php
View File

@ -132,13 +132,12 @@ class DefaultTokenProviderTest extends TestCase {
} }
public function testGetTokenByUser() { public function testGetTokenByUser() {
$user = $this->createMock(IUser::class);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('getTokenByUser') ->method('getTokenByUser')
->with($user) ->with('uid')
->will($this->returnValue(['token'])); ->will($this->returnValue(['token']));
$this->assertEquals(['token'], $this->tokenProvider->getTokenByUser($user)); $this->assertEquals(['token'], $this->tokenProvider->getTokenByUser('uid'));
} }
public function testGetPassword() { public function testGetPassword() {
@ -243,13 +242,12 @@ class DefaultTokenProviderTest extends TestCase {
public function testInvaildateTokenById() { public function testInvaildateTokenById() {
$id = 123; $id = 123;
$user = $this->createMock(IUser::class);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('deleteById') ->method('deleteById')
->with($user, $id); ->with('uid', $id);
$this->tokenProvider->invalidateTokenById($user, $id); $this->tokenProvider->invalidateTokenById('uid', $id);
} }
public function testInvalidateOldTokens() { public function testInvalidateOldTokens() {

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

@ -121,13 +121,12 @@ class PublicKeyTokenProviderTest extends TestCase {
} }
public function testGetTokenByUser() { public function testGetTokenByUser() {
$user = $this->createMock(IUser::class);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('getTokenByUser') ->method('getTokenByUser')
->with($user) ->with('uid')
->will($this->returnValue(['token'])); ->will($this->returnValue(['token']));
$this->assertEquals(['token'], $this->tokenProvider->getTokenByUser($user)); $this->assertEquals(['token'], $this->tokenProvider->getTokenByUser('uid'));
} }
public function testGetPassword() { public function testGetPassword() {
@ -189,7 +188,18 @@ class PublicKeyTokenProviderTest extends TestCase {
$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER); $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
$this->mapper->method('getTokenByUser')
->with('user')
->willReturn([$actual]);
$newpass = 'newpass'; $newpass = 'newpass';
$this->mapper->expects($this->once())
->method('update')
->with($this->callback(function ($token) use ($newpass) {
return $newpass === $this->tokenProvider->getPassword($token, 'token');
}));
$this->tokenProvider->setPassword($actual, $token, $newpass); $this->tokenProvider->setPassword($actual, $token, $newpass);
$this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'token')); $this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'token'));
@ -216,13 +226,12 @@ class PublicKeyTokenProviderTest extends TestCase {
public function testInvaildateTokenById() { public function testInvaildateTokenById() {
$id = 123; $id = 123;
$user = $this->createMock(IUser::class);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('deleteById') ->method('deleteById')
->with($user, $id); ->with('uid', $id);
$this->tokenProvider->invalidateTokenById($user, $id); $this->tokenProvider->invalidateTokenById('uid', $id);
} }
public function testInvalidateOldTokens() { public function testInvalidateOldTokens() {