From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 1 Apr 2015 14:35:46 +0000 (+0200)
Subject: in case the file exists we require the explicit module as specified in the file heade... 
X-Git-Tag: v8.1.0alpha1~78^2~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9d6ed3d7d04412b721745f61402ff1400c59aeb;p=nextcloud-server.git

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
---

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 3e980984191..09ba090acff 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);
 		}