upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix: handle transfering the root of a mountpoint

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2025-04-23 20:32:19 +02:00
parent 2c0e576a7d
commit 3a02d942ae
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/files/lib/Service/OwnershipTransferService.php
View file

@ -426,29 +426,23 @@ class OwnershipTransferService {
$view->mkdir($finalTarget);
$finalTarget = $finalTarget . '/' . basename($sourcePath);
}
if ($view->rename($sourcePath, $finalTarget, ['checkSubMounts' => false]) === false) {
throw new TransferOwnershipException('Could not transfer files.', 1);
$sourceInfo = $view->getFileInfo($sourcePath);
/// handle the external storages mounted at the root, or the admin specifying an external storage with --path
if ($sourceInfo->getInternalPath() === '' && $includeExternalStorage) {
$this->moveMountContents($view, $sourcePath, $finalTarget);
} else {
if ($view->rename($sourcePath, $finalTarget, ['checkSubMounts' => false]) === false) {
throw new TransferOwnershipException('Could not transfer files.', 1);
}
}
if ($includeExternalStorage) {
$nestedMounts = $this->mountManager->findIn($sourcePath);
foreach ($nestedMounts as $mount) {
$relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
if ($mount->getMountProvider() === ConfigAdapter::class) {
if ($view->copy($mount->getMountPoint(), $finalTarget . $relativePath)) {
// just doing `rmdir` on the mountpoint would cause it to try and unmount the storage
// we need to empty the contents instead
$content = $view->getDirectoryContent($mount->getMountPoint());
foreach ($content as $item) {
if ($item->getType() === FileInfo::TYPE_FOLDER) {
$view->rmdir($item->getPath());
} else {
$view->unlink($item->getPath());
}
}
} else {
$output->writeln("<warning>Could not copy {$mount->getMountPoint()}</warning>");
}
$relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget . $relativePath);
}
}
}
@ -459,6 +453,23 @@ class OwnershipTransferService {
}
}
private function moveMountContents(View $rootView, string $source, string $target) {
if ($rootView->copy($source, $target)) {
// just doing `rmdir` on the mountpoint would cause it to try and unmount the storage
// we need to empty the contents instead
$content = $rootView->getDirectoryContent($source);
foreach ($content as $item) {
if ($item->getType() === FileInfo::TYPE_FOLDER) {
$rootView->rmdir($item->getPath());
} else {
$rootView->unlink($item->getPath());
}
}
} else {
throw new TransferOwnershipException("Could not transfer $source to $target");
}
}
/**
* @param string $targetLocation New location of the transfered node
* @param array<array{share: IShare, suffix: string}> $shares previously collected share information