From: Robin Appelman <robin@icewind.nl>
Date: Thu, 25 Aug 2022 13:23:04 +0000 (+0200)
Subject: make groupfolders use system wide encryption keys
X-Git-Tag: v24.0.6rc1~30^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F33700%2Fhead;p=nextcloud-server.git

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 bf89ef26f08..468f924c494 100644
--- 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);