Skip intermediate login page with single provider

[bookstack] / app / Uploads / AttachmentService.php

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index c9cd99b389b2a068874fbd003e13b1c0724de8ec..9d1f96ae42f99178f6b3fd10406a4572805b5943 100644 (file)
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -4,9 +4,9 @@ namespace BookStack\Uploads;
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;

-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\Filesystem\FilesystemManager;

 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use League\Flysystem\Util;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use League\Flysystem\Util;


@@ -14,12 +14,12 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService
 {
 
 class AttachmentService
 {

-    protected $fileSystem;
+    protected FilesystemManager $fileSystem;

 
     /**
      * AttachmentService constructor.
      */
 
     /**
      * AttachmentService constructor.
      */

-    public function __construct(FileSystem $fileSystem)
+    public function __construct(FilesystemManager $fileSystem)

     {
         $this->fileSystem = $fileSystem;
     }
     {
         $this->fileSystem = $fileSystem;
     }


@@ -27,7 +27,7 @@ class AttachmentService
     /**
      * Get the storage that will be used for storing files.
      */
     /**
      * Get the storage that will be used for storing files.
      */

-    protected function getStorageDisk(): FileSystemInstance
+    protected function getStorageDisk(): Storage

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


@@ -73,6 +73,18 @@ class AttachmentService
         return $this->getStorageDisk()->get($this->adjustPathForStorageDisk($attachment->path));
     }
 
         return $this->getStorageDisk()->get($this->adjustPathForStorageDisk($attachment->path));
     }
 

+    /**
+     * Stream an attachment from storage.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return resource|null
+     */
+    public function streamAttachmentFromStorage(Attachment $attachment)
+    {
+        return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
+    }
+

     /**
      * Store a new attachment upon user upload.
      *
     /**
      * Store a new attachment upon user upload.
      *


@@ -211,20 +223,19 @@ class AttachmentService
      */
     protected function putFileInStorage(UploadedFile $uploadedFile): string
     {
      */
     protected function putFileInStorage(UploadedFile $uploadedFile): string
     {

-        $attachmentData = file_get_contents($uploadedFile->getRealPath());
-

         $storage = $this->getStorageDisk();
         $basePath = 'uploads/files/' . date('Y-m-M') . '/';
 
         $storage = $this->getStorageDisk();
         $basePath = 'uploads/files/' . date('Y-m-M') . '/';
 

-        $uploadFileName = Str::random(16) . '.' . $uploadedFile->getClientOriginalExtension();
+        $uploadFileName = Str::random(16) . '-' . $uploadedFile->getClientOriginalExtension();

         while ($storage->exists($this->adjustPathForStorageDisk($basePath . $uploadFileName))) {
             $uploadFileName = Str::random(3) . $uploadFileName;
         }
 
         while ($storage->exists($this->adjustPathForStorageDisk($basePath . $uploadFileName))) {
             $uploadFileName = Str::random(3) . $uploadFileName;
         }
 

+        $attachmentStream = fopen($uploadedFile->getRealPath(), 'r');

         $attachmentPath = $basePath . $uploadFileName;
 
         try {
         $attachmentPath = $basePath . $uploadFileName;
 
         try {

-            $storage->put($this->adjustPathForStorageDisk($attachmentPath), $attachmentData);
+            $storage->writeStream($this->adjustPathForStorageDisk($attachmentPath), $attachmentStream);

         } catch (Exception $e) {
             Log::error('Error when attempting file upload:' . $e->getMessage());
 
         } catch (Exception $e) {
             Log::error('Error when attempting file upload:' . $e->getMessage());
 


@@ -233,4 +244,12 @@ class AttachmentService
 
         return $attachmentPath;
     }
 
         return $attachmentPath;
     }

+
+    /**
+     * Get the file validation rules for attachments.
+     */
+    public function getFileValidationRules(): array
+    {
+        return ['file', 'max:' . (config('app.upload_limit') * 1000)];
+    }

 }
 }