From 40c9a743fa6ee30f33cf6a7d33a5fa10b2c2d532 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 18 Jul 2019 14:30:43 +0200
Subject: [PATCH] adds an --update flag to check-user for manual sync of the
ldap record
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
apps/user_ldap/lib/Command/CheckUser.php | 46 +++++++++++++++++++-----
1 file changed, 38 insertions(+), 8 deletions(-)
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index af2806e8cc6..83bcae37950 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -29,32 +29,31 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-
use OCA\User_LDAP\User\DeletedUsersIndex;
use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\Helper as LDAPHelper;
+use OCA\User_LDAP\Helper;
use OCA\User_LDAP\User_Proxy;
class CheckUser extends Command {
- /** @var \OCA\User_LDAP\User_Proxy */
+ /** @var User_Proxy */
protected $backend;
- /** @var \OCA\User_LDAP\Helper */
+ /** @var Helper */
protected $helper;
- /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+ /** @var DeletedUsersIndex */
protected $dui;
- /** @var \OCA\User_LDAP\Mapping\UserMapping */
+ /** @var UserMapping */
protected $mapping;
/**
* @param User_Proxy $uBackend
- * @param LDAPHelper $helper
+ * @param Helper $helper
* @param DeletedUsersIndex $dui
* @param UserMapping $mapping
*/
- public function __construct(User_Proxy $uBackend, LDAPHelper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
+ public function __construct(User_Proxy $uBackend, Helper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
$this->backend = $uBackend;
$this->helper = $helper;
$this->dui = $dui;
@@ -77,6 +76,12 @@ class CheckUser extends Command {
InputOption::VALUE_NONE,
'ignores disabled LDAP configuration'
)
+ ->addOption(
+ 'update',
+ null,
+ InputOption::VALUE_NONE,
+ 'syncs values from LDAP'
+ )
;
}
@@ -88,6 +93,9 @@ class CheckUser extends Command {
$exists = $this->backend->userExistsOnLDAP($uid);
if($exists === true) {
$output->writeln('The user is still available on LDAP.');
+ if($input->getOption('update')) {
+ $this->updateUser($uid, $output);
+ }
return;
}
@@ -133,4 +141,26 @@ class CheckUser extends Command {
return true;
}
+ private function updateUser(string $uid, OutputInterface $output): void {
+ try {
+ $access = $this->backend->getLDAPAccess($uid);
+ $attrs = $access->userManager->getAttributes();
+ $user = $access->userManager->get($uid);
+ $avatarAttributes = $access->getConnection()->resolveRule('avatar');
+ $result = $access->search('objectclass=*', [$user->getDN()], $attrs, 1, 0);
+ foreach ($result[0] as $attribute => $valueSet) {
+ $output->writeln(' ' . $attribute . ': ');
+ foreach ($valueSet as $value) {
+ if (in_array($attribute, $avatarAttributes)) {
+ $value = '{ImageData}';
+ }
+ $output->writeln(' ' . $value);
+ }
+ }
+ $access->batchApplyUserAttributes($result);
+ } catch (\Exception $e) {
+ $output->writeln('<error>Error while trying to lookup and update attributes from LDAP</error>');
+ }
+ }
+
}
--
GitLab