mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9669 from nextcloud/backport/9666/stable12 

[stable12] Make sure the file is readable before attempting to create a preview
This commit is contained in:
Morris Jobke 2018-05-30 11:42:24 +02:00 committed by GitHub
parent 752b5d589b 8d596461d5
commit a98bfa8d87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Preview/Generator.php
View File

@ -87,6 +87,12 @@ class Generator {
* @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid) * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
*/ */
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) { public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
//Make sure that we can read the file
if (!$file->isReadable()) {
throw new NotFoundException('Cannot read file');
}
$this->eventDispatcher->dispatch( $this->eventDispatcher->dispatch(
IPreview::EVENT, IPreview::EVENT,
new GenericEvent($file,[ new GenericEvent($file,[

20
tests/lib/Preview/GeneratorTest.php
View File

@ -76,6 +76,8 @@ class GeneratorTest extends \Test\TestCase {
public function testGetCachedPreview() { public function testGetCachedPreview() {
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(true);
$file->method('getMimeType') $file->method('getMimeType')
->willReturn('myMimeType'); ->willReturn('myMimeType');
$file->method('getId') $file->method('getId')
@ -122,6 +124,8 @@ class GeneratorTest extends \Test\TestCase {
public function testGetNewPreview() { public function testGetNewPreview() {
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(true);
$file->method('getMimeType') $file->method('getMimeType')
->willReturn('myMimeType'); ->willReturn('myMimeType');
$file->method('getId') $file->method('getId')
@ -248,6 +252,8 @@ class GeneratorTest extends \Test\TestCase {
$this->expectException(NotFoundException::class); $this->expectException(NotFoundException::class);
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(true);
$this->previewManager->method('isMimeSupported') $this->previewManager->method('isMimeSupported')
->with('invalidType') ->with('invalidType')
@ -271,6 +277,8 @@ class GeneratorTest extends \Test\TestCase {
public function testNoProvider() { public function testNoProvider() {
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(true);
$file->method('getMimeType') $file->method('getMimeType')
->willReturn('myMimeType'); ->willReturn('myMimeType');
$file->method('getId') $file->method('getId')
@ -350,6 +358,8 @@ class GeneratorTest extends \Test\TestCase {
*/ */
public function testCorrectSize($maxX, $maxY, $reqX, $reqY, $crop, $mode, $expectedX, $expectedY) { public function testCorrectSize($maxX, $maxY, $reqX, $reqY, $crop, $mode, $expectedX, $expectedY) {
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(true);
$file->method('getMimeType') $file->method('getMimeType')
->willReturn('myMimeType'); ->willReturn('myMimeType');
$file->method('getId') $file->method('getId')
@ -416,4 +426,14 @@ class GeneratorTest extends \Test\TestCase {
$this->assertSame($preview, $result); $this->assertSame($preview, $result);
} }
} }
public function testUnreadbleFile() {
$file = $this->createMock(File::class);
$file->method('isReadable')
->willReturn(false);
$this->expectException(NotFoundException::class);
$this->generator->getPreview($file, 100, 100, false);
}
} }