Merge pull request #59310 from nextcloud/backport/59252/stable33

[stable33] fix: use unjailed source path when moving jailed files

Author: salmart-dev

lib/private/Files/Cache/Wrapper/CacheJail.php

@@ -68,6 +68,14 @@ protected function getSourcePath(string $path) {
 		}
 	}
 
+	protected function getUnjailedSourcePath(string $path): string {
+		if ($path === '') {
+			return $this->getGetUnjailedRoot();
+		} else {
+			return $this->getGetUnjailedRoot() . '/' . ltrim($path, '/');
+		}
+	}
+
 	/**
 	 * @param string $path
 	 * @param null|string $root
@@ -189,7 +197,7 @@ public function move($source, $target) {
 	 * @return array [$storageId, $internalPath]
 	 */
 	protected function getMoveInfo($path) {
-		return [$this->getNumericStorageId(), $this->getSourcePath($path)];
+		return [$this->getNumericStorageId(), $this->getUnjailedSourcePath($path)];
 	}
 
 	/**

lib/private/Files/Cache/Wrapper/CacheWrapper.php

@@ -201,7 +201,7 @@ public function move($source, $target) {
 	}
 
 	protected function getMoveInfo($path) {
-		/** @var Cache $cache */
+		/** @var Cache|CacheJail $cache */
 		$cache = $this->getCache();
 		return $cache->getMoveInfo($path);
 	}