in case the file exists we require the explicit module as specified in the file heade...

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 3e98098419160d7333328d43f78f94cfca715f98..09ba090acffd64210ba96bd7c7b37b151162869a 100644 (file)
--- 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);
                }