fix: apply max file size limits to class Bitmap

Author: DeepDiver1975

lib/private/Preview.php

@@ -34,6 +34,7 @@
 use OC\Files\Filesystem;
 use OC\Files\View;
 use OCA\Files_Sharing\SharedMount;
+use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
 use OCP\Files\Node;
@@ -1081,6 +1082,22 @@ private function getPreviewPath($fileId = null) {
 		return $this->getThumbnailsFolder() . '/' . $fileId . '/';
 	}
 
+	/**
+	 * @param File $file
+	 * @return bool
+	 * @throws \OCP\Files\InvalidPathException
+	 * @throws \OCP\Files\NotFoundException
+	 */
+	public static function isImageFileSizeTooBig(File $file): bool {
+		$maxSizeForImages = \OC::$server->getConfig()->getSystemValue('preview_max_filesize_image', 50);
+		if ($maxSizeForImages === -1) {
+			return false;
+		}
+		$size = $file->getSize();
+
+		return $size > ($maxSizeForImages * 1024 * 1024);
+	}
+
 	/**
 	 * Asks the provider to send a preview of the file which respects the maximum dimensions
 	 * defined in the configuration and after saving it in the cache, it is then resized to the

lib/private/Preview/Bitmap.php

@@ -25,6 +25,7 @@
 namespace OC\Preview;
 
 use Imagick;
+use OC\Preview;
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Preview\IProvider2;
@@ -40,6 +41,9 @@ abstract class Bitmap implements IProvider2 {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
+		if (Preview::isImageFileSizeTooBig($file)) {
+			return false;
+		}
 		$stream = $file->fopen('r');
 
 		// Creates \Imagick object from bitmap or vector file
@@ -78,9 +82,9 @@ public function isAvailable(FileInfo $file) {
 	 * @param int $maxX
 	 * @param int $maxY
 	 *
-	 * @return \Imagick
+	 * @return Imagick
 	 */
-	private function getResizedPreview($stream, $maxX, $maxY) {
+	private function getResizedPreview($stream, int $maxX, int $maxY): Imagick {
 		# file content can be SVG - we need to sanitize it first
 		$content = \stream_get_contents($stream);
 		$output = SVG::sanitizeSVGContent($content);

lib/private/Preview/Image.php

@@ -26,6 +26,7 @@
  */
 namespace OC\Preview;
 
+use OC\Preview;
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Preview\IProvider2;
@@ -35,13 +36,9 @@ abstract class Image implements IProvider2 {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
-		$maxSizeForImages = \OC::$server->getConfig()->getSystemValue('preview_max_filesize_image', 50);
-		$size = $file->getSize();
-
-		if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
+		if (Preview::isImageFileSizeTooBig($file)) {
 			return false;
 		}
-
 		$image = new \OC_Image();
 		$handle = $file->fopen('r');
 		$image->load($handle);