Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable21] Make user:report command scale #27318

Merged
merged 1 commit into from
Jun 1, 2021
Merged

[stable21] Make user:report command scale #27318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions core/Command/User/Report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
Expand Down Expand Up @@ -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;
Expand All @@ -72,10 +83,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
} 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);
Expand All @@ -86,12 +99,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
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);
}
Expand Down