upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Add a test for multiKeyEncrypt/Decrypt methods

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2023-03-20 14:19:13 +01:00
parent 24e762c59f
commit 430009b8e2
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/encryption/lib/Crypto/Crypt.php
View file

@ -718,6 +718,7 @@ class Crypt {
}
/**
* @param array<string,\OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string> $keyFiles
* @throws MultiKeyEncryptException
*/
public function multiKeyEncrypt(string $plainContent, array $keyFiles): array {
@ -763,6 +764,7 @@ class Crypt {
* @param array $keyFiles
* @return array
* @throws MultiKeyEncryptException
* @deprecated 27.0.0 use multiKeyEncrypt
*/
public function multiKeyEncryptLegacy($plainContent, array $keyFiles) {
// openssl_seal returns false without errors if plaincontent is empty
@ -853,6 +855,7 @@ class Crypt {
/**
* Custom implementation of openssl_seal()
*
* @deprecated 27.0.0 use multiKeyEncrypt
* @throws EncryptionFailedException
*/
private function opensslSeal(string $data, string &$sealed_data, array &$encrypted_keys, array $public_key, string $cipher_algo): int|false {

19
apps/encryption/tests/Crypto/CryptTest.php
View file

@ -34,8 +34,6 @@ use OCP\IUserSession;
use Test\TestCase;
class CryptTest extends TestCase {
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */
private $logger;
@ -155,7 +153,7 @@ class CryptTest extends TestCase {
->method('warning')
->with('Unsupported cipher (Not-Existing-Cipher) defined in config.php supported. Falling back to AES-256-CTR');
$this->assertSame('AES-256-CTR', $this->crypt->getCipher());
$this->assertSame('AES-256-CTR', $this->crypt->getCipher());
}
/**
@ -396,7 +394,7 @@ class CryptTest extends TestCase {
public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected) {
$this->config->method('getSystemValueBool')
->withConsecutive(['encryption.legacy_format_support', false],
['encryption.use_legacy_base64_encoding', false])
['encryption.use_legacy_base64_encoding', false])
->willReturnOnConsecutiveCalls(true, false);
/** @var \OCA\Encryption\Crypto\Crypt | \PHPUnit\Framework\MockObject\MockObject $crypt */
@ -465,4 +463,17 @@ class CryptTest extends TestCase {
$this->invokePrivate($this->crypt, 'isValidPrivateKey', ['foo'])
);
}
public function testMultiKeyEncrypt() {
$res = openssl_pkey_new();
openssl_pkey_export($res, $privateKey);
$publicKeyPem = openssl_pkey_get_details($res)['key'];
$publicKey = openssl_pkey_get_public($publicKeyPem);
$shareKeys = $this->crypt->multiKeyEncrypt('content', ['user1' => $publicKey]);
$this->assertEquals(
'content',
$this->crypt->multiKeyDecrypt($shareKeys['user1'], $privateKey)
);
}
}