LIMS-1962: Allow downloading of html files (#1006)

* LIMS-1962: Allow downloading of html files

* LIMS-1962: Ignore security advisories

* Update api/composer.json

Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

Author: 3 people

api/src/Page/Download.php

@@ -268,8 +268,8 @@ function _get_file($id, $file)
             $response->headers->set("Content-Length", filesize($filename));
         } elseif ($filesystem->exists($filename.'.gz')) {
             $filename = $filename.'.gz';
-            if ($this->arg('download') == 1) {
-                // View log file, so unzip and serve
+            if ($this->has_arg('download') && $this->arg('download') < 3) {
+                // View/open file, so unzip and serve
                 $response = new Response(readgzfile($filename));
                 $this->set_mime_content($response, $file['FILENAME'], $id);
             } else {
@@ -549,21 +549,20 @@ function set_mime_content($response, $filename, $prefix = null)
 
         if (in_array($path_ext, array('html', 'htm'))) {
             $response->headers->set("Content-Type", "text/html");
-            $this->_set_disposition_inline($response);
         } elseif ($path_ext == 'pdf') {
             $response->headers->set("Content-Type", "application/pdf");
-            $this->_set_disposition_attachment($response, $saved_filename);
         } elseif ($path_ext == 'png') {
             $response->headers->set("Content-Type", "image/png");
-            $this->_set_disposition_attachment($response, $saved_filename);
         } elseif (in_array($path_ext, array('jpg', 'jpeg'))) {
             $response->headers->set("Content-Type", "image/jpeg");
-            $this->_set_disposition_attachment($response, $saved_filename);
-        } elseif (in_array($path_ext, array('log', 'txt', 'error', 'LP', 'json', 'lsa'))) {
+        } elseif (in_array($path_ext, array('log', 'txt', 'error', 'LP', 'json', 'lsa', 'lst'))) {
             $response->headers->set("Content-Type", "text/plain");
-            $this->_set_disposition_inline($response);
         } else {
             $response->headers->set("Content-Type", "application/octet-stream");
+        }
+        if ($this->has_arg('download') && $this->arg('download') < 3) {
+            $this->_set_disposition_inline($response);
+        } else {
             $this->_set_disposition_attachment($response, $saved_filename);
         }
     }

client/src/js/modules/dc/views/autoprocattachments.js

@@ -75,12 +75,13 @@ define(['marionette',
                 var baseDownloadUrl = `${app.apiurl}/download/${this.column.escape('urlRoot')}/attachments/${this.model.escape(this.column.get('idParam'))}`
 
                 // Default behaviour for download btn
-                this.$el.html(`<a href="${baseDownloadUrl}/dl/2" class="button dl"><i class="fa fa-download"/> Download</a>`)
+                this.$el.html(`<a href="${baseDownloadUrl}/dl/3" class="button dl"><i class="fa fa-download"/> Download</a>`)
 
                 // Additional btns per filetype
                 switch (this.model.get('FILETYPE')) {
                     case 'Log':
                     case 'Logfile':
+                        this.$el.append(`<a class="dl button" href="${baseDownloadUrl}/dl/2"><i class="fa fa-file-text-o"/> Open</a>`)
                         this.$el.append(`<a class="vaplog button" href="${baseDownloadUrl}/dl/1"> <i class="fa fa-search"/> View </a>`);
                         break;