upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-13 21:17:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
[stable33] fix: use unjailed source path when moving jailed files
This commit is contained in:
Salvatore Martire 2026-04-09 12:56:06 +02:00 committed by GitHub
commit 4b3c51eddf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/Files/Cache/Wrapper/CacheJail.php
View file

@ -68,6 +68,14 @@ class CacheJail extends CacheWrapper {
}
}
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 @@ class CacheJail extends CacheWrapper {
* @return array [$storageId, $internalPath]
*/
protected function getMoveInfo($path) {
return [$this->getNumericStorageId(), $this->getSourcePath($path)];
return [$this->getNumericStorageId(), $this->getUnjailedSourcePath($path)];
}
/**

2
lib/private/Files/Cache/Wrapper/CacheWrapper.php
View file

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