Skip to content

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

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

Merged
sorbaugh merged 6 commits into from
Nov 27, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e546c8
fix: support -n option to encrypt-all command to allow to run in non-…
yemkareems Nov 13, 2025
93c3079
fix: added the option to support no-interaction and added a check to …
yemkareems Nov 14, 2025
d420b3f
fix: added the interactive condition to the password question and in …
yemkareems Nov 14, 2025
26e2ff9
fix: removed the -n option from options, added the check and made def…
yemkareems Nov 19, 2025
bf23fbb
fix: removed the runEncryption Method as it is not required
yemkareems Nov 20, 2025
d134b23
fix: composer run cs:fix removed unused namespace
yemkareems Nov 21, 2025
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
45 changes: 24 additions & 21 deletions core/Command/Encryption/EncryptAll.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,10 @@ protected function configure() {
);
}

/**
* @throws \Exception
*/
protected function execute(InputInterface $input, OutputInterface $output): int {
if (!$input->isInteractive()) {
$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");
$output->writeln("the '-i' and '-t' options.");
$output->writeln('');
return 1;
}

Comment thread
yemkareems marked this conversation as resolved.
if ($this->encryptionManager->isEnabled() === false) {
throw new \Exception('Server side encryption is not enabled');
}
Expand All @@ -84,21 +78,30 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$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);
if ($this->questionHelper->ask($input, $output, $question)) {
$this->forceMaintenanceAndTrashbin();
if ($input->isInteractive() && $this->questionHelper->ask($input, $output, $question)) {
//run encryption with the answer yes in interactive mode
return $this->runEncryption($input, $output);
} elseif (!$input->isInteractive()) {
Comment thread
yemkareems marked this conversation as resolved.
Outdated
//run encryption without the question in non-interactive mode if -n option is available
return $this->runEncryption($input, $output);
}
//abort on no in interactive mode
$output->writeln('aborted');
return self::FAILURE;
}

try {
$defaultModule = $this->encryptionManager->getEncryptionModule();
$defaultModule->encryptAll($input, $output);
} catch (\Exception $ex) {
$this->resetMaintenanceAndTrashbin();
throw $ex;
}
private function runEncryption(InputInterface $input, OutputInterface $output): int {
Comment thread
yemkareems marked this conversation as resolved.
Outdated
$this->forceMaintenanceAndTrashbin();

try {
$defaultModule = $this->encryptionManager->getEncryptionModule();
$defaultModule->encryptAll($input, $output);
} catch (\Exception $ex) {
$this->resetMaintenanceAndTrashbin();
return self::SUCCESS;
throw $ex;
}
$output->writeln('aborted');
return self::FAILURE;

$this->resetMaintenanceAndTrashbin();
return self::SUCCESS;
}
}
Loading