Merge pull request #29189 from owncloud/decryptall-fix-stable10

[stable10] Fix for decrypting user specific keys
owncloud · Oct 10, 2017 · 1194518 · 1194518
2 parents 2c9c7be + 352ce66
commit 1194518
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
@@ -90,8 +90,10 @@ public function decryptAll(InputInterface $input, OutputInterface $output, $user
 		}
 
 		$this->output->writeln('prepare encryption modules...');
-		if ($this->prepareEncryptionModules($user) === false) {
-			return false;
+		if (\OC::$server->getAppConfig()->getValue('encryption', 'useMasterKey', '0') !== '0') {
+			if ($this->prepareEncryptionModules($user) === false) {
+				return false;
+			}
 		}
 		$this->output->writeln(' done.');
 
@@ -183,6 +185,11 @@ protected function decryptAllUsersFiles($user = '') {
 		$userNo = 1;
 		foreach ($userList as $uid) {
 			$userCount = "$uid ($userNo of $numberOfUsers)";
+			if (\OC::$server->getAppConfig()->getValue('encryption', 'userSpecificKey', '0') !== '0') {
+				if ($this->prepareEncryptionModules($uid) === false) {
+					return false;
+				}
+			}
 			$this->decryptUsersFiles($uid, $progress, $userCount);
 			$userNo++;
 		}
@@ -255,7 +262,9 @@ protected function decryptFile($path) {
 		$target = $path . '.decrypted.' . $this->getTimestamp();
 
 		try {
+			\OC\Files\Storage\Wrapper\Encryption::setDisableWriteEncryption(true);
 			$this->rootView->copy($source, $target);
+			\OC\Files\Storage\Wrapper\Encryption::setDisableWriteEncryption(false);
 			$this->rootView->rename($target, $source);
 		} catch (DecryptionFailedException $e) {
 			if ($this->rootView->file_exists($target)) {

diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
@@ -121,6 +121,8 @@ public function testDecryptAll($prepareResult, $user, $userExistsChecked) {
 			->setMethods(['prepareEncryptionModules', 'decryptAllUsersFiles'])
 			->getMock();
 
+		\OC::$server->getAppConfig()->setValue('encryption', 'useMasterKey', '1');
+
 		$instance->expects($this->once())
 			->method('prepareEncryptionModules')
 			->with($user)
@@ -135,6 +137,8 @@ public function testDecryptAll($prepareResult, $user, $userExistsChecked) {
 		}
 
 		$instance->decryptAll($this->inputInterface, $this->outputInterface, $user);
+
+		\OC::$server->getAppConfig()->deleteKey('encryption', 'useMasterKey');
 	}
 
 	/**