fix: reuse the mountpoint the wrapper was setup with

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

Author: icewind1991

lib/AppInfo/Application.php

@@ -30,6 +30,7 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IStorage;
 use OCP\Util;
 use OCP\WorkflowEngine\Events\RegisterOperationsEvent;
@@ -53,13 +54,14 @@ public function addStorageWrapper() {
 	 * @param IStorage $storage
 	 * @return StorageWrapper|IStorage
 	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage, IMountPoint $mount) {
 		if (!OC::$CLI && $mountPoint !== '/') {
 			/** @var Operation $operation */
 			$operation = $this->getContainer()->get(Operation::class);
 			return new StorageWrapper([
 				'storage' => $storage,
 				'mountPoint' => $mountPoint,
+				'mount' => $mount,
 				'operation' => $operation,
 			]);
 		}

lib/Operation.php

@@ -290,10 +290,16 @@ public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatch
 	 * @param array|ICacheEntry|null $cacheEntry
 	 */
 	private function getNode(IStorage $storage, string $path, $cacheEntry = null): ?Node {
-		/** @var IMountPoint|false $mountPoint */
-		$mountPoint = current($this->mountManager->findByStorageId($storage->getId()));
-		if (!$mountPoint) {
-			return null;
+		if ($storage->instanceOfStorage(StorageWrapper::class)) {
+			$mountPoint = $storage->getMount();
+		} else {
+			// fairly sure this branch is never taken, but not 100%
+
+			/** @var IMountPoint|false $mountPoint */
+			$mountPoint = current($this->mountManager->findByStorageId($storage->getId()));
+			if (!$mountPoint) {
+				return null;
+			}
 		}
 
 		$fullPath = $mountPoint->getMountPoint() . $path;

lib/StorageWrapper.php

@@ -26,6 +26,7 @@
 use OC\Files\Storage\Wrapper\Wrapper;
 use OCP\Constants;
 use OCP\Files\ForbiddenException;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IStorage;
 use OCP\Files\Storage\IWriteStreamStorage;
 
@@ -37,6 +38,7 @@ class StorageWrapper extends Wrapper implements IWriteStreamStorage {
 	public $mountPoint;
 	/** @var int */
 	protected $mask;
+	private IMountPoint $mount;
 
 	/**
 	 * @param array $parameters
@@ -45,6 +47,7 @@ public function __construct($parameters) {
 		parent::__construct($parameters);
 		$this->operation = $parameters['operation'];
 		$this->mountPoint = $parameters['mountPoint'];
+		$this->mount = $parameters['mount'];
 
 		$this->mask = Constants::PERMISSION_ALL;
 		$this->mask &= ~Constants::PERMISSION_READ;
@@ -338,4 +341,8 @@ private function isPartFile($path) {
 		$extension = pathinfo($path, PATHINFO_EXTENSION);
 		return ($extension === 'part');
 	}
+
+	public function getMount(): IMountPoint {
+		return $this->mount;
+	}
 }