ACP2E-1627: [Cloud] Magento Product Recommendation/Data Services Causing File Download Warning

Author: bubasuma

lib/internal/Magento/Framework/App/Response/File.php

@@ -12,6 +12,7 @@
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\NotCacheableInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Driver\File\Mime;
 use Magento\Framework\Session\Config\ConfigInterface;
@@ -24,6 +25,8 @@
  */
 class File extends Http implements NotCacheableInterface
 {
+    private const DEFAULT_RAW_CONTENT_TYPE = 'application/octet-stream';
+
     /**
      * @var Http
      */
@@ -83,49 +86,55 @@ public function __construct(
         $this->filesystem = $filesystem;
         $this->mime = $mime;
         $this->options = array_merge($this->options, $options);
+        if (!isset($this->options['filePath'])) {
+            if (!isset($this->options['fileName'])) {
+                throw new InvalidArgumentException("File name is required.");
+            }
+            $this->options['contentType'] ??= self::DEFAULT_RAW_CONTENT_TYPE;
+        }
     }
 
     /**
      * @inheritDoc
      */
     public function sendResponse()
     {
-        $dir = $this->filesystem->getDirectoryWrite($this->options['directoryCode']);
-        if (!isset($this->options['filePath'])) {
-            throw new InvalidArgumentException("File path is required.");
-        }
-        if (!$dir->isExist($this->options['filePath'])) {
-            throw new InvalidArgumentException("File '{$this->options['filePath']}' does not exists.");
+        $dir = $this->filesystem->getDirectoryRead($this->options['directoryCode']);
+        $forceHeaders = true;
+        if (isset($this->options['filePath'])) {
+            if (!$dir->isExist($this->options['filePath'])) {
+                throw new InvalidArgumentException("File '{$this->options['filePath']}' does not exists.");
+            }
+            $filePath = $this->options['filePath'];
+            $this->options['contentType'] ??= $dir->stat($filePath)['mimeType']
+                ?? $this->mime->getMimeType($dir->getAbsolutePath($filePath));
+            $this->options['contentLength'] ??= $dir->stat($filePath)['size'];
+            $this->options['fileName'] ??= basename($filePath);
+        } else {
+            $this->options['contentLength'] = mb_strlen((string) $this->response->getContent(), '8bit');
+            $forceHeaders = false;
         }
-        $filePath = $this->options['filePath'];
-        $contentType = $this->options['contentType']
-            ?? $dir->stat($filePath)['mimeType']
-            ?? $this->mime->getMimeType($dir->getAbsolutePath($filePath));
-        $contentLength = $this->options['contentLength']
-            ?? $dir->stat($filePath)['size'];
-        $fileName = $this->options['fileName']
-            ?? basename($filePath);
+
         $this->response->setHttpResponseCode(200);
-        $this->response->setHeader('Content-type', $contentType, true)
-            ->setHeader('Content-Length', $contentLength, true)
-            ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"', true)
-            ->setHeader('Pragma', 'public', true)
-            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
-            ->setHeader('Last-Modified', date('r'), true);
-
-        $this->response->sendHeaders();
-
-        if (!$this->request->isHead()) {
-            $stream = $dir->openFile($filePath, 'r');
-            while (!$stream->eof()) {
-                // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
-                echo $stream->read(1024);
-            }
-            $stream->close();
-            if ($this->options['remove']) {
-                $dir->delete($filePath);
+        $this->response->setHeader('Content-Type', $this->options['contentType'], $forceHeaders)
+            ->setHeader('Content-Length', $this->options['contentLength'], $forceHeaders)
+            ->setHeader(
+                'Content-Disposition',
+                'attachment; filename="' . $this->options['fileName'] . '"',
+                $forceHeaders
+            )
+            ->setHeader('Pragma', 'public', $forceHeaders)
+            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', $forceHeaders)
+            ->setHeader('Last-Modified', date('r'), $forceHeaders);
+
+        if (isset($this->options['filePath'])) {
+            $this->response->sendHeaders();
+            if (!$this->request->isHead()) {
+                $this->sendFileContent();
+                $this->afterFileIsSent();
             }
-            $this->response->clearBody();
+        } else {
+            $this->response->sendResponse();
         }
         return $this;
     }
@@ -155,4 +164,70 @@ public function clearHeader($name)
         $this->response->clearHeader($name);
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBody($value)
+    {
+        $this->response->setBody($value);
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function appendBody($value)
+    {
+        $this->response->appendBody($value);
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getContent()
+    {
+        return $this->response->getContent();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setContent($value)
+    {
+        $this->response->setContent($value);
+        return $this;
+    }
+
+    /**
+     * Sends file content to the client
+     *
+     * @return void
+     * @throws FileSystemException
+     */
+    private function sendFileContent(): void
+    {
+        $dir = $this->filesystem->getDirectoryRead($this->options['directoryCode']);
+        $stream = $dir->openFile($this->options['filePath'], 'r');
+        while (!$stream->eof()) {
+            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
+            echo $stream->read(1024);
+        }
+        $stream->close();
+    }
+
+    /**
+     * Callback after file is sent to the client
+     *
+     * @return void
+     * @throws FileSystemException
+     */
+    private function afterFileIsSent(): void
+    {
+        if ($this->options['remove']) {
+            $dir = $this->filesystem->getDirectoryWrite($this->options['directoryCode']);
+            $dir->delete($this->options['filePath']);
+        }
+    }
 }