Groups for occ command and UI testing

core/Command/Group/Add.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * @author Phil Davis <phil@jankaritech.com>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OCP\IGroupManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class Add extends Command {
+	/** @var \OCP\IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IGroupManager $groupManager) {
+		parent::__construct();
+		$this->groupManager = $groupManager;
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:add')
+			->setDescription('adds a group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'Name of the group'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$groupName = $input->getArgument('group');
+		$group = $this->groupManager->get($groupName);
+		if (!$group) {
+			$this->groupManager->createGroup($groupName);
+			$group = $this->groupManager->get($groupName);
+			if ($group) {
+				$output->writeln('<info>Created group "' . $group->getGID() . '"</info>');
+			} else {
+				$output->writeln('<error>Group "' . $groupName . '" could not be created</error>');
+				return 1;
+			}
+		} else {
+			$output->writeln('<error>The group "' . $group->getGID() . '" already exists</error>');
+			return 1;
+		}
+	}
+}

core/Command/Group/AddMember.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * @author Phil Davis <phil@jankaritech.com>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class AddMember extends Command {
+	/** @var \OCP\IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IGroupManager $groupManager, IUserManager $userManager) {
+		parent::__construct();
+		$this->groupManager = $groupManager;
+		$this->userManager = $userManager;
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:addmember')
+			->setDescription('add members to a group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'Name of the group'
+			)
+			->addOption(
+				'member',
+				'm',
+				InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+				'member that should be added to the group'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$groupName = $input->getArgument('group');
+		$group = $this->groupManager->get($groupName);
+		if (!$group) {
+			$output->writeln('<error>Group "' . $groupName . '" does not exist</error>');
+			return 1;
+		}
+
+		$members = $input->getOption('member');
+
+		if (!count($members)) {
+			$output->writeln('<error>No members specified</error>');
+			return 1;
+		}
+
+		$memberExistsError = false;
+
+		foreach ($members as $userName) {
+			$user = $this->userManager->get($userName);
+			if ($user) {
+				if ($group->inGroup($user)) {
+					$output->writeln('<info>User "' . $user->getUID() . '" is already a member of group "' . $group->getGID() . '"</info>');
+				} else {
+					$group->addUser($user);
+					$output->writeln('<info>User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"</info>');
+				}
+			} else {
+				$output->writeln('<error>User "' . $userName . '" could not be found - not added to group "' . $group->getGID() . '"</error>');
+				$memberExistsError = true;
+			}
+		}
+
+		if ($memberExistsError) {
+			return 1;
+		}
+	}
+}

core/Command/Group/Delete.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * @author Phil Davis <phil@jankaritech.com>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OCP\IGroupManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class Delete extends Command {
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IGroupManager $groupManager) {
+		$this->groupManager = $groupManager;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:delete')
+			->setDescription('deletes the specified group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'the group name'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$groupName = $input->getArgument('group');
+		$group = $this->groupManager->get($groupName);
+		if (is_null($group)) {
+			$output->writeln('<error>Group does not exist</error>');
+			return 1;
+		}
+
+		if ($group->delete()) {
+			$output->writeln('<info>The specified group was deleted</info>');
+			return;
+		}
+
+		$output->writeln('<error>The specified group could not be deleted. Please check the logs.</error>');
+		return 1;
+	}
+}

core/Command/Group/RemoveMember.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * @author Phil Davis <phil@jankaritech.com>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class RemoveMember extends Command {
+	/** @var \OCP\IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IGroupManager $groupManager, IUserManager $userManager) {
+		parent::__construct();
+		$this->groupManager = $groupManager;
+		$this->userManager = $userManager;
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:removemember')
+			->setDescription('remove member(s) from a group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'Name of the group'
+			)
+			->addOption(
+				'member',
+				'm',
+				InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+				'member that should be removed from the group'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$groupName = $input->getArgument('group');
+		$group = $this->groupManager->get($groupName);
+		if (!$group) {
+			$output->writeln('<error>Group "' . $groupName . '" does not exist</error>');
+			return 1;
+		}
+
+		$members = $input->getOption('member');
+
+		if (!count($members)) {
+			$output->writeln('<error>No members specified</error>');
+			return 1;
+		}
+
+		$memberExistsError = false;
+
+		foreach ($members as $userName) {
+			$user = $this->userManager->get($userName);
+			if ($user) {
+				if ($group->inGroup($user)) {
+					$group->removeUser($user);
+					$output->writeln('<info>Member "' . $user->getUID() . '" removed from group "' . $group->getGID() . '"</info>');
+				} else {
+					$output->writeln('<info>Member "' . $userName . '" could not be found in group "' . $group->getGID() . '"</info>');
+				}
+			} else {
+				$output->writeln('<error>Member "' . $userName . '" does not exist - not removed from group "' . $group->getGID() . '"</error>');
+				$memberExistsError = true;
+			}
+		}
+
+		if ($memberExistsError) {
+			return 1;
+		}
+	}
+}

core/Command/User/Delete.php

@@ -57,7 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$user = $this->userManager->get($input->getArgument('uid'));
 		if (is_null($user)) {
 			$output->writeln('<error>User does not exist</error>');
-			return;
+			return 1;
 		}
 
 		if ($user->delete()) {
@@ -66,5 +66,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		}
 
 		$output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
+		return 1;
 	}
 }

core/register_command.php

@@ -145,6 +145,11 @@
 	$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
 	$application->add(new OC\Core\Command\User\SyncBackend(\OC::$server->getAccountMapper(), \OC::$server->getConfig(), \OC::$server->getUserManager(), \OC::$server->getLogger()));
 
+	$application->add(new OC\Core\Command\Group\Add(\OC::$server->getGroupManager()));
+	$application->add(new OC\Core\Command\Group\Delete(\OC::$server->getGroupManager()));
+	$application->add(new OC\Core\Command\Group\AddMember(\OC::$server->getGroupManager(), \OC::$server->getUserManager()));
+	$application->add(new OC\Core\Command\Group\RemoveMember(\OC::$server->getGroupManager(), \OC::$server->getUserManager()));
+
 	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
 	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
 	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));