Test for locking state in key generation

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index 78c506a18d0d2bd6d88046dd5069fa18187b3664..37d6c203da1a65b1df294baae58ecdcfdf7ead9a 100644 (file)
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -43,6 +43,9 @@ use OCP\Files\Storage;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IUserSession;
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class KeyManagerTest extends TestCase {
@@ -79,6 +82,9 @@ class KeyManagerTest extends TestCase {
        /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
        private $configMock;
 
+       /** @var ILockingProvider|MockObject */
+       private $lockingProviderMock;
+
        protected function setUp(): void {
                parent::setUp();
                $this->userId = 'user1';
@@ -99,6 +105,7 @@ class KeyManagerTest extends TestCase {
                $this->utilMock = $this->getMockBuilder(Util::class)
                        ->disableOriginalConstructor()
                        ->getMock();
+               $this->lockingProviderMock = $this->createMock(ILockingProvider::class);
 
                $this->instance = new KeyManager(
                        $this->keyStorageMock,
@@ -107,7 +114,9 @@ class KeyManagerTest extends TestCase {
                        $this->userMock,
                        $this->sessionMock,
                        $this->logMock,
-                       $this->utilMock);
+                       $this->utilMock,
+                       $this->lockingProviderMock
+               );
        }
 
        public function testDeleteShareKey() {
@@ -269,7 +278,8 @@ class KeyManagerTest extends TestCase {
                                        $this->userMock,
                                        $this->sessionMock,
                                        $this->logMock,
-                                       $this->utilMock
+                                       $this->utilMock,
+                                       $this->lockingProviderMock
                                ]
                        )->setMethods(['getMasterKeyId', 'getMasterKeyPassword', 'getSystemPrivateKey', 'getPrivateKey'])
                        ->getMock();
@@ -559,7 +569,8 @@ class KeyManagerTest extends TestCase {
                                        $this->userMock,
                                        $this->sessionMock,
                                        $this->logMock,
-                                       $this->utilMock
+                                       $this->utilMock,
+                                       $this->lockingProviderMock
                                ]
                        )->setMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
                        ->getMock();
@@ -578,6 +589,8 @@ class KeyManagerTest extends TestCase {
                        $this->cryptMock->expects($this->once())->method('encryptPrivateKey')
                                ->with('private', 'masterKeyPassword', 'systemKeyId')
                                ->willReturn('EncryptedKey');
+                       $this->lockingProviderMock->expects($this->once())
+                               ->method('acquireLock');
                        $instance->expects($this->once())->method('setSystemPrivateKey')
                                ->with('systemKeyId', 'headerEncryptedKey');
                } else {
@@ -590,6 +603,39 @@ class KeyManagerTest extends TestCase {
                $instance->validateMasterKey();
        }
 
+       public function testValidateMasterKeyLocked() {
+               /** @var \OCA\Encryption\KeyManager | \PHPUnit_Framework_MockObject_MockObject $instance */
+               $instance = $this->getMockBuilder(KeyManager::class)
+                       ->setConstructorArgs(
+                               [
+                                       $this->keyStorageMock,
+                                       $this->cryptMock,
+                                       $this->configMock,
+                                       $this->userMock,
+                                       $this->sessionMock,
+                                       $this->logMock,
+                                       $this->utilMock,
+                                       $this->lockingProviderMock
+                               ]
+                       )->setMethods(['getPublicMasterKey', 'getPrivateMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+                       ->getMock();
+
+               $instance->expects($this->once())->method('getPublicMasterKey')
+                       ->willReturn('');
+               $instance->expects($this->once())->method('getPrivateMasterKey')
+                       ->willReturn('');
+
+               $instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
+               $this->cryptMock->expects($this->any())->method('generateHeader')->willReturn('header');
+
+               $this->lockingProviderMock->expects($this->once())
+                       ->method('acquireLock')
+                       ->willThrowException(new LockedException('encryption-generateMasterKey'));
+
+               $this->expectException(LockedException::class);
+               $instance->validateMasterKey();
+       }
+
        public function dataTestValidateMasterKey() {
                return [
                        ['masterKey'],

diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php
index 779bb5d82ea45779d1314e884ce5efbe8c8afc69..76c4647f7746f8e15c0e720eeb607c82a0cc92e9 100644 (file)
--- a/apps/encryption/tests/Users/SetupTest.php
+++ b/apps/encryption/tests/Users/SetupTest.php
@@ -90,9 +90,9 @@ class SetupTest extends TestCase {
                if ($hasKeys) {
                        $this->keyManagerMock->expects($this->never())->method('storeKeyPair');
                } else {
-                       $this->cryptMock->expects($this->once())->method('createKeyPair')->willReturn('keyPair');
+                       $this->cryptMock->expects($this->once())->method('createKeyPair')->willReturn(['publicKey' => 'publicKey', 'privateKey' => 'privateKey']);
                        $this->keyManagerMock->expects($this->once())->method('storeKeyPair')
-                               ->with('uid', 'password', 'keyPair')->willReturn(true);
+                               ->with('uid', 'password', ['publicKey' => 'publicKey', 'privateKey' => 'privateKey'])->willReturn(true);
                }
 
                $this->assertSame($expected,