Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/user_ldap/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
'OCA\\User_LDAP\\Exceptions\\NoMoreResults' => $baseDir . '/../lib/Exceptions/NoMoreResults.php',
'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
'OCA\\User_LDAP\\FirstLoginListener' => $baseDir . '/../lib/FirstLoginListener.php',
'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
Expand Down
1 change: 1 addition & 0 deletions apps/user_ldap/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class ComposerStaticInitUser_LDAP
'OCA\\User_LDAP\\Exceptions\\NoMoreResults' => __DIR__ . '/..' . '/../lib/Exceptions/NoMoreResults.php',
'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__ . '/..' . '/../lib/Exceptions/NotOnLDAP.php',
'OCA\\User_LDAP\\FilesystemHelper' => __DIR__ . '/..' . '/../lib/FilesystemHelper.php',
'OCA\\User_LDAP\\FirstLoginListener' => __DIR__ . '/..' . '/../lib/FirstLoginListener.php',
'OCA\\User_LDAP\\GroupPluginManager' => __DIR__ . '/..' . '/../lib/GroupPluginManager.php',
'OCA\\User_LDAP\\Group_LDAP' => __DIR__ . '/..' . '/../lib/Group_LDAP.php',
'OCA\\User_LDAP\\Group_Proxy' => __DIR__ . '/..' . '/../lib/Group_Proxy.php',
Expand Down
4 changes: 2 additions & 2 deletions apps/user_ldap/composer/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '9915dc6785d1660068a51604f9379e8b1dc1418c',
'reference' => 'ea2afb2f9458fd17e8b474c4d7a283fdd8e5880d',
'name' => '__root__',
'dev' => false,
),
Expand All @@ -16,7 +16,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '9915dc6785d1660068a51604f9379e8b1dc1418c',
'reference' => 'ea2afb2f9458fd17e8b474c4d7a283fdd8e5880d',
'dev_requirement' => false,
),
),
Expand Down
15 changes: 12 additions & 3 deletions apps/user_ldap/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@
use OCA\User_LDAP\Controller\RenewPasswordController;
use OCA\User_LDAP\Events\GroupBackendRegistered;
use OCA\User_LDAP\Events\UserBackendRegistered;
use OCA\User_LDAP\Group_Proxy;
use OCA\User_LDAP\FirstLoginListener;
use OCA\User_LDAP\GroupPluginManager;
use OCA\User_LDAP\Group_Proxy;
use OCA\User_LDAP\Handler\ExtStorageConfigHandler;
use OCA\User_LDAP\Helper;
use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\Notification\Notifier;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\UserPluginManager;
use OCA\User_LDAP\User_Proxy;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
Expand All @@ -50,6 +51,7 @@
use OCP\IL10N;
use OCP\IServerContainer;
use OCP\Notification\IManager as INotificationManager;
use OCP\User\Events\PostLoginEvent;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;

class Application extends App implements IBootstrap {
Expand Down Expand Up @@ -87,6 +89,7 @@ public function __construct() {

public function register(IRegistrationContext $context): void {
$context->registerNotifierService(Notifier::class);
$context->registerEventListener(PostLoginEvent::class, FirstLoginListener::class);
}

public function boot(IBootContext $context): void {
Expand Down Expand Up @@ -124,9 +127,15 @@ public function boot(IBootContext $context): void {
'\OCA\User_LDAP\Helper',
'loginName2UserName'
);
\OCP\Util::connectHook(
'\OC\User',
'assignedUserId',
FirstLoginListener::class,
'onAssignedId'
);
}

private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) {
private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher): void {
$dispatcher->addListener(
'OCA\\Files_External::loadAdditionalBackends',
function () use ($appContainer) {
Expand Down
173 changes: 173 additions & 0 deletions apps/user_ldap/lib/FirstLoginListener.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2022, Côme Chilliet <[email protected]>
*
* @author Côme Chilliet <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\User_LDAP;

use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\EventDispatcher\IEventListener;
use OCP\Group\Events\UserAddedEvent;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserManager;
use OCP\User\Events\PostLoginEvent;
use Psr\Log\LoggerInterface;

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

/** @var Group_Proxy */
private $groupBackend;
/** @var IEventDispatcher */
private $dispatcher;
/** @var IGroupManager */
private $groupManager;
/** @var IUserManager */
private $userManager;
/** @var LoggerInterface */
private $logger;
/** @var IDBConnection */
private $dbc;

public function __construct(
Group_Proxy $groupBackend,
IEventDispatcher $dispatcher,
IGroupManager $groupManager,
IUserManager $userManager,
LoggerInterface $logger,
IDBConnection $dbc
) {
$this->groupBackend = $groupBackend;
$this->dispatcher = $dispatcher;
$this->groupManager = $groupManager;
$this->userManager = $userManager;
$this->logger = $logger;
$this->dbc = $dbc;
}

public function handle(Event $event): void {
if ($event instanceof PostLoginEvent) {
$this->onPostLogin($event->getUser()->getUID());
}
}

public function onAssignedId(string $username): void {
$this->logger->info(
__CLASS__ . ' – {user} assignedId',
[
'app' => 'user_ldap',
'user' => $username,
]
);
$this->eventHappened[$username]['id'] = 1;
$this->triggerUpdateGroups($username);
}

public function onPostLogin(string $username): void {
$this->logger->info(
__CLASS__ . ' – {user} postLogin',
[
'app' => 'user_ldap',
'user' => $username,
]
);
$this->eventHappened[$username]['login'] = 1;
$this->triggerUpdateGroups($username);
}

private function triggerUpdateGroups(string $username): void {
if (array_sum($this->eventHappened[$username] ?? []) >= 2) {
$this->updateGroups($username);
}
}

private function updateGroups(string $username): void {
$this->logger->info(
__CLASS__ . ' – {user} updateGroups',
[
'app' => 'user_ldap',
'user' => $username,
]
);
$groups = $this->groupBackend->getUserGroups($username);

$qb = $this->dbc->getQueryBuilder();
$qb->select(['owncloudusers'])
->from('ldap_group_members')
->where($qb->expr()->eq('owncloudname', $qb->createParameter('groupId')));

$qbUpdate = $this->dbc->getQueryBuilder();
$qbUpdate->update('ldap_group_members')
->set('owncloudusers', $qb->createParameter('members'))
->where($qb->expr()->eq('owncloudname', $qb->createParameter('groupId')));

foreach ($groups as $group) {
$qb->setParameters([
'groupId' => $group
]);

$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) {
$this->dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
$this->logger->info(
__CLASS__ . ' – {user} added to {group}',
[
'app' => 'user_ldap',
'user' => $username,
'group' => $group
]
);
$qbUpdate->setParameters([
'members' => serialize(array_merge($knownUsers, [$username])),
'groupId' => $group
]);
$qbUpdate->executeStatement();
}
}
}
}
}