Skip to content

Fire group membership events from LDAP at login #40367

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
come-nc merged 7 commits into from
Oct 16, 2023
Merged

Fire group membership events from LDAP at login #40367

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
474b5e1
Add FirstLoginListener to accept shares upon first ldap user login
come-nc Jan 6, 2022
2e52e39
Use a standard array for the stateful cache
come-nc Feb 10, 2022
4f20488
Move event listener registration to register()
come-nc Feb 10, 2022
6e38cb1
Add logging to be able to debug FirstLoginListener
come-nc Feb 14, 2022
800b1b7
Fire group events at login for LDAP groups
come-nc Feb 14, 2022
05efbf1
Fix LDAP LoginListener by adding new group relationships to caches be…
come-nc Sep 12, 2023
500374a
Fix registerEventListener signature
come-nc Sep 12, 2023
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
Use a standard array for the stateful cache 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Oct 12, 2023
commit 2e52e39aff4426cd62c02b8c2262e39e51fd622e
24 changes: 18 additions & 6 deletions apps/user_ldap/lib/FirstLoginListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
use Psr\Log\LoggerInterface;

class FirstLoginListener implements IEventListener {
protected $somekindofstatefulhandler;
/** @var array<string,array<string, int>> */
private $eventHappened = [];

/** @var Group_Proxy */
private $groupBackend;
Expand Down Expand Up @@ -75,17 +76,17 @@ public function handle(Event $event): void {
}

public function onAssignedId(string $username): void {
$this->somekindofstatefulhandler[$username]['id'] = 1;
$this->eventHappened[$username]['id'] = 1;
$this->triggerUpdateGroups($username);
}

public function onPostLogin(string $username): void {
$this->somekindofstatefulhandler[$username]['login'] = 1;
$this->eventHappened[$username]['login'] = 1;
$this->triggerUpdateGroups($username);
}

private function triggerUpdateGroups(string $username): void {
if (array_sum($this->somekindofstatefulhandler[$username] ?? []) >= 2) {
if (array_sum($this->eventHappened[$username] ?? []) >= 2) {
$this->updateGroups($username);
}
}
Expand All @@ -108,14 +109,25 @@ private function updateGroups(string $username): void {
'groupId' => $group
]);

$qResult = $qb->execute();
$qResult = $qb->executeQuery();
$data = $qResult->fetchOne();
$qResult->closeCursor();

$knownUsers = unserialize($data['owncloudusers']);
$hasChanged = false;

$groupObject = $this->groupManager->get($group);
if ($groupObject === null) {
$this->logger->error(
__CLASS__ . ' – group {group} could not be found (user {user})',
[
'app' => 'user_ldap',
'user' => $username,
'group' => $group
]
);
continue;
}
if (!in_array($username, $knownUsers)) {
$userObject = $this->userManager->get($username);
if ($userObject instanceof IUser) {
Expand All @@ -132,7 +144,7 @@ private function updateGroups(string $username): void {
'members' => serialize(array_merge($knownUsers, [$username])),
'groupId' => $group
]);
$qbUpdate->execute();
$qbUpdate->executeStatement();
}
}
}
Expand Down