Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys

Check if the part files has keys when the original file does not

2 files changed, 57 insertions, 14 deletions

diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index fa317851a56..848d5c0134a 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -72,7 +72,17 @@ class Storage implements IStorage {
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		return $this->getKey($keyDir . $keyId);
+		$key = $this->getKey($keyDir . $keyId);
+
+		if ($key === '' && $realFile !== $path) {
+			// Check if the part file has keys and use them, if no normal keys
+			// exist. This is required to fix copyBetweenStorage() when we
+			// rename a .part file over storage borders.
+			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+			$key = $this->getKey($keyDir . $keyId);
+		}
+
+		return $key;
 	}
 
 	/**
diff --git a/tests/lib/encryption/keys/storage.php b/tests/lib/encryption/keys/storage.php
index 8af3821dc93..2f3aa3527b9 100644
--- a/tests/lib/encryption/keys/storage.php
+++ b/tests/lib/encryption/keys/storage.php
@@ -72,29 +72,62 @@ class StorageTest extends TestCase {
 		);
 	}
 
-	public function testGetFileKey() {
+	public function dataTestGetFileKey() {
+		return [
+			['/files/foo.txt', '/files/foo.txt', true, 'key'],
+			['/files/foo.txt.ocTransferId2111130212.part', '/files/foo.txt', true, 'key'],
+			['/files/foo.txt.ocTransferId2111130212.part', '/files/foo.txt', false, 'key2'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataTestGetFileKey
+	 *
+	 * @param string $path
+	 * @param string $strippedPartialName
+	 * @param bool $originalKeyExists
+	 * @param string $expectedKeyContent
+	 */
+	public function testGetFileKey2($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent) {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturnMap([
+				['user1/files/foo.txt', ['user1', '/files/foo.txt']],
+				['user1/files/foo.txt.ocTransferId2111130212.part', ['user1', '/files/foo.txt.ocTransferId2111130212.part']],
+			]);
 		// we need to strip away the part file extension in order to reuse a
 		// existing key if it exists, otherwise versions will break
 		$this->util->expects($this->once())
 			->method('stripPartialFileExtension')
-			->willReturnArgument(0);
+			->willReturn('user1' . $strippedPartialName);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturn(false);
-		$this->view->expects($this->once())
-			->method('file_get_contents')
-			->with($this->equalTo('/user1/files_encryption/keys/files/foo.txt/encModule/fileKey'))
-			->willReturn('key');
-		$this->view->expects($this->once())
-			->method('file_exists')
-			->with($this->equalTo('/user1/files_encryption/keys/files/foo.txt/encModule/fileKey'))
-			->willReturn(true);
 
-		$this->assertSame('key',
-			$this->storage->getFileKey('user1/files/foo.txt', 'fileKey', 'encModule')
+		$this->view->expects($this->at(0))
+			->method('file_exists')
+			->with($this->equalTo('/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey'))
+			->willReturn($originalKeyExists);
+
+		if (!$originalKeyExists) {
+			$this->view->expects($this->at(1))
+				->method('file_exists')
+				->with($this->equalTo('/user1/files_encryption/keys' . $path . '/encModule/fileKey'))
+				->willReturn(true);
+
+			$this->view->expects($this->once())
+				->method('file_get_contents')
+				->with($this->equalTo('/user1/files_encryption/keys' . $path . '/encModule/fileKey'))
+				->willReturn('key2');
+		} else {
+			$this->view->expects($this->once())
+				->method('file_get_contents')
+				->with($this->equalTo('/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey'))
+				->willReturn('key');
+		}
+
+		$this->assertSame($expectedKeyContent,
+			$this->storage->getFileKey('user1' . $path, 'fileKey', 'encModule')
 		);
 	}