Skip to content

fix(encryption): Catch NotFoundException in ShareDeletedEvent listener #53700

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
provokateurin merged 2 commits into from
Jun 30, 2025
Merged

fix(encryption): Catch NotFoundException in ShareDeletedEvent listener #53700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f9d8f
fix(encryption): Catch NotFoundException in ShareDeletedEvent listener
come-nc Jun 26, 2025
f4b780b
fix(encryption): Pass an IUser and not a string to getUpdate
come-nc Jun 30, 2025
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
17 changes: 12 additions & 5 deletions lib/private/Encryption/EncryptionEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
use OCP\EventDispatcher\IEventDispatcher;
use OCP\EventDispatcher\IEventListener;
use OCP\Files\Events\Node\NodeRenamedEvent;
use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;
Expand All @@ -31,6 +33,7 @@ public function __construct(
private IUserSession $userSession,
private SetupManager $setupManager,
private Manager $encryptionManager,
private IUserManager $userManager,
) {
}

Expand All @@ -50,10 +53,14 @@ public function handle(Event $event): void {
} elseif ($event instanceof ShareCreatedEvent) {
$this->getUpdate()->postShared($event->getShare()->getNode());
} elseif ($event instanceof ShareDeletedEvent) {
// In case the unsharing happens in a background job, we don't have
// a session and we load instead the user from the UserManager
$owner = $event->getShare()->getNode()->getOwner();
$this->getUpdate($owner)->postUnshared($event->getShare()->getNode());
try {
// In case the unsharing happens in a background job, we don't have
// a session and we load instead the user from the UserManager
$owner = $this->userManager->get($event->getShare()->getShareOwner());
$this->getUpdate($owner)->postUnshared($event->getShare()->getNode());
} catch (NotFoundException $e) {
/* The node was deleted already, nothing to update */
}
} elseif ($event instanceof NodeRestoredEvent) {
$this->getUpdate()->postRestore($event->getTarget());
}
Expand All @@ -78,7 +85,7 @@ private function getUpdate(?IUser $owner = null): Update {
$this->updater = new Update(
new Util(
new View(),
\OC::$server->getUserManager(),
$this->userManager,
\OC::$server->getGroupManager(),
\OC::$server->getConfig()),
\OC::$server->getEncryptionManager(),
Expand Down
Loading