fix: try to find non-recursive share source

instead of always picking the first one, try to find one that won't blow up

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

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index 413a4460ad3e80f95ddf6aa45ec1ec5070ae2016..40eb06faa9e906694ec5fdae4026c34077b5f015 100644 (file)
--- a/apps/files_sharing/lib/SharedStorage.php
+++ b/apps/files_sharing/lib/SharedStorage.php
@@ -171,19 +171,29 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
                        $this->ownerUserFolder = $rootFolder->getUserFolder($this->superShare->getShareOwner());
                        $sourceId = $this->superShare->getNodeId();
                        $ownerNodes = $this->ownerUserFolder->getById($sourceId);
-                       /** @var Node|false $ownerNode */
-                       $ownerNode = current($ownerNodes);
-                       if (!$ownerNode) {
+
+                       if (count($ownerNodes) === 0) {
                                $this->storage = new FailedStorage(['exception' => new NotFoundException("File by id $sourceId not found")]);
                                $this->cache = new FailedCache();
                                $this->rootPath = '';
                        } else {
-                               $this->nonMaskedStorage = $ownerNode->getStorage();
-                               if ($this->nonMaskedStorage instanceof Wrapper && $this->nonMaskedStorage->isWrapperOf($this)) {
+                               foreach ($ownerNodes as $ownerNode) {
+                                       $nonMaskedStorage = $ownerNode->getStorage();
+
+                                       // check if potential source node would lead to a recursive share setup
+                                       if ($nonMaskedStorage instanceof Wrapper && $nonMaskedStorage->isWrapperOf($this)) {
+                                               continue;
+                                       }
+                                       $this->nonMaskedStorage = $nonMaskedStorage;
+                                       $this->sourcePath = $ownerNode->getPath();
+                                       $this->rootPath = $ownerNode->getInternalPath();
+                                       $this->cache = null;
+                                       break;
+                               }
+                               if (!$this->nonMaskedStorage) {
+                                       // all potential source nodes would have been recursive
                                        throw new \Exception('recursive share detected');
                                }
-                               $this->sourcePath = $ownerNode->getPath();
-                               $this->rootPath = $ownerNode->getInternalPath();
                                $this->storage = new PermissionsMask([
                                        'storage' => $this->nonMaskedStorage,
                                        'mask' => $this->superShare->getPermissions(),