Add unit test for ip addess searching

[bookstack] / app / Uploads / ImageService.php

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 4cd818bcce87629295d670b35a97c045df639d7c..b8477eb4034df5ef3f2d1eef1a10b571bb613ccb 100644 (file)
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -6,15 +6,17 @@ use BookStack\Exceptions\ImageUploadException;
 use ErrorException;
 use Exception;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use ErrorException;
 use Exception;
 use Illuminate\Contracts\Cache\Repository as Cache;

-use Illuminate\Contracts\Filesystem\Factory as FileSystem;

 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;

-use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance;

 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
 use Illuminate\Contracts\Filesystem\Filesystem as Storage;

+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Filesystem\FilesystemManager;

 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;

+use Illuminate\Support\Facades\Log;

 use Illuminate\Support\Str;
 use Intervention\Image\Exception\NotSupportedException;
 use Intervention\Image\ImageManager;
 use League\Flysystem\Util;
 use Illuminate\Support\Str;
 use Intervention\Image\Exception\NotSupportedException;
 use Intervention\Image\ImageManager;
 use League\Flysystem\Util;

+use Psr\SimpleCache\InvalidArgumentException;

 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 


@@ -31,7 +33,7 @@ class ImageService
     /**
      * ImageService constructor.
      */
     /**
      * ImageService constructor.
      */

-    public function __construct(Image $image, ImageManager $imageTool, FileSystem $fileSystem, Cache $cache)
+    public function __construct(Image $image, ImageManager $imageTool, FilesystemManager $fileSystem, Cache $cache)

     {
         $this->image = $image;
         $this->imageTool = $imageTool;
     {
         $this->image = $image;
         $this->imageTool = $imageTool;


@@ -42,7 +44,7 @@ class ImageService
     /**
      * Get the storage that will be used for storing images.
      */
     /**
      * Get the storage that will be used for storing images.
      */

-    protected function getStorageDisk(string $imageType = ''): FileSystemInstance
+    protected function getStorageDisk(string $imageType = ''): Storage

     {
         return $this->fileSystem->disk($this->getStorageDiskName($imageType));
     }
     {
         return $this->fileSystem->disk($this->getStorageDiskName($imageType));
     }


@@ -156,7 +158,7 @@ class ImageService
         try {
             $this->saveImageDataInPublicSpace($storage, $this->adjustPathForStorageDisk($fullPath, $type), $imageData);
         } catch (Exception $e) {
         try {
             $this->saveImageDataInPublicSpace($storage, $this->adjustPathForStorageDisk($fullPath, $type), $imageData);
         } catch (Exception $e) {

-            \Log::error('Error when attempting image upload:' . $e->getMessage());
+            Log::error('Error when attempting image upload:' . $e->getMessage());

 
             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }
 
             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }


@@ -231,17 +233,10 @@ class ImageService
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
      *
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
      *

-     * @param Image $image
-     * @param int   $width
-     * @param int   $height
-     * @param bool  $keepRatio
-     *

      * @throws Exception
      * @throws Exception

-     * @throws ImageUploadException
-     *
-     * @return string
+     * @throws InvalidArgumentException

      */
      */

-    public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
+    public function getThumbnail(Image $image, ?int $width, ?int $height, bool $keepRatio = false): string

     {
         if ($keepRatio && $this->isGif($image)) {
             return $this->getPublicUrl($image->path);
     {
         if ($keepRatio && $this->isGif($image)) {
             return $this->getPublicUrl($image->path);


@@ -269,27 +264,16 @@ class ImageService
     }
 
     /**
     }
 
     /**

-     * Resize image data.
-     *
-     * @param string $imageData
-     * @param int    $width
-     * @param int    $height
-     * @param bool   $keepRatio
+     * Resize the image of given data to the specified size, and return the new image data.

      *
      * @throws ImageUploadException
      *
      * @throws ImageUploadException

-     *
-     * @return string

      */
      */

-    protected function resizeImage(string $imageData, $width = 220, $height = null, bool $keepRatio = true)
+    protected function resizeImage(string $imageData, ?int $width, ?int $height, bool $keepRatio): string

     {
         try {
             $thumb = $this->imageTool->make($imageData);
     {
         try {
             $thumb = $this->imageTool->make($imageData);

-        } catch (Exception $e) {
-            if ($e instanceof ErrorException || $e instanceof NotSupportedException) {
-                throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
-            }
-
-            throw $e;
+        } catch (ErrorException|NotSupportedException $e) {
+            throw new ImageUploadException(trans('errors.cannot_create_thumbs'));

         }
 
         if ($keepRatio) {
         }
 
         if ($keepRatio) {


@@ -368,7 +352,7 @@ class ImageService
     /**
      * Check whether a folder is empty.
      */
     /**
      * Check whether a folder is empty.
      */

-    protected function isFolderEmpty(FileSystemInstance $storage, string $path): bool
+    protected function isFolderEmpty(Storage $storage, string $path): bool

     {
         $files = $storage->files($path);
         $folders = $storage->directories($path);
     {
         $files = $storage->files($path);
         $folders = $storage->directories($path);


@@ -453,10 +437,12 @@ class ImageService
      */
     public function pathExistsInLocalSecure(string $imagePath): bool
     {
      */
     public function pathExistsInLocalSecure(string $imagePath): bool
     {

+        /** @var FilesystemAdapter $disk */

         $disk = $this->getStorageDisk('gallery');
 
         // Check local_secure is active
         return $this->usingSecureImages()
         $disk = $this->getStorageDisk('gallery');
 
         // Check local_secure is active
         return $this->usingSecureImages()

+            && $disk instanceof FilesystemAdapter

             // Check the image file exists
             && $disk->exists($imagePath)
             // Check the file is likely an image file
             // Check the image file exists
             && $disk->exists($imagePath)
             // Check the file is likely an image file


@@ -469,6 +455,7 @@ class ImageService
     public function streamImageFromStorageResponse(string $imageType, string $path): StreamedResponse
     {
         $disk = $this->getStorageDisk($imageType);
     public function streamImageFromStorageResponse(string $imageType, string $path): StreamedResponse
     {
         $disk = $this->getStorageDisk($imageType);

+

         return $disk->response($path);
     }
 
         return $disk->response($path);
     }
 


@@ -523,7 +510,7 @@ class ImageService
      */
     private function getPublicUrl(string $filePath): string
     {
      */
     private function getPublicUrl(string $filePath): string
     {

-        if ($this->storageUrl === null) {
+        if (is_null($this->storageUrl)) {

             $storageUrl = config('filesystems.url');
 
             // Get the standard public s3 url if s3 is set as storage type
             $storageUrl = config('filesystems.url');
 
             // Get the standard public s3 url if s3 is set as storage type


@@ -537,6 +524,7 @@ class ImageService
                     $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
                 }
             }
                     $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
                 }
             }

+

             $this->storageUrl = $storageUrl;
         }
 
             $this->storageUrl = $storageUrl;
         }