Merge pull request #11121 from nanaya/optim-error

Ignore invalid beatmap image

Author: notbakaneko

app/Exceptions/ImageProcessorServiceException.php

@@ -9,5 +9,5 @@
 
 class ImageProcessorServiceException extends Exception
 {
-    // doesn't really contain anything
+    const INVALID_IMAGE = 1;
 }

app/Libraries/ImageProcessorService.php

@@ -7,6 +7,8 @@
 
 use App\Exceptions\ImageProcessorServiceException;
 use App\Models\Beatmapset;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 
 class ImageProcessorService
 {
@@ -42,15 +44,19 @@ public function process($method, $src)
         $src = preg_replace('/https?:\/\//', '', $src);
         try {
             $tmpFile = tmpfile();
-            $bytesWritten = fwrite($tmpFile, file_get_contents($this->endpoint."/{$method}/{$src}"));
-        } catch (\ErrorException $e) {
-            if (strpos($e->getMessage(), 'HTTP request failed!') !== false) {
-                throw new ImageProcessorServiceException('HTTP request failed!');
-            } elseif (strpos($e->getMessage(), 'Connection refused') !== false) {
-                throw new ImageProcessorServiceException('Connection refused.');
-            } else {
-                throw $e;
+            $bytesWritten = fwrite(
+                $tmpFile,
+                (new Client())->request('GET', "{$this->endpoint}/{$method}/{$src}")->getBody()->getContents(),
+            );
+        } catch (GuzzleException $e) {
+            if (str_contains($e->getMessage(), 'VipsJpeg: Premature end of input file')) {
+                throw new ImageProcessorServiceException(
+                    'Invalid image file',
+                    ImageProcessorServiceException::INVALID_IMAGE,
+                    $e,
+                );
             }
+            throw new ImageProcessorServiceException('HTTP request failed!', 0, $e);
         }
 
         if ($bytesWritten === false || $bytesWritten < 100) {

app/Models/Beatmapset.php

@@ -7,6 +7,7 @@
 
 use App\Enums\Ruleset;
 use App\Exceptions\BeatmapProcessorException;
+use App\Exceptions\ImageProcessorServiceException;
 use App\Exceptions\InvariantException;
 use App\Jobs\CheckBeatmapsetCovers;
 use App\Jobs\EsDocument;
@@ -553,7 +554,14 @@ public function regenerateCovers(array $sizesToRegenerate = null)
             $processor = new ImageProcessorService();
 
             // upload optimized full-size version
-            $optimized = $processor->optimize($this->coverURL('raw', $timestamp));
+            try {
+                $optimized = $processor->optimize($this->coverURL('raw', $timestamp));
+            } catch (ImageProcessorServiceException $e) {
+                if ($e->getCode() === ImageProcessorServiceException::INVALID_IMAGE) {
+                    return false;
+                }
+                throw $e;
+            }
             $this->storeCover('fullsize.jpg', get_stream_filename($optimized));
 
             // use thumbnailer to generate (and then upload) all our variants