diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-05-26 15:18:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-26 15:18:41 +0200 |
commit | 8b0ce8c8a192eea10b9ac3fa58ec624d6c9712a5 (patch) | |
tree | 7af0494b8f85a7a830c9188b42f7b210955ce79e /core/Command | |
parent | 903b99bd9310c7255d4ea339c79a52a779f1a7cc (diff) | |
parent | f9b407d0c94cafc5ed0c3beb7d4ea2c4f4e8437b (diff) | |
download | nextcloud-server-8b0ce8c8a192eea10b9ac3fa58ec624d6c9712a5.tar.gz nextcloud-server-8b0ce8c8a192eea10b9ac3fa58ec624d6c9712a5.zip |
Merge pull request #27099 from nextcloud/bugfix/noid/make-user-report-scale
Diffstat (limited to 'core/Command')
-rw-r--r-- | core/Command/User/Report.php | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php index 66bc9bd3de1..b537884d9d6 100644 --- a/core/Command/User/Report.php +++ b/core/Command/User/Report.php @@ -1,4 +1,6 @@ <?php + +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -27,40 +29,49 @@ namespace OC\Core\Command\User; +use OC\Files\View; use OCP\IConfig; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Report extends Command { + public const DEFAULT_COUNT_DIRS_MAX_USERS = 500; + /** @var IUserManager */ protected $userManager; /** @var IConfig */ private $config; - /** - * @param IUserManager $userManager - */ - public function __construct(IUserManager $userManager, IConfig $config) { + public function __construct(IUserManager $userManager, + IConfig $config) { $this->userManager = $userManager; $this->config = $config; parent::__construct(); } - protected function configure() { + protected function configure(): void { $this ->setName('user:report') - ->setDescription('shows how many users have access'); + ->setDescription('shows how many users have access') + ->addOption( + 'count-dirs', + null, + InputOption::VALUE_NONE, + 'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with ' . self::DEFAULT_COUNT_DIRS_MAX_USERS . '+ users)' + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int { $table = new Table($output); $table->setHeaders(['User Report', '']); $userCountArray = $this->countUsers(); + $total = 0; if (!empty($userCountArray)) { - $total = 0; $rows = []; foreach ($userCountArray as $classname => $users) { $total += $users; @@ -72,10 +83,12 @@ class Report extends Command { } else { $rows[] = ['No backend enabled that supports user counting', '']; } - - $userDirectoryCount = $this->countUserDirectories(); $rows[] = [' ']; - $rows[] = ['user directories', $userDirectoryCount]; + + if ($total <= self::DEFAULT_COUNT_DIRS_MAX_USERS || $input->getOption('count-dirs')) { + $userDirectoryCount = $this->countUserDirectories(); + $rows[] = ['user directories', $userDirectoryCount]; + } $disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false'); $disabledUsersCount = count($disabledUsers); @@ -86,12 +99,12 @@ class Report extends Command { return 0; } - private function countUsers() { + private function countUsers(): array { return $this->userManager->countUsers(); } - private function countUserDirectories() { - $dataview = new \OC\Files\View('/'); + private function countUserDirectories(): int { + $dataview = new View('/'); $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory'); return count($userDirectories); } |