Merge pull request #32401 from owncloud/fix-regression-decryptall-par…

…tfile

Fix the regression caused due to usage of part file in decrypt-all

lib/private/Encryption/DecryptAll.php

@@ -271,7 +271,9 @@ protected function decryptFile($path) {
 			\OC\Files\Storage\Wrapper\Encryption::setDisableWriteEncryption(true);
 			$this->rootView->copy($source, $target);
 			\OC\Files\Storage\Wrapper\Encryption::setDisableWriteEncryption(false);
+			View::setIgnorePartFile(true);
 			$this->rootView->rename($target, $source);
+			View::setIgnorePartFile(false);
 			list($storage, $internalPath) = $this->rootView->resolvePath($source);
 			//Update the encrypted column in file cache to zero, as the file is decrypted
 			$storage->getCache()->put($internalPath, ['encrypted' => 0]);

lib/private/Files/View.php

@@ -104,6 +104,8 @@ class View {
 
 	private $eventDispatcher;
 
+	private static $ignorePartFile = false;
+
 	/**
 	 * @param string $root
 	 * @throws \Exception If $root contains an invalid path
@@ -837,7 +839,7 @@ public function rename($path1, $path2) {
 						$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
 					}
 
-					if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+					if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false && (self::$ignorePartFile === false)) {
 						// if it was a rename from a part file to a regular file it was a write and not a rename operation
 
 						$this->writeUpdate($storage2, $internalPath2);
@@ -2192,4 +2194,16 @@ private function createParentDirectories($filePath) {
 		$this->mkdir($filePath);
 		return true;
 	}
+
+	/**
+	 * User can create part files example to a call for rename(), in effect
+	 * it might not be a part file. So for better control in such cases this
+	 * method would help to let the method in rename() to know if it is a
+	 * part file.
+	 *
+	 * @param bool $isIgnored
+	 */
+	public static function setIgnorePartFile($isIgnored) {
+		self::$ignorePartFile = $isIgnored;
+	}
 }

tests/lib/Files/ViewTest.php

@@ -1297,7 +1297,9 @@ public function testRenameOverWrite() {
 		$scanner->scan('');
 		Filesystem::mount($storage, [], '/test/');
 		$view = new View('');
+		\OC::$server->getConfig()->setAppValue('core', 'ignorepartfile', 'true');
 		$this->assertTrue($view->rename('/test/foo.txt', '/test/foo/bar.txt'));
+		\OC::$server->getConfig()->deleteAppValue('core', 'ignorepartfile');
 	}
 
 	public function testSetMountOptionsInStorage() {