Merge pull request #24241 from nextcloud/enh/harden_EncryptionLegacyCipher_repair

Harden EncryptionLegacyCipher a bit

Author: rullzer

lib/private/Repair/NC20/EncryptionLegacyCipher.php

@@ -54,6 +54,10 @@ private function shouldRun(): bool {
 	}
 
 	public function run(IOutput $output): void {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
 		if ($this->manager->isEnabled()) {
 			if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
 				$this->config->setSystemValue('encryption.legacy_format_support', true);

lib/private/Repair/NC20/EncryptionMigration.php

@@ -54,6 +54,10 @@ private function shouldRun(): bool {
 	}
 
 	public function run(IOutput $output): void {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
 		if ($this->manager->isEnabled()) {
 			if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
 				$this->config->setSystemValue('encryption.key_storage_migrated', false);