Skip to content

Commit d377b66

Browse files
committed
fix(dav): Use share initiator to get the share node, because the owner might on another server
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent 2cc3843 commit d377b66

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

apps/dav/appinfo/v1/publicwebdav.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ function (\Sabre\DAV\Server $server) use (
8787
}
8888

8989
$share = $authBackend->getShare();
90-
$owner = $share->getShareOwner();
9190
$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
9291
$fileId = $share->getNodeId();
9392

@@ -102,7 +101,7 @@ function (\Sabre\DAV\Server $server) use (
102101
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
103102

104103
$rootFolder = Server::get(IRootFolder::class);
105-
$userFolder = $rootFolder->getUserFolder($owner);
104+
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
106105
$node = $userFolder->getFirstNodeById($fileId);
107106
if (!$node) {
108107
throw new \Sabre\DAV\Exception\NotFound();

apps/dav/appinfo/v2/publicremote.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
}
9595

9696
$share = $authBackend->getShare();
97-
$owner = $share->getShareOwner();
9897
$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
9998
$fileId = $share->getNodeId();
10099

@@ -130,7 +129,7 @@
130129
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
131130

132131
$rootFolder = Server::get(IRootFolder::class);
133-
$userFolder = $rootFolder->getUserFolder($owner);
132+
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
134133
$node = $userFolder->getFirstNodeById($fileId);
135134
if (!$node) {
136135
throw new NotFound();

apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function initialize(\Sabre\DAV\Server $server) {
4141
}
4242

4343
public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
44-
// verify that the owner didn't have their share permissions revoked
44+
// verify that the initiator didn't have their share permissions revoked
4545
if ($this->fileInfo && !$this->fileInfo->isShareable()) {
4646
throw new NotFound();
4747
}

0 commit comments

Comments
 (0)