From 06286f8c0e08b230f2ddf23295782ee65f352455 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 20 Nov 2020 09:46:31 +0100 Subject: [PATCH] Harden EncryptionLegacyCipher a bit Signed-off-by: Roeland Jago Douma --- lib/private/Repair/NC20/EncryptionLegacyCipher.php | 4 ++++ lib/private/Repair/NC20/EncryptionMigration.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/private/Repair/NC20/EncryptionLegacyCipher.php b/lib/private/Repair/NC20/EncryptionLegacyCipher.php index 7418a66ec5..0be34679fc 100644 --- a/lib/private/Repair/NC20/EncryptionLegacyCipher.php +++ b/lib/private/Repair/NC20/EncryptionLegacyCipher.php @@ -54,6 +54,10 @@ class EncryptionLegacyCipher implements IRepairStep { } 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); diff --git a/lib/private/Repair/NC20/EncryptionMigration.php b/lib/private/Repair/NC20/EncryptionMigration.php index 41681a314a..1eba09f413 100644 --- a/lib/private/Repair/NC20/EncryptionMigration.php +++ b/lib/private/Repair/NC20/EncryptionMigration.php @@ -54,6 +54,10 @@ class EncryptionMigration implements IRepairStep { } 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);