nextcloud / server

core/Command/User/ResetPassword.php

Indentation +95 added lines, -95 removed lines

@@ -41,99 +41,99 @@
 
 class ResetPassword extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:resetpassword')
-			->setDescription('Resets the password of the named user')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'Username to reset password'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$username = $input->getArgument('user');
-
-		/** @var $user \OCP\IUser */
-		$user = $this->userManager->get($username);
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (\OCP\App::isEnabled('encryption')) {
-				$output->writeln(
-					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
-				);
-
-				$question = new ConfirmationQuestion('Do you want to continue?');
-				if (!$helper->ask($input, $output, $question)) {
-					return 1;
-				}
-			}
-
-			$question = new Question('Enter a new password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			if ($password === null) {
-				$output->writeln("<error>Password cannot be empty!</error>");
-				return 1;
-			}
-
-			$question = new Question('Confirm the new password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
-			return 1;
-		}
-
-
-		try {
-			$success = $user->setPassword($password);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
-		} else {
-			$output->writeln("<error>Error while resetting password!</error>");
-			return 1;
-		}
-		return 0;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:resetpassword')
+            ->setDescription('Resets the password of the named user')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'Username to reset password'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $username = $input->getArgument('user');
+
+        /** @var $user \OCP\IUser */
+        $user = $this->userManager->get($username);
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (\OCP\App::isEnabled('encryption')) {
+                $output->writeln(
+                    '<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
+                );
+
+                $question = new ConfirmationQuestion('Do you want to continue?');
+                if (!$helper->ask($input, $output, $question)) {
+                    return 1;
+                }
+            }
+
+            $question = new Question('Enter a new password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            if ($password === null) {
+                $output->writeln("<error>Password cannot be empty!</error>");
+                return 1;
+            }
+
+            $question = new Question('Confirm the new password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
+            return 1;
+        }
+
+
+        try {
+            $success = $user->setPassword($password);
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($success) {
+            $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+        } else {
+            $output->writeln("<error>Error while resetting password!</error>");
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/User/Report.php

Indentation +45 added lines, -45 removed lines

@@ -34,57 +34,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Report extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:report')
-			->setDescription('shows how many users have access');
-	}
+    protected function configure() {
+        $this
+            ->setName('user:report')
+            ->setDescription('shows how many users have access');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$table = new Table($output);
-		$table->setHeaders(['User Report', '']);
-		$userCountArray = $this->countUsers();
-		if (!empty($userCountArray)) {
-			$total = 0;
-			$rows = [];
-			foreach ($userCountArray as $classname => $users) {
-				$total += $users;
-				$rows[] = [$classname, $users];
-			}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $table = new Table($output);
+        $table->setHeaders(['User Report', '']);
+        $userCountArray = $this->countUsers();
+        if (!empty($userCountArray)) {
+            $total = 0;
+            $rows = [];
+            foreach ($userCountArray as $classname => $users) {
+                $total += $users;
+                $rows[] = [$classname, $users];
+            }
 
-			$rows[] = [' '];
-			$rows[] = ['total users', $total];
-		} else {
-			$rows[] = ['No backend enabled that supports user counting', ''];
-		}
+            $rows[] = [' '];
+            $rows[] = ['total users', $total];
+        } else {
+            $rows[] = ['No backend enabled that supports user counting', ''];
+        }
 
-		$userDirectoryCount = $this->countUserDirectories();
-		$rows[] = [' '];
-		$rows[] = ['user directories', $userDirectoryCount];
+        $userDirectoryCount = $this->countUserDirectories();
+        $rows[] = [' '];
+        $rows[] = ['user directories', $userDirectoryCount];
 
-		$table->setRows($rows);
-		$table->render();
-		return 0;
-	}
+        $table->setRows($rows);
+        $table->render();
+        return 0;
+    }
 
-	private function countUsers() {
-		return $this->userManager->countUsers();
-	}
+    private function countUsers() {
+        return $this->userManager->countUsers();
+    }
 
-	private function countUserDirectories() {
-		$dataview = new \OC\Files\View('/');
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
-		return count($userDirectories);
-	}
+    private function countUserDirectories() {
+        $dataview = new \OC\Files\View('/');
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
+        return count($userDirectories);
+    }
 }

core/Command/Security/ResetBruteforceAttempts.php

Indentation +30 added lines, -30 removed lines

