Merge pull request #50805 from nextcloud/backport/48651/stable29

[stable29] fix(files): Correctly copy the cache information during copy operations

lib/private/Files/Cache/Updater.php

@@ -29,6 +29,8 @@
 
 use Doctrine\DBAL\Exception\DeadlockException;
 use OC\Files\FileInfo;
+use OC\Files\ObjectStore\ObjectStoreStorage;
+use OCP\Files\Cache\ICache;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Cache\IUpdater;
 use OCP\Files\Storage\IStorage;
@@ -177,13 +179,40 @@ public function remove($path) {
 	}
 
 	/**
-	 * Rename a file or folder in the cache and update the size, etag and mtime of the parent folders
+	 * Rename a file or folder in the cache.
 	 *
 	 * @param IStorage $sourceStorage
 	 * @param string $source
 	 * @param string $target
 	 */
 	public function renameFromStorage(IStorage $sourceStorage, $source, $target) {
+		$this->copyOrRenameFromStorage($sourceStorage, $source, $target, function (ICache $sourceCache) use ($sourceStorage, $source, $target) {
+			// Remove existing cache entry to no reuse the fileId.
+			if ($this->cache->inCache($target)) {
+				$this->cache->remove($target);
+			}
+
+			if ($sourceStorage === $this->storage) {
+				$this->cache->move($source, $target);
+			} else {
+				$this->cache->moveFromCache($sourceCache, $source, $target);
+			}
+		});
+	}
+
+	/**
+	 * Copy a file or folder in the cache.
+	 */
+	public function copyFromStorage(IStorage $sourceStorage, string $source, string $target): void {
+		$this->copyOrRenameFromStorage($sourceStorage, $source, $target, function (ICache $sourceCache, ICacheEntry $sourceInfo) use ($target) {
+			$this->cache->copyFromCache($sourceCache, $sourceInfo, $target);
+		});
+	}
+
+	/**
+	 * Utility to copy or rename a file or folder in the cache and update the size, etag and mtime of the parent folders
+	 */
+	private function copyOrRenameFromStorage(IStorage $sourceStorage, string $source, string $target, callable $operation): void {
 		if (!$this->enabled or Scanner::isPartialFile($source) or Scanner::isPartialFile($target)) {
 			return;
 		}
@@ -201,14 +230,8 @@ public function renameFromStorage(IStorage $sourceStorage, $source, $target) {
 		$targetIsTrash = preg_match("/^d\d+$/", $targetExtension);
 
 		if ($sourceInfo !== false) {
-			if ($this->cache->inCache($target)) {
-				$this->cache->remove($target);
-			}
-
-			if ($sourceStorage === $this->storage) {
-				$this->cache->move($source, $target);
-			} else {
-				$this->cache->moveFromCache($sourceCache, $source, $target);
+			if (!$this->storage->instanceOfStorage(ObjectStoreStorage::class)) {
+				$operation($sourceCache, $sourceInfo);
 			}
 
 			$isDir = $sourceInfo->getMimeType() === FileInfo::MIMETYPE_FOLDER;

lib/private/Files/Storage/Wrapper/Encryption.php

@@ -800,7 +800,6 @@ private function copyBetweenStorage(
 						$info->getUnencryptedSize()
 					);
 				}
-				$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename, true);
 			}
 			return $result;
 		}

lib/private/Files/View.php

@@ -316,6 +316,12 @@ protected function renameUpdate(Storage $sourceStorage, Storage $targetStorage,
 		}
 	}
 
+	protected function copyUpdate(Storage $sourceStorage, Storage $targetStorage, string $sourceInternalPath, string $targetInternalPath): void {
+		if ($this->updaterEnabled) {
+			$targetStorage->getUpdater()->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		}
+	}
+
 	/**
 	 * @param string $path
 	 * @return bool|mixed
@@ -999,7 +1005,9 @@ public function copy($source, $target, $preserveMtime = false) {
 						$result = $storage2->copyFromStorage($storage1, $internalPath1, $internalPath2);
 					}
 
-					$this->writeUpdate($storage2, $internalPath2);
+					if ($result) {
+						$this->copyUpdate($storage1, $storage2, $internalPath1, $internalPath2);
+					}
 
 					$this->changeLock($target, ILockingProvider::LOCK_SHARED);
 					$lockTypePath2 = ILockingProvider::LOCK_SHARED;

lib/public/Files/Cache/IUpdater.php

@@ -72,4 +72,11 @@ public function remove($path);
 	 * @since 9.0.0
 	 */
 	public function renameFromStorage(IStorage $sourceStorage, $source, $target);
+
+	/**
+	 * Copy a file or folder in the cache and update the size, etag and mtime of the parent folders
+	 *
+	 * @since 31.0.0
+	 */
+	public function copyFromStorage(IStorage $sourceStorage, string $source, string $target): void;
 }

tests/lib/Files/ViewTest.php

@@ -2371,6 +2371,7 @@ public function testLockFileRenameCrossStorage($viewOperation, $storageOperation
 		Filesystem::mount($storage2, [], $this->user . '/files/substorage');
 		$storage->mkdir('files');
 		$view->file_put_contents($sourcePath, 'meh');
+		$storage2->getUpdater()->update('');
 
 		$storage->expects($this->never())
 			->method($storageOperation);
@@ -2815,4 +2816,12 @@ public function testMountpointParentsCreated() {
 		$this->assertEquals('foo.png', $folderData[1]['name']);
 		$this->assertEquals('foo.txt', $folderData[2]['name']);
 	}
+
+	public function testCopyPreservesContent() {
+		$viewUser1 = new View('/' . 'userId' . '/files');
+		$viewUser1->mkdir('');
+		$viewUser1->file_put_contents('foo.txt', 'foo');
+		$viewUser1->copy('foo.txt', 'bar.txt');
+		$this->assertEquals('foo', $viewUser1->file_get_contents('bar.txt'));
+	}
 }