From d4654009695825232fb86667f5da8a04040721ea Mon Sep 17 00:00:00 2001 From: Philipp Niedermayer Date: Mon, 7 Nov 2022 22:21:20 +0100 Subject: [PATCH] Allow server-side encryption See https://github.com/pulsejet/memories/issues/99 --- lib/Command/Index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Command/Index.php b/lib/Command/Index.php index 55134207..44d629c9 100644 --- a/lib/Command/Index.php +++ b/lib/Command/Index.php @@ -191,9 +191,9 @@ class Index extends Command // Time measurement $startTime = microtime(true); - if ($this->encryptionManager->isEnabled()) { - error_log('FATAL: Encryption is enabled. Aborted.'); - + if ($this->encryptionManager->isEnabled() && $this->encryptionManager->getDefaultEncryptionModuleId() != 'OC_DEFAULT_MODULE') { + // Can work with server-side but not with e2e encryption, see https://github.com/pulsejet/memories/issues/99 + error_log('FATAL: Only server-side encryption (OC_DEFAULT_MODULE) is supported, but another encryption module is enabled. Aborted.'); return 1; } $this->output = $output;