Skip to content

[stable28] fix: promote re-shares when deleting the parent share #49628

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

Closed
backportbot wants to merge 10 commits into from
Closed

[stable28] fix: promote re-shares when deleting the parent share #49628

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2965395
fix: delete re-shares when deleting the parent share
luka-nextcloud Aug 7, 2024
37ab38b
fix: Tidy up code for reshare deletion
come-nc Aug 22, 2024
af7cbc5
fix: Transfer incomming shares first, do not delete non-migratable ones
come-nc Aug 26, 2024
3224047
fix(shares): Promote reshares into direct shares when share is deleted
come-nc Sep 13, 2024
4861927
chore: Turn method description into phpdoc
come-nc Sep 15, 2024
b41e101
chore: Add comment to make code clearer
come-nc Sep 16, 2024
5bb30a8
fix(tests): Fix share tests to test new reshare promotion system
come-nc Oct 3, 2024
02cca71
fix(tests): Revert changes to tests now that reshares are not deleted…
come-nc Oct 8, 2024
15c138e
fix: Fix promotion of reshares from subsubfolders
come-nc Oct 14, 2024
11954e8
fix: Use getRelativePath method to check if node is inside folder
come-nc Oct 14, 2024
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
fix(shares): Promote reshares into direct shares when share is deleted 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Dec 3, 2024
commit 3224047291a37e817c1b44fb13104c874414dcc4
20 changes: 14 additions & 6 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@ protected function sendMailNotification(IL10N $l,
* @param IShare $share
* @return IShare The share object
* @throws \InvalidArgumentException
* @throws GenericShareException
*/
public function updateShare(IShare $share) {
$expirationDateUpdated = false;
Expand Down Expand Up @@ -1154,7 +1155,8 @@ protected function deleteChildren(IShare $share) {
return $deletedShares;
}

protected function deleteReshares(IShare $share): void {
/* Promote reshares into direct shares so that target user keeps access */
protected function promoteReshares(IShare $share): void {
try {
$node = $share->getNode();
} catch (NotFoundException) {
Expand All @@ -1172,7 +1174,7 @@ protected function deleteReshares(IShare $share): void {

foreach ($users as $user) {
/* Skip share owner */
if ($user->getUID() === $share->getShareOwner()) {
if ($user->getUID() === $share->getShareOwner() || $user->getUID() === $share->getSharedBy()) {
continue;
}
$userIds[] = $user->getUID();
Expand Down Expand Up @@ -1215,8 +1217,14 @@ protected function deleteReshares(IShare $share): void {
try {
$this->generalCreateChecks($child);
} catch (GenericShareException $e) {
$this->logger->debug('Delete reshare because of exception '.$e->getMessage(), ['exception' => $e]);
$this->deleteShare($child);
/* The check is invalid, promote it to a direct share from the sharer of parent share */
$this->logger->debug('Promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
try {
$child->setSharedBy($share->getSharedBy());
$this->updateShare($child);
} catch (GenericShareException|\InvalidArgumentException $e) {
$this->logger->warning('Failed to promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
}
}
}
}
Expand Down Expand Up @@ -1246,8 +1254,8 @@ public function deleteShare(IShare $share) {

$this->dispatcher->dispatchTyped(new ShareDeletedEvent($share));

// Delete reshares of the deleted share
$this->deleteReshares($share);
// Promote reshares of the deleted share
$this->promoteReshares($share);
}


Expand Down