Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable19] Fix share transfer of single files and on the transfered node #22804

Merged
merged 8 commits into from
Sep 28, 2020
Merged

[stable19] Fix share transfer of single files and on the transfered node #22804

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14c3f1e
Transfer shares of the transferred root node
juliushaertl Jul 31, 2020
818b69e
Transfer shares if no path provided
juliushaertl Sep 7, 2020
bb8fe15
Check whether file exists or not after transferring ownership
danxuliu Sep 10, 2020
6d13747
Check share ownership after transferring file ownership
danxuliu Sep 10, 2020
1375a42
Add integration tests for transferring ownership of reshares
danxuliu Sep 10, 2020
29fcaa1
Add integration test for transferring the path of a single file
danxuliu Sep 18, 2020
f400c44
Add integration tests for transferring files of a user with a risky name
danxuliu Sep 18, 2020
083d1da
Add integration tests to check that only the given path is transferred
danxuliu Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions apps/files/lib/Service/OwnershipTransferService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@
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;
Expand All @@ -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;
}

/**
Expand Down Expand Up @@ -148,7 +155,9 @@ public function transfer(IUser $sourceUser,
// collect all the shares
$shares = $this->collectUsersShares(
$sourceUid,
$output
$output,
$view,
$sourcePath
);

// transfer the files
Expand Down Expand Up @@ -233,7 +242,9 @@ function (FileInfo $fileInfo) use ($progress) {
}

private function collectUsersShares(string $sourceUid,
OutputInterface $output): array {
OutputInterface $output,
View $view,
string $path): array {
$output->writeln("Collecting all share information for files and folders of $sourceUid ...");

$shares = [];
Expand All @@ -246,6 +257,23 @@ private function collectUsersShares(string $sourceUid,
if (empty($sharePage)) {
break;
}
if ($path !== "$sourceUid/files") {
$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;
}
Expand Down Expand Up @@ -306,6 +334,12 @@ private function restoreShares(string $sourceUid,
$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) {
Expand Down
Loading