Merge pull request #49675 from nextcloud/backport/49262/stable29

[stable29] fix: don't do same-storage move optimization with encryption wrappers
nextcloud · Jan 9, 2025 · cf2b197 · cf2b197
2 parents a9d1d34 + bb3e6ea
commit cf2b197
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -50,6 +50,7 @@
 use OC\Files\Cache\Watcher;
 use OC\Files\Filesystem;
 use OC\Files\ObjectStore\ObjectStoreStorage;
+use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\Storage\Wrapper\Jail;
 use OC\Files\Storage\Wrapper\Wrapper;
 use OCP\Files\EmptyFileNameException;
@@ -687,7 +688,10 @@ private function isSameStorage(IStorage $storage): bool {
 	 * @return bool
 	 */
 	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($this->isSameStorage($sourceStorage)) {
+		if (
+			!$sourceStorage->instanceOfStorage(Encryption::class) &&
+			$this->isSameStorage($sourceStorage)
+		) {
 			// resolve any jailed paths
 			while ($sourceStorage->instanceOfStorage(Jail::class)) {
 				/**