diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-09-15 22:58:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 22:58:05 +0200 |
| commit | c63d861375d47e257d869e94d9888e1d28212ede (patch) | |
| tree | 9f01e2111223a8ed4e41fc3f8db28e6978bf01d8 | |
| parent | e337551fd8f5e7298b0b10d6b8cab16f499d2953 (diff) | |
| parent | aafb4f8d5fa56d7724888a1387f89f9111d451e6 (diff) | |
| download | nextcloud-server-c63d861375d47e257d869e94d9888e1d28212ede.tar.gz nextcloud-server-c63d861375d47e257d869e94d9888e1d28212ede.zip | |
Merge pull request #33700 from nextcloud/groupfolder-system-encryption-24
[24] make groupfolders use system wide encryption keys
| -rw-r--r-- | lib/private/Encryption/Util.php | 10 |
1 files changed, 10 insertions, 0 deletions
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); |