From c9d6ed3d7d04412b721745f61402ff1400c59aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 1 Apr 2015 16:35:46 +0200 Subject: [PATCH] in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side --- lib/private/files/storage/wrapper/encryption.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 3e98098419..09ba090acf 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -219,6 +219,12 @@ class Encryption extends Wrapper { $size = $unencryptedSize = 0; if ($this->file_exists($path)) { + // in case the file exists we require the explicit module as + // specified in the file header - otherwise we need to fail hard to + // prevent data loss on client side + if (!empty($encryptionModuleId)) { + $encryptionModule = $this->encryptionManager->getEncryptionModule($encryptionModuleId); + } $size = $this->storage->filesize($path); $unencryptedSize = $this->filesize($path); }