diff options
| author | Robin Appelman <robin@icewind.nl> | 2022-12-27 15:32:59 +0100 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-01-26 08:56:32 +0000 |
| commit | af823ec7f901d36ab07e0c78b965034d97cbeaee (patch) | |
| tree | 9b3ef4aa079e5cbf2a99ad9cde738819904c5073 | |
| parent | a13d2ea49442f58573af6e608555ae8b7eda81ac (diff) | |
| download | nextcloud-server-af823ec7f901d36ab07e0c78b965034d97cbeaee.tar.gz nextcloud-server-af823ec7f901d36ab07e0c78b965034d97cbeaee.zip | |
fix moving files of encrypted local storage to unencrypted local storage
for example when moving encrypted files to a groupfolder
Signed-off-by: Robin Appelman <robin@icewind.nl>
| -rw-r--r-- | lib/private/Files/Storage/Local.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 0e118e76c5f..c3e808b4b95 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -44,6 +44,7 @@ namespace OC\Files\Storage; use OC\Files\Filesystem; +use OC\Files\Storage\Wrapper\Encryption; use OC\Files\Storage\Wrapper\Jail; use OCP\Constants; use OCP\Files\ForbiddenException; @@ -556,6 +557,16 @@ class Local extends \OC\Files\Storage\Common { } } + private function canDoCrossStorageMove(IStorage $sourceStorage) { + return $sourceStorage->instanceOfStorage(Local::class) + // Don't treat ACLStorageWrapper like local storage where copy can be done directly. + // Instead, use the slower recursive copying in php from Common::copyFromStorage with + // more permissions checks. + && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper') + // when moving encrypted files we have to handle keys and the target might not be encrypted + && !$sourceStorage->instanceOfStorage(Encryption::class); + } + /** * @param IStorage $sourceStorage * @param string $sourceInternalPath @@ -564,10 +575,7 @@ class Local extends \OC\Files\Storage\Common { * @return bool */ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { - // Don't treat ACLStorageWrapper like local storage where copy can be done directly. - // Instead use the slower recursive copying in php from Common::copyFromStorage with - // more permissions checks. - if ($sourceStorage->instanceOfStorage(Local::class) && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')) { + if ($this->canDoCrossStorageMove($sourceStorage)) { if ($sourceStorage->instanceOfStorage(Jail::class)) { /** * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage @@ -591,7 +599,7 @@ class Local extends \OC\Files\Storage\Common { * @return bool */ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) { - if ($sourceStorage->instanceOfStorage(Local::class)) { + if ($this->canDoCrossStorageMove($sourceStorage)) { if ($sourceStorage->instanceOfStorage(Jail::class)) { /** * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage |