Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2021-03-12 01:23:55 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2021-03-25 15:36:16 +0300
commitd78b2133103068fc5f74d06e4764407ac36ecbe2 (patch)
tree1df836b67a160ef89e2504ba610355ee53d4336f /apps/user_ldap
parentf6cbda9e60bc95b5485717ae0934842a4149290c (diff)
adds ldap user:reset command
- allows to delete data of existing LDAP users, which otherwise is safe guarded - ensures that the user is not being deleted on LDAP through a plugin Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap')
-rw-r--r--apps/user_ldap/appinfo/register_command.php9
-rw-r--r--apps/user_ldap/composer/composer/autoload_classmap.php1
-rw-r--r--apps/user_ldap/composer/composer/autoload_static.php1
-rw-r--r--apps/user_ldap/lib/Command/ResetUser.php112
-rw-r--r--apps/user_ldap/lib/UserPluginManager.php20
5 files changed, 139 insertions, 4 deletions
diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php
index cdfc6fd9b16..fc8f6eba5bc 100644
--- a/apps/user_ldap/appinfo/register_command.php
+++ b/apps/user_ldap/appinfo/register_command.php
@@ -30,6 +30,8 @@ use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User\DeletedUsersIndex;
+use OCA\User_LDAP\UserPluginManager;
+use OCP\IUserManager;
$dbConnection = \OC::$server->getDatabaseConnection();
$userMapping = new UserMapping($dbConnection);
@@ -41,7 +43,7 @@ $uBackend = new User_Proxy(
$ocConfig,
\OC::$server->getNotificationManager(),
\OC::$server->getUserSession(),
- \OC::$server->query(\OCA\User_LDAP\UserPluginManager::class)
+ \OC::$server->query(UserPluginManager::class)
);
$deletedUsersIndex = new DeletedUsersIndex(
$ocConfig, $dbConnection, $userMapping
@@ -52,6 +54,11 @@ $application->add(new OCA\User_LDAP\Command\SetConfig());
$application->add(new OCA\User_LDAP\Command\TestConfig());
$application->add(new OCA\User_LDAP\Command\CreateEmptyConfig($helper));
$application->add(new OCA\User_LDAP\Command\DeleteConfig($helper));
+$application->add(new OCA\User_LDAP\Command\ResetUser(
+ $deletedUsersIndex,
+ \OC::$server->get(IUserManager::class),
+ \OC::$server->get(UserPluginManager::class)
+));
$application->add(new OCA\User_LDAP\Command\Search($ocConfig));
$application->add(new OCA\User_LDAP\Command\ShowRemnants(
$deletedUsersIndex, \OC::$server->getDateTimeFormatter())
diff --git a/apps/user_ldap/composer/composer/autoload_classmap.php b/apps/user_ldap/composer/composer/autoload_classmap.php
index 465c577f869..4e77ab6b817 100644
--- a/apps/user_ldap/composer/composer/autoload_classmap.php
+++ b/apps/user_ldap/composer/composer/autoload_classmap.php
@@ -13,6 +13,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 4760607713c..6a510b972ee 100644
--- a/apps/user_ldap/composer/composer/autoload_static.php
+++ b/apps/user_ldap/composer/composer/autoload_static.php
@@ -28,6 +28,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 00000000000..2daccdb6dcc
--- /dev/null
+++ b/apps/user_ldap/lib/Command/ResetUser.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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\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('<error>' . $e->getMessage() . '</error>');
+ return 1;
+ }
+ $output->writeln('<error>Error while resetting user</error>');
+ return 2;
+ }
+}
diff --git a/apps/user_ldap/lib/UserPluginManager.php b/apps/user_ldap/lib/UserPluginManager.php
index 2d99d887604..fdc08d3d38b 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;
+ }
}