Skip to content

fix(files_sharing): validate empty file parameter in PublicPreviewController #59460

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

Closed
psimaker wants to merge 1 commit into from
+99 −0
Closed

fix(files_sharing): validate empty file parameter in PublicPreviewController #59460

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
7 changes: 7 additions & 0 deletions apps/files_sharing/lib/Controller/PublicPreviewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,18 @@ public function getPreview(
try {
$node = $share->getNode();
if ($node instanceof Folder) {
if ($file === '') {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
$file = $node->get($file);
} else {
$file = $node;
}
} catch (NotFoundException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}

try {
$f = $this->previewManager->getPreview($file, $x, $y, !$a);
$response = new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
$response->cacheFor($cacheForSeconds);
Expand Down
92 changes: 92 additions & 0 deletions apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,98 @@ public function testPreviewFile() {
$this->assertEquals($expected, $res);
}

public function testPreviewFolderEmptyFile(): void {
$share = $this->createMock(IShare::class);
$this->shareManager->method('getShareByToken')
->with($this->equalTo('token'))
->willReturn($share);

$share->method('getPermissions')
->willReturn(Constants::PERMISSION_READ);

$folder = $this->createMock(Folder::class);
$share->method('getNode')
->willReturn($folder);

$share->method('canSeeContent')
->willReturn(true);

$res = $this->controller->getPreview('token', '', 10, 10);
$expected = new DataResponse([], Http::STATUS_BAD_REQUEST);
$this->assertEquals($expected, $res);
}

public function testPreviewFolderInvalidFileWithMimeFallback(): void {
$share = $this->createMock(IShare::class);
$this->shareManager->method('getShareByToken')
->with($this->equalTo('token'))
->willReturn($share);

$share->method('getPermissions')
->willReturn(Constants::PERMISSION_READ);

$folder = $this->createMock(Folder::class);
$share->method('getNode')
->willReturn($folder);

$share->method('canSeeContent')
->willReturn(true);

$folder->method('get')
->with($this->equalTo('notexist.png'))
->willThrowException(new NotFoundException());

$res = $this->controller->getPreview('token', 'notexist.png', 10, 10, true, true);
$expected = new DataResponse([], Http::STATUS_NOT_FOUND);
$this->assertEquals($expected, $res);
}

public function testPreviewFolderValidFileNoPreviewWithMimeFallback(): void {
$share = $this->createMock(IShare::class);
$this->shareManager->method('getShareByToken')
->with($this->equalTo('token'))
->willReturn($share);

$share->method('getPermissions')
->willReturn(Constants::PERMISSION_READ);

$folder = $this->createMock(Folder::class);
$share->method('getNode')
->willReturn($folder);

$share->method('canSeeContent')
->willReturn(true);

$file = $this->createMock(File::class);
$folder->method('get')
->with($this->equalTo('file'))
->willReturn($file);

$this->previewManager->method('getPreview')
->with($this->equalTo($file), 10, 10, false)
->willThrowException(new NotFoundException());

$file->method('getMimeType')
->willReturn('image/png');

$mimeIconProvider = $this->createMock(IMimeIconProvider::class);
$mimeIconProvider->method('getMimeIconUrl')
->with('image/png')
->willReturn('/core/img/filetypes/image.svg');

$controller = new PublicPreviewController(
'files_sharing',
$this->request,
$this->shareManager,
$this->createMock(ISession::class),
$this->previewManager,
$mimeIconProvider,
);

$res = $controller->getPreview('token', 'file', 10, 10, true, true);
$this->assertInstanceOf(\OCP\AppFramework\Http\RedirectResponse::class, $res);
}

public function testPreviewFolderInvalidFile(): void {
$share = $this->createMock(IShare::class);
$this->shareManager->method('getShareByToken')
Expand Down