Skip to content

Update owner of subdir on move into/out of share #31728

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

Merged
artonge merged 8 commits into from
Jul 26, 2022
Merged

Update owner of subdir on move into/out of share #31728

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8967602
Test moving share in and out of another share
artonge Mar 31, 2022
8ca9109
Update owner of subdir on move into/out of share
PVince81 Mar 28, 2022
ce7b6ff
Prevent column name conflict between tables
artonge Mar 31, 2022
13e7ebb
Change share owner when moving share out of share
artonge Mar 31, 2022
b513ac5
Int test for share owner change on move
PVince81 Apr 1, 2022
0fb4eca
Recursively fetch subshares
artonge Apr 27, 2022
256ed34
Skip testMovedIntoShareChangeOwner
artonge Apr 27, 2022
f525067
Add argument to getSharesInFolder enable deep share lookup
artonge Jun 23, 2022
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
Prev Previous commit
Next Next commit
Change share owner when moving share out of share 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Jul 26, 2022
commit 13e7ebbe4bfcf117c2d1ed7cc4758327c302bcab
26 changes: 14 additions & 12 deletions apps/files_sharing/lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Updater {
*/
public static function renameHook($params) {
self::renameChildren($params['oldpath'], $params['newpath']);
self::moveShareToShare($params['newpath']);
self::moveShareInOrOutOfShare($params['newpath']);
}

/**
Expand All @@ -51,7 +51,7 @@ public static function renameHook($params) {
*
* @param string $path
*/
private static function moveShareToShare($path) {
private static function moveShareInOrOutOfShare($path): void {
$userFolder = \OC::$server->getUserFolder();

// If the user folder can't be constructed (e.g. link share) just return.
Expand Down Expand Up @@ -85,11 +85,6 @@ private static function moveShareToShare($path) {
// Check if the destination is inside a share
$mountManager = \OC::$server->getMountManager();
$dstMount = $mountManager->find($src->getPath());
if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
return;
}

$newOwner = $dstMount->getShare()->getShareOwner();

//Ownership is moved over
foreach ($shares as $share) {
Expand All @@ -101,13 +96,20 @@ private static function moveShareToShare($path) {
continue;
}

/** @var IShare $share */
if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
$shareManager->deleteShare($share);
continue;
if ($dstMount instanceof \OCA\Files_Sharing\SharedMount) {
if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
Copy link
Contributor

@artonge artonge Mar 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, if the destination is a share and does not have the SHARE permission, we delete the current share?

Not sure about the rational.

$shareManager->deleteShare($share);
continue;
}
$newOwner = $dstMount->getShare()->getShareOwner();
$newPermissions = $share->getPermissions() & $dstMount->getShare()->getPermissions();
} else {
$newOwner = $userFolder->getOwner()->getUID();
$newPermissions = $share->getPermissions();
}

$share->setShareOwner($newOwner);
$share->setPermissions($share->getPermissions() & $dstMount->getShare()->getPermissions());
$share->setPermissions($newPermissions);
$shareManager->updateShare($share);
}
}
Expand Down