NOW MANAGED ON CODEBERG
Range requests: Extracted stream output handling to new class
Dan Brownb4d9029dc301
diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.phpindex 20032f525..f8c10165c 100644--- a/app/Http/DownloadResponseFactory.php+++ b/app/Http/DownloadResponseFactory.php@@ -9,11 +9,9 @@ use Symfony\Component\HttpFoundation\StreamedResponse;class DownloadResponseFactory{- protected Request $request;-- public function __construct(Request $request)- {- $this->request = $request;+ public function __construct(+ protected Request $request+ ) {}/**@@ -27,19 +25,11 @@ class DownloadResponseFactory/*** Create a response that forces a download, from a given stream of content.*/- public function streamedDirectly($stream, string $fileName): StreamedResponse+ public function streamedDirectly($stream, string $fileName, int $fileSize): StreamedResponse{- return response()->stream(function () use ($stream) {-- // End & flush the output buffer, if we're in one, otherwise we still use memory.- // Output buffer may or may not exist depending on PHP `output_buffering` setting.- // Ignore in testing since output buffers are used to gather a response.- if (!empty(ob_get_status()) && !app()->runningUnitTests()) {- ob_end_clean();- }-- fpassthru($stream);- fclose($stream);+ $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);+ return response()->stream(function () use ($rangeStream) {+ $rangeStream->outputAndClose();}, 200, $this->getHeaders($fileName));}@@ -48,15 +38,13 @@ class DownloadResponseFactory* correct for the file, in a way so the browser can show the content in browser,* for a given content stream.*/- public function streamedInline($stream, string $fileName): StreamedResponse+ public function streamedInline($stream, string $fileName, int $fileSize): StreamedResponse{- $sniffContent = fread($stream, 2000);- $mime = (new WebSafeMimeSniffer())->sniff($sniffContent);+ $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);+ $mime = $rangeStream->sniffMime();- return response()->stream(function () use ($sniffContent, $stream) {- echo $sniffContent;- fpassthru($stream);- fclose($stream);+ return response()->stream(function () use ($rangeStream) {+ $rangeStream->outputAndClose();}, 200, $this->getHeaders($fileName, $mime));}diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.phpnew file mode 100644index 000000000..dc3105035--- /dev/null+++ b/app/Http/RangeSupportedStream.php@@ -0,0 +1,57 @@+<?php++namespace BookStack\Http;++use BookStack\Util\WebSafeMimeSniffer;+use Symfony\Component\HttpFoundation\HeaderBag;++class RangeSupportedStream+{+ protected string $sniffContent;++ public function __construct(+ protected $stream,+ protected int $fileSize,+ protected HeaderBag $requestHeaders,+ ) {+ }++ /**+ * Sniff a mime type from the stream.+ */+ public function sniffMime(): string+ {+ $offset = min(2000, $this->fileSize);+ $this->sniffContent = fread($this->stream, $offset);++ return (new WebSafeMimeSniffer())->sniff($this->sniffContent);+ }++ /**+ * Output the current stream to stdout before closing out the stream.+ */+ public function outputAndClose(): void+ {+ // End & flush the output buffer, if we're in one, otherwise we still use memory.+ // Output buffer may or may not exist depending on PHP `output_buffering` setting.+ // Ignore in testing since output buffers are used to gather a response.+ if (!empty(ob_get_status()) && !app()->runningUnitTests()) {+ ob_end_clean();+ }++ $outStream = fopen('php://output', 'w');+ $offset = 0;++ if (!empty($this->sniffContent)) {+ fwrite($outStream, $this->sniffContent);+ $offset = strlen($this->sniffContent);+ }++ $toWrite = $this->fileSize - $offset;+ stream_copy_to_stream($this->stream, $outStream, $toWrite);+ fpassthru($this->stream);++ fclose($this->stream);+ fclose($outStream);+ }+}diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.phpindex ddabec09f..72f78e347 100644--- a/app/Uploads/AttachmentService.php+++ b/app/Uploads/AttachmentService.php@@ -66,8 +66,6 @@ class AttachmentService/*** Stream an attachment from storage.*- * @throws FileNotFoundException- ** @return resource|null*/public function streamAttachmentFromStorage(Attachment $attachment)@@ -75,6 +73,14 @@ class AttachmentServicereturn $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.*diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.phpindex 92f23465d..e61c10338 100644--- a/app/Uploads/Controllers/AttachmentController.php+++ b/app/Uploads/Controllers/AttachmentController.php@@ -226,12 +226,13 @@ class AttachmentController extends Controller$fileName = $attachment->getFileName();$attachmentStream = $this->attachmentService->streamAttachmentFromStorage($attachment);+ $attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment);if ($request->get('open') === 'true') {- return $this->download()->streamedInline($attachmentStream, $fileName);+ return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize);}- return $this->download()->streamedDirectly($attachmentStream, $fileName);+ return $this->download()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);}/**