@@ -30,34 +30,34 @@
 
 class ResetBruteforceAttempts extends Base {
 
-	/** @var Throttler */
-	protected $throttler;
-
-	public function __construct(Throttler $throttler) {
-		$this->throttler = $throttler;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:bruteforce:reset')
-			->setDescription('resets bruteforce attemps for given IP address')
-			->addArgument(
-				'ipaddress',
-				InputArgument::REQUIRED,
-				'IP address for which the attempts are to be reset'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$ip = $input->getArgument('ipaddress');
-
-		if (!filter_var($ip, FILTER_VALIDATE_IP)) {
-			$output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
-			return 1;
-		}
-
-		$this->throttler->resetDelayForIP($ip);
-		return 0;
-	}
+    /** @var Throttler */
+    protected $throttler;
+
+    public function __construct(Throttler $throttler) {
+        $this->throttler = $throttler;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:bruteforce:reset')
+            ->setDescription('resets bruteforce attemps for given IP address')
+            ->addArgument(
+                'ipaddress',
+                InputArgument::REQUIRED,
+                'IP address for which the attempts are to be reset'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $ip = $input->getArgument('ipaddress');
+
+        if (!filter_var($ip, FILTER_VALIDATE_IP)) {
+            $output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
+            return 1;
+        }
+
+        $this->throttler->resetDelayForIP($ip);
+        return 0;
+    }
 }

core/Command/Security/RemoveCertificate.php

Indentation +25 added lines, -25 removed lines

@@ -31,29 +31,29 @@
 
 class RemoveCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:certificates:remove')
-			->setDescription('remove trusted certificate')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'the file name of the certificate to remove'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$name = $input->getArgument('name');
-
-		$this->certificateManager->removeCertificate($name);
-		return 0;
-	}
+    /** @var ICertificateManager */
+    protected $certificateManager;
+
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:certificates:remove')
+            ->setDescription('remove trusted certificate')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'the file name of the certificate to remove'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $name = $input->getArgument('name');
+
+        $this->certificateManager->removeCertificate($name);
+        return 0;
+    }
 }

core/Command/Security/ListCertificates.php

Indentation +57 added lines, -57 removed lines

@@ -32,65 +32,65 @@
 
 class ListCertificates extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-	/** @var IL10N */
-	protected $l;
+    /** @var ICertificateManager */
+    protected $certificateManager;
+    /** @var IL10N */
+    protected $l;
 
