summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/ajax/preview.php2
-rw-r--r--lib/private/Preview.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 2894efdc8e3..6cfba6aef30 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -53,6 +53,8 @@ $info = \OC\Files\Filesystem::getFileInfo($file);
if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPreviewManager()->isAvailable($info)) {
\OC_Response::setStatus(404);
+} else if (!$info->isReadable()) {
+ \OC_Response::setStatus(403);
} else {
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$preview->setFile($file, $info);
diff --git a/lib/private/Preview.php b/lib/private/Preview.php
index 70b000a30ee..67838a8d4a3 100644
--- a/lib/private/Preview.php
+++ b/lib/private/Preview.php
@@ -763,7 +763,7 @@ class Preview {
$this->preview = null;
$fileInfo = $this->getFileInfo();
- if ($fileInfo === null || $fileInfo === false) {
+ if ($fileInfo === null || $fileInfo === false || !$fileInfo->isReadable()) {
return new \OC_Image();
}