diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index b618d2a203..46bff54cb1 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -47,6 +47,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
OCA\User_LDAP\Command\CheckUser
OCA\User_LDAP\Command\CreateEmptyConfig
OCA\User_LDAP\Command\DeleteConfig
+ OCA\User_LDAP\Command\ResetUser
OCA\User_LDAP\Command\Search
OCA\User_LDAP\Command\SetConfig
OCA\User_LDAP\Command\ShowConfig
diff --git a/apps/user_ldap/composer/composer/autoload_classmap.php b/apps/user_ldap/composer/composer/autoload_classmap.php
index c29f633cda..509738674a 100644
--- a/apps/user_ldap/composer/composer/autoload_classmap.php
+++ b/apps/user_ldap/composer/composer/autoload_classmap.php
@@ -14,6 +14,7 @@ return array(
'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php',
'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php',
'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php',
+ 'OCA\\User_LDAP\\Command\\ResetUser' => $baseDir . '/../lib/Command/ResetUser.php',
'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php',
'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php',
'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php',
diff --git a/apps/user_ldap/composer/composer/autoload_static.php b/apps/user_ldap/composer/composer/autoload_static.php
index 090147bfb4..fc8b068587 100644
--- a/apps/user_ldap/composer/composer/autoload_static.php
+++ b/apps/user_ldap/composer/composer/autoload_static.php
@@ -29,6 +29,7 @@ class ComposerStaticInitUser_LDAP
'OCA\\User_LDAP\\Command\\CheckUser' => __DIR__ . '/..' . '/../lib/Command/CheckUser.php',
'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => __DIR__ . '/..' . '/../lib/Command/CreateEmptyConfig.php',
'OCA\\User_LDAP\\Command\\DeleteConfig' => __DIR__ . '/..' . '/../lib/Command/DeleteConfig.php',
+ 'OCA\\User_LDAP\\Command\\ResetUser' => __DIR__ . '/..' . '/../lib/Command/ResetUser.php',
'OCA\\User_LDAP\\Command\\Search' => __DIR__ . '/..' . '/../lib/Command/Search.php',
'OCA\\User_LDAP\\Command\\SetConfig' => __DIR__ . '/..' . '/../lib/Command/SetConfig.php',
'OCA\\User_LDAP\\Command\\ShowConfig' => __DIR__ . '/..' . '/../lib/Command/ShowConfig.php',
diff --git a/apps/user_ldap/lib/Command/ResetUser.php b/apps/user_ldap/lib/Command/ResetUser.php
new file mode 100644
index 0000000000..2daccdb6dc
--- /dev/null
+++ b/apps/user_ldap/lib/Command/ResetUser.php
@@ -0,0 +1,112 @@
+
+ *
+ * @author Arthur Schiwon
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\User_LDAP\Command;
+
+use OCA\User_LDAP\User\DeletedUsersIndex;
+use OCA\User_LDAP\User_Proxy;
+use OCA\User_LDAP\UserPluginManager;
+use OCP\IUser;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+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 Symfony\Component\Console\Question\Question;
+
+class ResetUser extends Command {
+ /** @var DeletedUsersIndex */
+ protected $dui;
+ /** @var IUserManager */
+ private $userManager;
+ /** @var UserPluginManager */
+ private $pluginManager;
+
+ public function __construct(
+ DeletedUsersIndex $dui,
+ IUserManager $userManager,
+ UserPluginManager $pluginManager
+ ) {
+ $this->dui = $dui;
+ $this->userManager = $userManager;
+ $this->pluginManager = $pluginManager;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('ldap:reset-user')
+ ->setDescription('deletes an LDAP user independent of the user state')
+ ->addArgument(
+ 'uid',
+ InputArgument::REQUIRED,
+ 'the user id as used in Nextcloud'
+ )
+ ->addOption(
+ 'yes',
+ 'y',
+ InputOption::VALUE_NONE,
+ 'do not ask for confirmation'
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output): int {
+ try {
+ $uid = $input->getArgument('uid');
+ $user = $this->userManager->get($uid);
+ if (!$user instanceof IUser) {
+ throw new \Exception('User not found');
+ }
+ $backend = $user->getBackend();
+ if (!$backend instanceof User_Proxy) {
+ throw new \Exception('The given user is not a recognized LDAP user.');
+ }
+ if ($input->getOption('yes') === false) {
+ /** @var QuestionHelper $helper */
+ $helper = $this->getHelper('question');
+ $q = new Question('Delete all local data of this user (y|N)? ');
+ $input->setOption('yes', $helper->ask($input, $output, $q) === 'y');
+ }
+ if ($input->getOption('yes') !== true) {
+ throw new \Exception('Reset cancelled by operator');
+ }
+
+ $this->dui->markUser($uid);
+ $pluginManagerSuppressed = $this->pluginManager->setSuppressDeletion(true);
+ if ($user->delete()) {
+ $this->pluginManager->setSuppressDeletion($pluginManagerSuppressed);
+ return 0;
+ }
+ } catch (\Throwable $e) {
+ if (isset($pluginManagerSuppressed)) {
+ $this->pluginManager->setSuppressDeletion($pluginManagerSuppressed);
+ }
+ $output->writeln('' . $e->getMessage() . '');
+ return 1;
+ }
+ $output->writeln('Error while resetting user');
+ return 2;
+ }
+}
diff --git a/apps/user_ldap/lib/UserPluginManager.php b/apps/user_ldap/lib/UserPluginManager.php
index 2d99d88760..fdc08d3d38 100644
--- a/apps/user_ldap/lib/UserPluginManager.php
+++ b/apps/user_ldap/lib/UserPluginManager.php
@@ -28,8 +28,6 @@ namespace OCA\User_LDAP;
use OC\User\Backend;
class UserPluginManager {
- public $test = false;
-
private $respondToActions = 0;
private $which = [
@@ -43,6 +41,9 @@ class UserPluginManager {
'deleteUser' => null
];
+ /** @var bool */
+ private $suppressDeletion = false;
+
/**
* @return int All implemented actions, except for 'deleteUser'
*/
@@ -192,7 +193,7 @@ class UserPluginManager {
* @return bool
*/
public function canDeleteUser() {
- return $this->which['deleteUser'] !== null;
+ return !$this->suppressDeletion && $this->which['deleteUser'] !== null;
}
/**
@@ -203,8 +204,21 @@ class UserPluginManager {
public function deleteUser($uid) {
$plugin = $this->which['deleteUser'];
if ($plugin) {
+ if ($this->suppressDeletion) {
+ return false;
+ }
return $plugin->deleteUser($uid);
}
throw new \Exception('No plugin implements deleteUser in this LDAP Backend.');
}
+
+ /**
+ * @param bool $value
+ * @return bool – the value before the change
+ */
+ public function setSuppressDeletion(bool $value): bool {
+ $old = $this->suppressDeletion;
+ $this->suppressDeletion = $value;
+ return $old;
+ }
}