From 14c3f1ebd88389046aa5dbc971fcb2f00f8cd00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 31 Jul 2020 11:10:48 +0200 Subject: [PATCH] Transfer shares of the transferred root node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .../lib/Service/OwnershipTransferService.php | 40 +++++++++++++++++-- lib/private/Files/Config/UserMountCache.php | 5 +++ lib/public/Files/Config/IUserMountCache.php | 7 ++++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php index 0b0a5f9abf..7da8c9b2bb 100644 --- a/apps/files/lib/Service/OwnershipTransferService.php +++ b/apps/files/lib/Service/OwnershipTransferService.php @@ -35,12 +35,14 @@ use OC\Files\Filesystem; use OC\Files\View; use OCA\Files\Exception\TransferOwnershipException; use OCP\Encryption\IManager as IEncryptionManager; +use OCP\Files\Config\IUserMountCache; use OCP\Files\FileInfo; use OCP\Files\IHomeStorage; use OCP\Files\InvalidPathException; use OCP\Files\Mount\IMountManager; use OCP\IUser; use OCP\Share\IManager as IShareManager; +use OCP\Share\IShare; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Output\NullOutput; use Symfony\Component\Console\Output\OutputInterface; @@ -62,12 +64,17 @@ class OwnershipTransferService { /** @var IMountManager */ private $mountManager; + /** @var IUserMountCache */ + private $userMountCache; + public function __construct(IEncryptionManager $manager, IShareManager $shareManager, - IMountManager $mountManager) { + IMountManager $mountManager, + IUserMountCache $userMountCache) { $this->encryptionManager = $manager; $this->shareManager = $shareManager; $this->mountManager = $mountManager; + $this->userMountCache = $userMountCache; } /** @@ -148,7 +155,9 @@ class OwnershipTransferService { // collect all the shares $shares = $this->collectUsersShares( $sourceUid, - $output + $output, + $view, + $sourcePath ); // transfer the files @@ -233,7 +242,9 @@ class OwnershipTransferService { } private function collectUsersShares(string $sourceUid, - OutputInterface $output): array { + OutputInterface $output, + View $view, + ?string $path = null): array { $output->writeln("Collecting all share information for files and folders of $sourceUid ..."); $shares = []; @@ -246,6 +257,23 @@ class OwnershipTransferService { if (empty($sharePage)) { break; } + if ($path !== null) { + $sharePage = array_filter($sharePage, function (IShare $share) use ($view, $path) { + try { + $relativePath = $view->getPath($share->getNodeId()); + $singleFileTranfer = $view->is_file($path); + if ($singleFileTranfer) { + return Filesystem::normalizePath($relativePath) === Filesystem::normalizePath($path); + } + + return mb_strpos( + Filesystem::normalizePath($relativePath . '/', false), + Filesystem::normalizePath($path . '/', false)) === 0; + } catch (\Exception $e) { + return false; + } + }); + } $shares = array_merge($shares, $sharePage); $offset += 50; } @@ -306,6 +334,12 @@ class OwnershipTransferService { $share->setSharedBy($destinationUid); } + + // trigger refetching of the node so that the new owner and mountpoint are taken into account + // otherwise the checks on the share update will fail due to the original node not being available in the new user scope + $this->userMountCache->clear(); + $share->setNodeId($share->getNode()->getId()); + $this->shareManager->updateShare($share); } } catch (\OCP\Files\NotFoundException $e) { diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 9cf3b43a43..32bfd5a71f 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -409,4 +409,9 @@ class UserMountCache implements IUserMountCache { $result->closeCursor(); return $results; } + + public function clear(): void { + $this->cacheInfoCache = new CappedMemoryCache(); + $this->mountsForUsers = new CappedMemoryCache(); + } } diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php index 9fca98dc84..fde4898bd3 100644 --- a/lib/public/Files/Config/IUserMountCache.php +++ b/lib/public/Files/Config/IUserMountCache.php @@ -117,4 +117,11 @@ interface IUserMountCache { * @since 13.0.0 */ public function getUsedSpaceForUsers(array $users); + + /** + * Clear all entries from the in-memory cache + * + * @since 20.0.0 + */ + public function clear(): void; }