Skip to content

[stable19] LDAP: fix null where IUser is expected in update groups background job #23844

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-nextcloud wants to merge 2 commits into from
Closed

[stable19] LDAP: fix null where IUser is expected in update groups background job #23844

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a866b2b
adds unit test for updategroups background job
blizzz Oct 30, 2020
baf61ab
fix potentially passing null to events where IUser is expected
blizzz Oct 30, 2020
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
fix potentially passing null to events where IUser is expected 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
  • Loading branch information
@blizzz @backportbot
blizzz authored and backportbot[bot] committed Nov 2, 2020
commit baf61ab856e3a8ccfc4b91e6627d43ffa1426eb5
9 changes: 7 additions & 2 deletions apps/user_ldap/lib/Jobs/UpdateGroups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IUser;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -120,7 +121,9 @@ private static function handleKnownGroups($groups) {
$groupObject = $this->groupManager->get($group);
foreach (array_diff($knownUsers, $actualUsers) as $removedUser) {
$userObject = $this->userManager->get($removedUser);
$this->dispatcher->dispatchTyped(new UserRemovedEvent($groupObject, $userObject));
if ($userObject instanceof IUser) {
$this->dispatcher->dispatchTyped(new UserRemovedEvent($groupObject, $userObject));
}
$this->logger->info(
'bgJ "updateGroups" – {user} removed from {group}',
[
Expand All @@ -133,7 +136,9 @@ private static function handleKnownGroups($groups) {
}
foreach (array_diff($actualUsers, $knownUsers) as $addedUser) {
$userObject = $this->userManager->get($addedUser);
$this->dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
if ($userObject instanceof IUser) {
$this->dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
}
$this->logger->info(
'bgJ "updateGroups" – {user} added to {group}',
[
Expand Down