-	public function __construct(ICertificateManager $certificateManager, IL10N $l) {
-		$this->certificateManager = $certificateManager;
-		$this->l = $l;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager, IL10N $l) {
+        $this->certificateManager = $certificateManager;
+        $this->l = $l;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$outputType = $input->getOption('output');
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
+			$certificates = array_map(function(ICertificate $certificate) {
 				return [
 					'name' => $certificate->getName(),
 					'common_name' => $certificate->getCommonName(),
@@ -79,7 +79,7 @@ 
 				'Issued By'
 			]);
 
-			$rows = array_map(function (ICertificate $certificate) {
+			$rows = array_map(function(ICertificate $certificate) {
 				return [
 					$certificate->getName(),
 					$certificate->getCommonName(),

core/Command/Security/ImportCertificate.php

Indentation +27 added lines, -27 removed lines

@@ -30,37 +30,37 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return 1;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return 1;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-		return 0;
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+        return 0;
+    }
 }

core/Command/TwoFactorAuth/Disable.php

Indentation +32 added lines, -32 removed lines

@@ -31,41 +31,41 @@
 
 class Disable extends Base {
 
-	/** @var ProviderManager */
-	private $manager;
+    /** @var ProviderManager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(ProviderManager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:disable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(ProviderManager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:disable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:disable');
-		$this->setDescription('Disable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-		$this->addArgument('provider_id', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:disable');
+        $this->setDescription('Disable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+        $this->addArgument('provider_id', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$uid = $input->getArgument('uid');
-		$providerId = $input->getArgument('provider_id');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return 1;
-		}
-		if ($this->manager->tryDisableProviderFor($providerId, $user)) {
-			$output->writeln("Two-factor provider <options=bold>$providerId</> disabled for user <options=bold>$uid</>.");
-			return 0;
-		} else {
-			$output->writeln("<error>The provider does not support this operation.</error>");
-			return 2;
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $uid = $input->getArgument('uid');
+        $providerId = $input->getArgument('provider_id');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return 1;
+        }
+        if ($this->manager->tryDisableProviderFor($providerId, $user)) {
+            $output->writeln("Two-factor provider <options=bold>$providerId</> disabled for user <options=bold>$uid</>.");
+            return 0;
+        } else {
+            $output->writeln("<error>The provider does not support this operation.</error>");
+            return 2;
+        }
+    }
 }

core/Command/TwoFactorAuth/State.php

Indentation +70 added lines, -70 removed lines

@@ -34,74 +34,74 @@
 
 class State extends Base {
 
-	/** @var IRegistry */
-	private $registry;
-
-	public function __construct(IRegistry $registry, IUserManager $userManager) {
-		parent::__construct('twofactorauth:state');
-
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('twofactorauth:state');
-		$this->setDescription('Get the two-factor authentication (2FA) state of a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return 1;
-		}
-
-		$providerStates = $this->registry->getProviderStates($user);
-		$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
-		list($enabled, $disabled) = $filtered;
-
-		if (!empty($enabled)) {
-			$output->writeln("Two-factor authentication is enabled for user $uid");
-		} else {
-			$output->writeln("Two-factor authentication is not enabled for user $uid");
-		}
-
-		$output->writeln("");
-		$this->printProviders("Enabled providers", $enabled, $output);
-		$this->printProviders("Disabled providers", $disabled, $output);
-
-		return 0;
-	}
-
-	private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
-		$enabled = [];
-		$disabled = [];
-
-		foreach ($providerStates as $providerId => $isEnabled) {
-			if ($isEnabled) {
-				$enabled[] = $providerId;
-			} else {
-				$disabled[] = $providerId;
-			}
-		}
-
-		return [$enabled, $disabled];
-	}
-
-	private function printProviders(string $title, array $providers,
-									OutputInterface $output) {
-		if (empty($providers)) {
-			// Ignore and don't print anything
-			return;
-		}
-
-		$output->writeln($title . ":");
-		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
-		}
-	}
+    /** @var IRegistry */
+    private $registry;
+
+    public function __construct(IRegistry $registry, IUserManager $userManager) {
+        parent::__construct('twofactorauth:state');
+
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('twofactorauth:state');
+        $this->setDescription('Get the two-factor authentication (2FA) state of a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return 1;
+        }
+
+        $providerStates = $this->registry->getProviderStates($user);
+        $filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
+        list($enabled, $disabled) = $filtered;
+
+        if (!empty($enabled)) {
+            $output->writeln("Two-factor authentication is enabled for user $uid");
+        } else {
+            $output->writeln("Two-factor authentication is not enabled for user $uid");
+        }
+
+        $output->writeln("");
+        $this->printProviders("Enabled providers", $enabled, $output);
+        $this->printProviders("Disabled providers", $disabled, $output);
+
+        return 0;
+    }
+
+    private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
+        $enabled = [];
+        $disabled = [];
+
+        foreach ($providerStates as $providerId => $isEnabled) {
+            if ($isEnabled) {
+                $enabled[] = $providerId;
+            } else {
+                $disabled[] = $providerId;
+            }
+        }
+
+        return [$enabled, $disabled];
+    }
+
+    private function printProviders(string $title, array $providers,
+                                    OutputInterface $output) {
+        if (empty($providers)) {
+            // Ignore and don't print anything
+            return;
+        }
+
+        $output->writeln($title . ":");
+        foreach ($providers as $provider) {
+            $output->writeln("- " . $provider);
+        }
+    }
 }

core/Command/TwoFactorAuth/Cleanup.php

Indentation +18 added lines, -18 removed lines

@@ -33,29 +33,29 @@
 
 class Cleanup extends Base {
 
-	/** @var IRegistry */
-	private $registry;
+    /** @var IRegistry */
+    private $registry;
 
-	public function __construct(IRegistry $registry) {
-		parent::__construct();
+    public function __construct(IRegistry $registry) {
+        parent::__construct();
 
-		$this->registry = $registry;
-	}
+        $this->registry = $registry;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:cleanup');
-		$this->setDescription('Clean up the two-factor user-provider association of an uninstalled/removed provider');
-		$this->addArgument('provider-id', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:cleanup');
+        $this->setDescription('Clean up the two-factor user-provider association of an uninstalled/removed provider');
+        $this->addArgument('provider-id', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$providerId = $input->getArgument('provider-id');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $providerId = $input->getArgument('provider-id');
 
-		$this->registry->cleanUp($providerId);
+        $this->registry->cleanUp($providerId);
 
-		$output->writeln("<info>All user-provider associations for provider <options=bold>$providerId</> have been removed.</info>");
-		return 0;
-	}
+        $output->writeln("<info>All user-provider associations for provider <options=bold>$providerId</> have been removed.</info>");
+        return 0;
+    }
 }