Skip to content

[stable20] Only allow removing existing shares that would not be allowed due to reshare restrictions #27552

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
skjnldsv merged 4 commits into from
Jun 30, 2021
Merged

[stable20] Only allow removing existing shares that would not be allowed due to reshare restrictions #27552

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86ef353
Drop share if moved to a parent share that does not allow resharing
juliusknorr Apr 15, 2021
e298e74
When changing the share owner, downgrade permissions where needed
juliusknorr Apr 15, 2021
355352d
Only allow removing existing shares that would not be allowed due to …
juliusknorr Apr 15, 2021
5c8ddb6
Handle single action unshare
juliusknorr Jun 9, 2021
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
When changing the share owner, downgrade permissions where needed 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jun 29, 2021
commit e298e7482d4b6e3d5e33f5c85bf8604d5b67a3dc
1 change: 1 addition & 0 deletions apps/files_sharing/lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ private static function moveShareToShare($path) {
continue;
}
$share->setShareOwner($newOwner);
$share->setPermissions($share->getPermissions() & $dstMount->getShare()->getPermissions());
$shareManager->updateShare($share);
}
}
Expand Down