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

Merge pull request #1184 from nextcloud/backport-1089-allow-to-prevent-previews 

[stable10] Check if the file isReadable() before sending a (cached) preview
This commit is contained in:
Morris Jobke 2016-08-30 13:31:07 +02:00 committed by GitHub
parent a2a17fc5d7 061aad5fe3
commit 3d43680d6e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ajax/preview.php
View File

@ -53,6 +53,8 @@ $info = \OC\Files\Filesystem::getFileInfo($file);
if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPreviewManager()->isAvailable($info)) { if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPreviewManager()->isAvailable($info)) {
\OC_Response::setStatus(404); \OC_Response::setStatus(404);
} else if (!$info->isReadable()) {
\OC_Response::setStatus(403);
} else { } else {
$preview = new \OC\Preview(\OC_User::getUser(), 'files'); $preview = new \OC\Preview(\OC_User::getUser(), 'files');
$preview->setFile($file, $info); $preview->setFile($file, $info);

2
lib/private/Preview.php
View File

@ -763,7 +763,7 @@ class Preview {
$this->preview = null; $this->preview = null;
$fileInfo = $this->getFileInfo(); $fileInfo = $this->getFileInfo();
if ($fileInfo === null || $fileInfo === false) { if ($fileInfo === null || $fileInfo === false || !$fileInfo->isReadable()) {
return new \OC_Image(); return new \OC_Image();
} }