Skip to content

[stable25] Extend ViewOnly DAV plugin to versions endpoint #36164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Jan 24, 2023
Merged

[stable25] Extend ViewOnly DAV plugin to versions endpoint #36164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions apps/dav/lib/DAV/ViewOnlyPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

use OCA\DAV\Connector\Sabre\Exception\Forbidden;
use OCA\DAV\Connector\Sabre\File as DavFile;
use OCA\Files_Versions\Sabre\VersionFile;
use OCP\Files\NotFoundException;
use Psr\Log\LoggerInterface;
use Sabre\DAV\Server;
Expand Down Expand Up @@ -70,11 +71,14 @@ public function checkViewOnly(RequestInterface $request): bool {
try {
assert($this->server !== null);
$davNode = $this->server->tree->getNodeForPath($path);
if (!($davNode instanceof DavFile)) {
if ($davNode instanceof DavFile) {
// Restrict view-only to nodes which are shared
$node = $davNode->getNode();
} else if ($davNode instanceof VersionFile) {
$node = $davNode->getVersion()->getSourceFile();
} else {
return true;
}
// Restrict view-only to nodes which are shared
$node = $davNode->getNode();

$storage = $node->getStorage();

Expand Down
50 changes: 40 additions & 10 deletions apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
use OCA\DAV\DAV\ViewOnlyPlugin;
use OCA\Files_Sharing\SharedStorage;
use OCA\DAV\Connector\Sabre\File as DavFile;
use OCA\Files_Versions\Versions\IVersion;
use OCA\Files_Versions\Sabre\VersionFile;
use OCP\Files\File;
use OCP\Files\Storage\IStorage;
use OCP\Share\IAttributes;
Expand Down Expand Up @@ -80,34 +82,62 @@ public function testCanGetNonShared(): void {
public function providesDataForCanGet(): array {
return [
// has attribute permissions-download enabled - can get file
[ $this->createMock(File::class), true, true],
[false, true, true],
// has no attribute permissions-download - can get file
[ $this->createMock(File::class), null, true],
[false, null, true],
// has attribute permissions-download disabled- cannot get the file
[ $this->createMock(File::class), false, false],
[false, false, false],
// has attribute permissions-download enabled - can get file version
[true, true, true],
// has no attribute permissions-download - can get file version
[true, null, true],
// has attribute permissions-download disabled- cannot get the file version
[true, false, false],
];
}

/**
* @dataProvider providesDataForCanGet
*/
public function testCanGet(File $nodeInfo, ?bool $attrEnabled, bool $expectCanDownloadFile): void {
$this->request->expects($this->once())->method('getPath')->willReturn('files/test/target');
public function testCanGet(bool $isVersion, ?bool $attrEnabled, bool $expectCanDownloadFile): void {
$nodeInfo = $this->createMock(File::class);
if ($isVersion) {
$davPath = 'versions/alice/versions/117/123456';
$version = $this->createMock(IVersion::class);
$version->expects($this->once())
->method('getSourceFile')
->willReturn($nodeInfo);
$davNode = $this->createMock(VersionFile::class);
$davNode->expects($this->once())
->method('getVersion')
->willReturn($version);
} else {
$davPath = 'files/path/to/file.odt';
$davNode = $this->createMock(DavFile::class);
$davNode->method('getNode')->willReturn($nodeInfo);
}

$davNode = $this->createMock(DavFile::class);
$this->tree->method('getNodeForPath')->willReturn($davNode);
$this->request->expects($this->once())->method('getPath')->willReturn($davPath);

$davNode->method('getNode')->willReturn($nodeInfo);
$this->tree->expects($this->once())
->method('getNodeForPath')
->with($davPath)
->willReturn($davNode);

$storage = $this->createMock(SharedStorage::class);
$share = $this->createMock(IShare::class);
$nodeInfo->method('getStorage')->willReturn($storage);
$nodeInfo->expects($this->once())
->method('getStorage')
->willReturn($storage);
$storage->method('instanceOfStorage')->with(SharedStorage::class)->willReturn(true);
$storage->method('getShare')->willReturn($share);

$extAttr = $this->createMock(IAttributes::class);
$share->method('getAttributes')->willReturn($extAttr);
$extAttr->method('getAttribute')->with('permissions', 'download')->willReturn($attrEnabled);
$extAttr->expects($this->once())
->method('getAttribute')
->with('permissions', 'download')
->willReturn($attrEnabled);

if (!$expectCanDownloadFile) {
$this->expectException(Forbidden::class);
Expand Down