Skip to content

Commit 5f02191

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 f75aad1 commit 5f02191

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

apps/dav/appinfo/v1/publicwebdav.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
}
5959

6060
$share = $authBackend->getShare();
61-
$owner = $share->getShareOwner();
6261
$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
6362
$fileId = $share->getNodeId();
6463

@@ -73,7 +72,7 @@
7372
\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
7473

7574
$rootFolder = \OCP\Server::get(\OCP\Files\IRootFolder::class);
76-
$userFolder = $rootFolder->getUserFolder($owner);
75+
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
7776
$node = $userFolder->getFirstNodeById($fileId);
7877
if (!$node) {
7978
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
@@ -85,7 +85,6 @@
8585
}
8686

8787
$share = $authBackend->getShare();
88-
$owner = $share->getShareOwner();
8988
$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
9089
$fileId = $share->getNodeId();
9190

@@ -113,7 +112,7 @@
113112
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
114113

115114
$rootFolder = \OCP\Server::get(\OCP\Files\IRootFolder::class);
116-
$userFolder = $rootFolder->getUserFolder($owner);
115+
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
117116
$node = $userFolder->getFirstNodeById($fileId);
118117
if (!$node) {
119118
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 his 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)