fix: max image dimensions are now configurable and have a higher default

DeepDiver1975 · DeepDiver1975 · commit d05c3c941fac · 2024-02-23T11:39:18.000+01:00
diff --git a/changelog/unreleased/41175 b/changelog/unreleased/41175
@@ -1,3 +1,4 @@
 Bugfix: image dimension validation on avatar upload and preview generation
 
 https://github.com/owncloud/core/pull/41175
+https://github.com/owncloud/core/pull/41193
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -1020,6 +1020,18 @@
  */
 'preview_max_filesize_image' => 50,
 
+/**
+ * Define the maximum dimensions of the original image for preview generation
+ * In contrary to `preview_max_x` and `preview_max_x` which define the maximum
+ * dimensions of generated previews, this setting limits the original images size.
+ *
+ * Original images being bigger than the defined dimension will not be processed.
+ *
+ * Value represents the maximum dimension in den format width x height
+ * Default is 6016x4000.
+ */
+'preview_max_dimensions' => '6016x4000',
+
 /**
  * Define the custom path for the LibreOffice / OpenOffice binary
  */
diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php
@@ -46,9 +46,7 @@ public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
 		$handle = $file->fopen('r');
 		$image->load($handle);
 		$image->fixOrientation();
-		// don't generate previews on images with too big dimensions
-		// 4k - 4096×2160
-		if ($image->width() > 4096 || $image->height() > 2160) {
+		if (!$this->validateImageDimensions($image)) {
 			return false;
 		}
 
@@ -70,4 +68,24 @@ public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
 	public function isAvailable(FileInfo $file) {
 		return true;
 	}
+
+	private function validateImageDimensions(\OC_Image $image): bool {
+		[$width, $height] = $this->getMaxDimensions();
+		return !($image->width() > $width || $image->height() > $height);
+	}
+
+	private function getMaxDimensions(): array {
+		// 24 MP - 6016 x 4000
+		$maxDimension = \OC::$server->getConfig()->getSystemValue('preview_max_dimensions', '6016x4000');
+		$exploded = explode('x', strtolower($maxDimension));
+		if ($exploded === false || \count($exploded) !== 2) {
+			return [6016, 4000];
+		}
+		[$w, $h] = $exploded;
+		if (is_numeric($w) && is_numeric($h)) {
+			return [(int)$w, (int)$h];
+		}
+
+		return [6016, 4000];
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`Bugfix: image dimension validation on avatar upload and preview generation`
`2`	`2`
`3`	`3`	`https://github.com/owncloud/core/pull/41175`
	`4`	`+https://github.com/owncloud/core/pull/41193`