mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make user:report command scale 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-05-25 13:03:29 +02:00 committed by backportbot[bot]
parent b4c3e8dbc8
commit d25446fd58
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/Command/User/Report.php
View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, ownCloud, Inc.
* *
@ -27,40 +29,49 @@
namespace OC\Core\Command\User; namespace OC\Core\Command\User;
use OC\Files\View;
use OCP\IConfig; use OCP\IConfig;
use OCP\IUserManager; use OCP\IUserManager;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
class Report extends Command { class Report extends Command {
public const DEFAULT_COUNT_DIRS_MAX_USERS = 500;
/** @var IUserManager */ /** @var IUserManager */
protected $userManager; protected $userManager;
/** @var IConfig */ /** @var IConfig */
private $config; private $config;
/** public function __construct(IUserManager $userManager,
* @param IUserManager $userManager IConfig $config) {
*/
public function __construct(IUserManager $userManager, IConfig $config) {
$this->userManager = $userManager; $this->userManager = $userManager;
$this->config = $config; $this->config = $config;
parent::__construct(); parent::__construct();
} }
protected function configure() { protected function configure(): void {
$this $this
->setName('user:report') ->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 { protected function execute(InputInterface $input, OutputInterface $output): int {
$table = new Table($output); $table = new Table($output);
$table->setHeaders(['User Report', '']); $table->setHeaders(['User Report', '']);
$userCountArray = $this->countUsers(); $userCountArray = $this->countUsers();
$total = 0;
if (!empty($userCountArray)) { if (!empty($userCountArray)) {
$total = 0;
$rows = []; $rows = [];
foreach ($userCountArray as $classname => $users) { foreach ($userCountArray as $classname => $users) {
$total += $users; $total += $users;
@ -72,10 +83,12 @@ class Report extends Command {
} else { } else {
$rows[] = ['No backend enabled that supports user counting', '']; $rows[] = ['No backend enabled that supports user counting', ''];
} }
$userDirectoryCount = $this->countUserDirectories();
$rows[] = [' ']; $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'); $disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
$disabledUsersCount = count($disabledUsers); $disabledUsersCount = count($disabledUsers);
@ -86,12 +99,12 @@ class Report extends Command {
return 0; return 0;
} }
private function countUsers() { private function countUsers(): array {
return $this->userManager->countUsers(); return $this->userManager->countUsers();
} }
private function countUserDirectories() { private function countUserDirectories(): int {
$dataview = new \OC\Files\View('/'); $dataview = new View('/');
$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory'); $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
return count($userDirectories); return count($userDirectories);
} }