aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-09-17 18:14:48 +0200
committerJulius Härtl <jus@bitgrid.net>2020-12-29 12:29:23 +0100
commit8501cf9b5c45bec19e4ceb2a6030c2a3aa3ba0f4 (patch)
tree2dcb7b8580b63cbd2ee250c8f4f35008054d7255 /lib/private/Encryption
parent04a65121b7ed8b46c8e8245fd15e08b886f13cf4 (diff)
downloadnextcloud-server-8501cf9b5c45bec19e4ceb2a6030c2a3aa3ba0f4.tar.gz
nextcloud-server-8501cf9b5c45bec19e4ceb2a6030c2a3aa3ba0f4.zip
dont apply encryption wrapper for root mount
the `shouldEncrypt` already disables encryption for anything thats not in the users data folder, however the encryption wrapper being applied anyway on the root folder breaks groupfolders Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Encryption')
-rw-r--r--lib/private/Encryption/EncryptionWrapper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index edbdc692b45..0ae9c2c9357 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -81,7 +81,7 @@ class EncryptionWrapper {
'mount' => $mount
];
- if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) {
+ if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') {
$user = \OC::$server->getUserSession()->getUser();
$mountManager = Filesystem::getMountManager();
$uid = $user ? $user->getUID() : null;