From 0ace9a4efaecabefea97636c950638de98563cd5 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 11 Mar 2024 17:07:49 +0100 Subject: [PATCH 1/2] fix: don't return null for SharedStorage::getWrapperStorage with share recursion Signed-off-by: Robin Appelman --- apps/files_sharing/lib/SharedStorage.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 80041afb96c3d..12fb0e799f186 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -137,6 +137,16 @@ private function getSourceRootInfo() { private function init() { if ($this->initialized) { + if (!$this->storage) { + // marked as initialized but no storage set + // this is probably because some code path has caused recursion during the share setup + // we setup a "failed storage" so `getWrapperStorage` doesn't return null. + // If the share setup completes after this the "failed storage" will be overwritten by the correct one + $this->logger->warning('Possible share setup recursion detected'); + $this->storage = new FailedStorage(['exception' => new \Exception('Possible share setup recursion detected')]); + $this->cache = new FailedCache(); + $this->rootPath = ''; + } return; } From f46209a34e632a3638a1f396c824253575d4f399 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 11 Mar 2024 17:21:29 +0100 Subject: [PATCH 2/2] chore: improve typing for SharedStorage::$storage Signed-off-by: Robin Appelman --- apps/files_sharing/lib/SharedStorage.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 12fb0e799f186..877de247fb128 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -100,6 +100,12 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto private static int $initDepth = 0; + /** + * @psalm-suppress NonInvariantDocblockPropertyType + * @var ?\OC\Files\Storage\Storage $storage + */ + protected $storage; + public function __construct($arguments) { $this->ownerView = $arguments['ownerView']; $this->logger = \OC::$server->get(LoggerInterface::class); @@ -135,6 +141,9 @@ private function getSourceRootInfo() { return $this->sourceRootInfo; } + /** + * @psalm-assert \OC\Files\Storage\Storage $this->storage + */ private function init() { if ($this->initialized) { if (!$this->storage) {