mirror of
https://github.com/nextcloud/server.git
synced 2026-06-11 01:30:50 -04:00
fix(dav): Use share initiator to get the share node, because the owner might on another server
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
parent
eb2b6e5137
commit
824eb71876
3 changed files with 3 additions and 5 deletions
|
|
@ -69,7 +69,6 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
|
|||
}
|
||||
|
||||
$share = $authBackend->getShare();
|
||||
$owner = $share->getShareOwner();
|
||||
$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
|
||||
$fileId = $share->getNodeId();
|
||||
|
||||
|
|
@ -84,7 +83,7 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
|
|||
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
|
||||
|
||||
$rootFolder = Server::get(IRootFolder::class);
|
||||
$userFolder = $rootFolder->getUserFolder($owner);
|
||||
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
|
||||
$node = $userFolder->getFirstNodeById($fileId);
|
||||
if (!$node) {
|
||||
throw new \Sabre\DAV\Exception\NotFound();
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
|
|||
}
|
||||
|
||||
$share = $authBackend->getShare();
|
||||
$owner = $share->getShareOwner();
|
||||
$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
|
||||
$fileId = $share->getNodeId();
|
||||
|
||||
|
|
@ -123,7 +122,7 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
|
|||
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
|
||||
|
||||
$rootFolder = Server::get(IRootFolder::class);
|
||||
$userFolder = $rootFolder->getUserFolder($owner);
|
||||
$userFolder = $rootFolder->getUserFolder($share->getSharedBy());
|
||||
$node = $userFolder->getFirstNodeById($fileId);
|
||||
if (!$node) {
|
||||
throw new NotFound();
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class PublicLinkCheckPlugin extends ServerPlugin {
|
|||
}
|
||||
|
||||
public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
|
||||
// verify that the owner didn't have their share permissions revoked
|
||||
// verify that the initiator didn't have their share permissions revoked
|
||||
if ($this->fileInfo && !$this->fileInfo->isShareable()) {
|
||||
throw new NotFound();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue