Skip to content

[stable31] fix(encryption): Do not register user key related event listeners #53520

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
AndyScherzinger merged 1 commit into from
Jun 17, 2025
Merged

[stable31] fix(encryption): Do not register user key related event listeners #53520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions apps/encryption/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,12 @@ public function setUp(IManager $encryptionManager) {
}
}

public function registerEventListeners(IConfig $config, IEventDispatcher $eventDispatcher, IManager $encryptionManager): void {
public function registerEventListeners(
IConfig $config,
IEventDispatcher $eventDispatcher,
IManager $encryptionManager,
Util $util,
): void {
if (!$encryptionManager->isEnabled()) {
return;
}
Expand All @@ -84,18 +89,23 @@ public function registerEventListeners(IConfig $config, IEventDispatcher $eventD
}

// No maintenance so register all events
$eventDispatcher->addServiceListener(UserCreatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(BeforePasswordUpdatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(BeforePasswordResetEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(PasswordResetEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(UserLoggedInEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(UserLoggedInWithCookieEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(UserLoggedOutEvent::class, UserEventsListener::class);
if (!$util->isMasterKeyEnabled()) {
// Only make sense if no master key is used
$eventDispatcher->addServiceListener(UserCreatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(BeforePasswordUpdatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(BeforePasswordResetEvent::class, UserEventsListener::class);
$eventDispatcher->addServiceListener(PasswordResetEvent::class, UserEventsListener::class);
}
}

public function registerEncryptionModule(IManager $encryptionManager) {
public function registerEncryptionModule(
IManager $encryptionManager,
) {
$container = $this->getContainer();

$encryptionManager->registerEncryptionModule(
Expand Down
5 changes: 5 additions & 0 deletions apps/encryption/lib/Services/PassphraseService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public function setPassphraseForUser(string $userId, string $password, ?string $
return true;
}

if ($this->util->isMasterKeyEnabled()) {
$this->logger->error('setPassphraseForUser should never be called when master key is enabled');
return true;
}

// Check user exists on backend
$user = $this->userManager->get($userId);
if ($user === null) {
Expand Down
Loading