Skip to content

Commit

Permalink
Allow server-side encryption
Browse files Browse the repository at this point in the history
  • Loading branch information
eltos authored Nov 7, 2022
1 parent 86de94c commit d465400
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/Command/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ protected function executeWithOpts(OutputInterface $output, bool &$refresh): int
// 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;
Expand Down

0 comments on commit d465400

Please sign in to comment.