From 14ebd254d22552f6b0e23be7b746e90cf22cd15d Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Wed, 15 Oct 2025 14:58:28 +0200 Subject: [PATCH] style: apply cs-fixer to publicwebdav.php Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> [skip ci] --- apps/dav/appinfo/v1/publicwebdav.php | 39 ++++++++++++++----- .../dav/lib/Connector/Sabre/ServerFactory.php | 2 +- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index dc74fe214af..62db0dcda26 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -68,15 +68,36 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct throw new \Sabre\DAV\Exception\NotAuthenticated(); } - $share = $authBackend->getShare(); - $owner = $share->getShareOwner(); - $isReadable = $share->getPermissions() & Constants::PERMISSION_READ; - $fileId = $share->getNodeId(); - - // FIXME: should not add storage wrappers outside of preSetup, need to find a better way - $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false); - Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) { - return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]); + $share = $authBackend->getShare(); + $owner = $share->getShareOwner(); + $isReadable = $share->getPermissions() & Constants::PERMISSION_READ; + $fileId = $share->getNodeId(); + + // FIXME: should not add storage wrappers outside of preSetup, need to find a better way + $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false); + Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) { + return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]); + }); + Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) { + return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]); + }); + Filesystem::logWarningWhenAddingStorageWrapper($previousLog); + + $rootFolder = Server::get(IRootFolder::class); + $userFolder = $rootFolder->getUserFolder($owner); + $node = $userFolder->getFirstNodeById($fileId); + if (!$node) { + throw new \Sabre\DAV\Exception\NotFound(); + } + $linkCheckPlugin->setFileInfo($node); + + // If not readable (files_drop) enable the filesdrop plugin + if (!$isReadable) { + $filesDropPlugin->enable(); + } + $filesDropPlugin->setShare($share); + + return new View($node->getPath()); }); Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) { return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]); diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 093b7f85929..1a4dc30728c 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -194,7 +194,7 @@ class ServerFactory { * as root. * * @param bool $useCollection Whether to use a collection or the legacy - * ObjectTree, which doesn't use collections. + * ObjectTree, which doesn't use collections. * @return array{0: CachingTree|ObjectTree, 1: SimpleCollection|null} */ public function getTree(bool $useCollection): array {