Merge pull request #61682 from nextcloud/feat/improve-bruteforce-protection-command-output

feat(bruteforce): improve bruteforce protection command output

Author: nickvergessen

core/Command/Security/BruteforceAttempts.php

@@ -12,6 +12,7 @@
 use OCP\Security\Bruteforce\IThrottler;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class BruteforceAttempts extends Base {
@@ -37,12 +38,20 @@ protected function configure(): void {
 				InputArgument::OPTIONAL,
 				'Only count attempts for the given action',
 			)
+			->addOption(
+				'interval',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Interval in hours to count attempts for (max 48)',
+				12,
+			)
 		;
 	}
 
 	#[\Override]
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$ip = $input->getArgument('ipaddress');
+		$interval = (float)$input->getOption('interval');
 
 		if (!filter_var($ip, FILTER_VALIDATE_IP)) {
 			$output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
@@ -54,12 +63,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			'attempts' => $this->throttler->getAttempts(
 				$ip,
 				(string)$input->getArgument('action'),
+				$interval,
 			),
 			'delay' => $this->throttler->getDelay(
 				$ip,
 				(string)$input->getArgument('action'),
 			),
 		];
+		if ($input->getOption('output') === 'plain') {
+			$data['delay'] = $data['delay'] . ' ms';
+		}
 
 		$this->writeArrayInOutputFormat($input, $output, $data);