Skip to content

[stable18] fix potentially passing null to events where IUser is expected #23896

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
MorrisJobke merged 1 commit into from
Nov 4, 2020
Merged

[stable18] fix potentially passing null to events where IUser is expected #23896

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
fix potentially passing null to events where IUser is expected 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Nov 4, 2020
commit 44967e5b128e1601c8e7c5ace61eb0e91f80141e
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 @@ -46,6 +46,7 @@
use OCP\Group\Events\UserAddedEvent;
use OCP\Group\Events\UserRemovedEvent;
use OCP\ILogger;
use OCP\IUser;

class UpdateGroups extends \OC\BackgroundJob\TimedJob {
static private $groupsFromDB;
Expand Down Expand Up @@ -115,15 +116,19 @@ static private function handleKnownGroups($groups) {
$groupObject = $groupManager->get($group);
foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
$userObject = $userManager->get($removedUser);
$dispatcher->dispatchTyped(new UserRemovedEvent($groupObject, $userObject));
if ($userObject instanceof IUser) {
$dispatcher->dispatchTyped(new UserRemovedEvent($groupObject, $userObject));
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
ILogger::INFO);
$hasChanged = true;
}
foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
$userObject = $userManager->get($addedUser);
$dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
if ($userObject instanceof IUser) {
$dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
ILogger::INFO);
Expand Down