Merge pull request #56419 from nextcloud/fix/provide-non-interactive-mode-to-run-encryption

fix: support -n option to encrypt-all command to allow to run in non-interactive mode

Author: sorbaugh

apps/encryption/lib/Crypto/EncryptAll.php

@@ -278,7 +278,7 @@ protected function outputPasswords(): void {
 		$this->writePasswordsToFile($newPasswords);
 
 		$this->output->writeln('');
-		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
+		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', true);
 		if ($this->questionHelper->ask($this->input, $this->output, $question)) {
 			$this->sendPasswordsByMail();
 		}

core/Command/Encryption/EncryptAll.php

@@ -58,8 +58,11 @@ protected function configure() {
 		);
 	}
 
+	/**
+	 * @throws \Exception
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if (!$input->isInteractive()) {
+		if (!$input->isInteractive() && !$input->getOption('no-interaction')) {
 			$output->writeln('Invalid TTY.');
 			$output->writeln('If you are trying to execute the command in a Docker ');
 			$output->writeln("container, do not forget to execute 'docker exec' with");
@@ -83,8 +86,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$output->writeln('Please ensure that no user accesses their files during this time!');
 		$output->writeln('Note: The encryption module you use determines which files get encrypted.');
 		$output->writeln('');
-		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', true);
 		if ($this->questionHelper->ask($input, $output, $question)) {
+			//run encryption with the answer yes in interactive mode
 			$this->forceMaintenanceAndTrashbin();
 
 			try {
@@ -98,6 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$this->resetMaintenanceAndTrashbin();
 			return self::SUCCESS;
 		}
+		//abort on no in interactive mode
 		$output->writeln('aborted');
 		return self::FAILURE;
 	}