enh(IMountManager): Add method to get MountPoint from CachedMountInfo

Signed-off-by: Jonas <jonas@freesources.org>
nextcloud · Oct 20, 2023 · ec31c90 · ec31c90
1 parent 7d17ecc
commit ec31c90
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/apps/workflowengine/lib/Entity/File.php b/apps/workflowengine/lib/Entity/File.php
@@ -7,6 +7,7 @@
  *
  * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Jonas Meurer <jonas@freesources.org>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,6 +32,7 @@
 use OCP\EventDispatcher\GenericEvent;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
+use OCP\Files\Mount\IMountManager;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IL10N;
@@ -74,6 +76,8 @@ class File implements IEntity, IDisplayText, IUrl, IIcon, IContextPortation {
 	private $userManager;
 	/** @var UserMountCache */
 	private $userMountCache;
+	/** @var IMountManager */
+	private $mountManager;
 
 	public function __construct(
 		IL10N $l10n,
@@ -82,7 +86,8 @@ public function __construct(
 		IUserSession $userSession,
 		ISystemTagManager $tagManager,
 		IUserManager $userManager,
-		UserMountCache $userMountCache
+		UserMountCache $userMountCache,
+		IMountManager $mountManager
 	) {
 		$this->l10n = $l10n;
 		$this->urlGenerator = $urlGenerator;
@@ -91,6 +96,7 @@ public function __construct(
 		$this->tagManager = $tagManager;
 		$this->userManager = $userManager;
 		$this->userMountCache = $userMountCache;
+		$this->mountManager = $mountManager;
 	}
 
 	public function getName(): string {
@@ -143,12 +149,18 @@ public function isLegitimatedForUserId(string $uid): bool {
 				$fileId = $node->getId();
 			}
 
-			$mounts = $this->userMountCache->getMountsForFileId($fileId, $uid);
-			foreach ($mounts as $mount) {
+			$mountInfos = $this->userMountCache->getMountsForFileId($fileId, $uid);
+			foreach ($mountInfos as $mountInfo) {
+				$mount = $this->mountManager->getMountFromMountInfo($mountInfo);
+				if ($mount && !empty($mount->getStorage()->getCache()->get($fileId))) {
+					return true;
+				}
+				/*
 				$userFolder = $this->root->getUserFolder($uid);
 				if (!empty($userFolder->getById($fileId))) {
 					return true;
 				}
+				*/
 			}
 			return false;
 		} catch (NotFoundException $e) {

diff --git a/apps/workflowengine/tests/ManagerTest.php b/apps/workflowengine/tests/ManagerTest.php
@@ -35,6 +35,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\IRootFolder;
+use OCP\Files\Mount\IMountManager;
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IConfig;
@@ -408,6 +409,7 @@ public function testUpdateOperation() {
 							$this->createMock(ISystemTagManager::class),
 							$this->createMock(IUserManager::class),
 							$this->createMock(UserMountCache::class),
+							$this->createMock(IMountManager::class),
 						])
 						->setMethodsExcept(['getEvents'])
 						->getMock();

diff --git a/lib/private/Files/Mount/Manager.php b/lib/private/Files/Mount/Manager.php
@@ -10,6 +10,7 @@
  * @author Robin Appelman <robin@icewind.nl>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Jonas <jonas@freesources.org>
  *
  * @license AGPL-3.0
  *
@@ -33,6 +34,7 @@
 use OC\Files\Filesystem;
 use OC\Files\SetupManager;
 use OC\Files\SetupManagerFactory;
+use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
@@ -226,4 +228,20 @@ public function getMountsByMountProvider(string $path, array $mountProviders) {
 			});
 		}
 	}
+
+	/**
+	 * Return the mount matching a cached mount info (or mount file info)
+	 *
+	 * @param ICachedMountInfo $info
+	 *
+	 * @return IMountPoint|null
+	 */
+	public function getMountFromMountInfo(ICachedMountInfo $info): ?IMountPoint {
+		foreach ($this->mounts as $mount) {
+			if ($mount->getStorageRootId() === $info->getRootId()) {
+				return $mount;
+			}
+		}
+		return null;
+	}
 }
diff --git a/lib/public/Files/Mount/IMountManager.php b/lib/public/Files/Mount/IMountManager.php
@@ -26,6 +26,8 @@
  */
 namespace OCP\Files\Mount;
 
+use OCP\Files\Config\ICachedMountInfo;
+
 /**
  * Interface IMountManager
  *
@@ -106,4 +108,14 @@ public function getAll(): array;
 	 * @since 8.2.0
 	 */
 	public function findByNumericId(int $id): array;
+
+	/**
+	 * Return the mount matching a cached mount info (or mount file info)
+	 *
+	 * @param ICachedMountInfo $info
+	 *
+	 * @return IMountPoint|null
+	 * @since 28.0.0
+	 */
+	public function getMountFromMountInfo(ICachedMountInfo $info): ?IMountPoint;
 }