make groupfolders use system wide encryption keys

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index bf89ef26f082ccb9c4bdc9214485e8aa9d1c293c..468f924c494c8e15981a77e25f03d16428db4a8e 100644 (file)
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -34,6 +34,7 @@ use OC\Files\Filesystem;
 use OC\Files\View;
 use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\GroupFolders\Mount\GroupMountPoint;
 use OCP\Encryption\IEncryptionModule;
 use OCP\IConfig;
 use OCP\IUser;
@@ -299,6 +300,15 @@ class Util {
         * @return boolean
         */
        public function isSystemWideMountPoint($path, $uid) {
+               $mount = Filesystem::getMountManager()->find('/' . $uid . $path);
+
+               /**
+                * @psalm-suppress UndefinedClass
+                */
+               if ($mount instanceof GroupMountPoint) {
+                       return true;
+               }
+
                if (\OCP\App::isEnabled("files_external")) {
                        /** @var GlobalStoragesService $storageService */
                        $storageService = \OC::$server->get(GlobalStoragesService::class);