diff options
author | Louis Chemineau <louis@chmn.me> | 2024-02-13 14:46:04 +0100 |
---|---|---|
committer | Louis Chemineau <louis@chmn.me> | 2024-02-21 15:06:01 +0100 |
commit | 8e95d0f3ae4fb9e186e3995cd2aa7d8393d7003d (patch) | |
tree | 4983e9675640ab789a3619ab24e3354a9908dea6 /apps/dav/lib/DAV/ViewOnlyPlugin.php | |
parent | 7ff81838b0c75d27e6af7cfa8e292c6ffbedf548 (diff) | |
download | nextcloud-server-8e95d0f3ae4fb9e186e3995cd2aa7d8393d7003d.tar.gz nextcloud-server-8e95d0f3ae4fb9e186e3995cd2aa7d8393d7003d.zip |
Check share attributes when downloading versions
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'apps/dav/lib/DAV/ViewOnlyPlugin.php')
-rw-r--r-- | apps/dav/lib/DAV/ViewOnlyPlugin.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/apps/dav/lib/DAV/ViewOnlyPlugin.php b/apps/dav/lib/DAV/ViewOnlyPlugin.php index 77a9acd628e..389dd96efb4 100644 --- a/apps/dav/lib/DAV/ViewOnlyPlugin.php +++ b/apps/dav/lib/DAV/ViewOnlyPlugin.php @@ -24,8 +24,8 @@ namespace OCA\DAV\DAV; use OCA\DAV\Connector\Sabre\Exception\Forbidden; use OCA\DAV\Connector\Sabre\File as DavFile; use OCA\Files_Versions\Sabre\VersionFile; +use OCP\Files\Folder; use OCP\Files\NotFoundException; -use Psr\Log\LoggerInterface; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; @@ -36,10 +36,12 @@ use Sabre\HTTP\RequestInterface; */ class ViewOnlyPlugin extends ServerPlugin { private ?Server $server = null; - private LoggerInterface $logger; + private ?Folder $userFolder; - public function __construct(LoggerInterface $logger) { - $this->logger = $logger; + public function __construct( + ?Folder $userFolder, + ) { + $this->userFolder = $userFolder; } /** @@ -76,6 +78,16 @@ class ViewOnlyPlugin extends ServerPlugin { $node = $davNode->getNode(); } elseif ($davNode instanceof VersionFile) { $node = $davNode->getVersion()->getSourceFile(); + $currentUserId = $this->userFolder?->getOwner()?->getUID(); + // The version source file is relative to the owner storage. + // But we need the node from the current user perspective. + if ($node->getOwner()->getUID() !== $currentUserId) { + $nodes = $this->userFolder->getById($node->getId()); + $node = array_pop($nodes); + if (!$node) { + throw new NotFoundException("Version file not accessible by current user"); + } + } } else { return true; } |