ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / app / Uploads / AttachmentService.php

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 6a92cb5a543c6a24b6ae069679965b09cb5dbfbc..bd319fbd795af717c4c026d63b9b8bc58ea7fabd 100644 (file)
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -4,12 +4,11 @@ namespace BookStack\Uploads;
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;

-use Illuminate\Contracts\Filesystem\FileNotFoundException;

 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 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 League\Flysystem\WhitespacePathNormalizer;

 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService


@@ -41,7 +40,7 @@ class AttachmentService
 
         // Change to our secure-attachment disk if any of the local options
         // are used to prevent escaping that location.
 
         // Change to our secure-attachment disk if any of the local options
         // are used to prevent escaping that location.

-        if ($storageType === 'local' || $storageType === 'local_secure') {
+        if ($storageType === 'local' || $storageType === 'local_secure' || $storageType === 'local_secure_restricted') {

             $storageType = 'local_secure_attachments';
         }
 
             $storageType = 'local_secure_attachments';
         }
 


@@ -54,7 +53,7 @@ class AttachmentService
      */
     protected function adjustPathForStorageDisk(string $path): string
     {
      */
     protected function adjustPathForStorageDisk(string $path): string
     {

-        $path = Util::normalizePath(str_replace('uploads/files/', '', $path));
+        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/files/', '', $path));

 
         if ($this->getStorageDiskName() === 'local_secure_attachments') {
             return $path;
 
         if ($this->getStorageDiskName() === 'local_secure_attachments') {
             return $path;


@@ -66,8 +65,6 @@ class AttachmentService
     /**
      * Stream an attachment from storage.
      *
     /**
      * Stream an attachment from storage.
      *

-     * @throws FileNotFoundException
-     *

      * @return resource|null
      */
     public function streamAttachmentFromStorage(Attachment $attachment)
      * @return resource|null
      */
     public function streamAttachmentFromStorage(Attachment $attachment)


@@ -75,6 +72,14 @@ class AttachmentService
         return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
     }
 
         return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
     }
 

+    /**
+     * Read the file size of an attachment from storage, in bytes.
+     */
+    public function getAttachmentFileSize(Attachment $attachment): int
+    {
+        return $this->getStorageDisk()->size($this->adjustPathForStorageDisk($attachment->path));
+    }
+

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