From 5930f097af559846a774bae1621f4dc3d4168254 Mon Sep 17 00:00:00 2001
From: KaseiFR <kaseifr@gmail.com>
Date: Sat, 2 Apr 2022 15:35:43 +0200
Subject: [PATCH 1/2] server: remove Firefox workaround in torrent data handler

The Firefox bug was fixed in version 87.
---
 server/routes/api/torrents.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/routes/api/torrents.ts b/server/routes/api/torrents.ts
index 7898c2a27..e75785706 100644
--- a/server/routes/api/torrents.ts
+++ b/server/routes/api/torrents.ts
@@ -706,17 +706,14 @@ router.get<{hash: string; indices: string}, unknown, unknown, {token: string}>(
     const {hash, indices: stringIndices} = req.params;
 
     if (req.user != null && req.query.token == null) {
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=1689018
-      if (req.headers?.['user-agent']?.includes('Firefox/') !== true) {
-        res.redirect(
-          `?token=${getToken<ContentToken>({
-            username: req.user.username,
-            hash,
-            indices: stringIndices,
-          })}`,
-        );
-        return res;
-      }
+      res.redirect(
+        `?token=${getToken<ContentToken>({
+          username: req.user.username,
+          hash,
+          indices: stringIndices,
+        })}`,
+      );
+      return res;
     }
 
     const selectedTorrent = req.services.torrentService.getTorrent(hash);

From a788b794a299a18d7539c66152e19e9df6f4376d Mon Sep 17 00:00:00 2001
From: KaseiFR <kaseifr@gmail.com>
Date: Sat, 2 Apr 2022 17:50:37 +0200
Subject: [PATCH 2/2] Fix torrent download extension override

The API data handler streaming feature is now opt-in, and controls
whether the file type is overridden.
---
 .../general/filesystem/DirectoryFileList.tsx  |  2 +-
 .../torrent-details-modal/TorrentContents.tsx | 34 ++++--------
 server/routes/api/torrents.ts                 | 52 +++++++++----------
 3 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/client/src/javascript/components/general/filesystem/DirectoryFileList.tsx b/client/src/javascript/components/general/filesystem/DirectoryFileList.tsx
index d068e7d95..39fa20b64 100644
--- a/client/src/javascript/components/general/filesystem/DirectoryFileList.tsx
+++ b/client/src/javascript/components/general/filesystem/DirectoryFileList.tsx
@@ -65,7 +65,7 @@ const DirectoryFiles: FC<DirectoryFilesProps> = ({depth, items, hash, path, onIt
             <div className="file__name">
               {/* TODO: Add a WebAssembly decoding player if the feature is popular */}
               <a
-                href={`${ConfigStore.baseURI}api/torrents/${hash}/contents/${file.index}/data`}
+                href={`${ConfigStore.baseURI}api/torrents/${hash}/contents/${file.index}/data?streaming`}
                 style={{textDecoration: 'none'}}
                 target="_blank"
                 rel="noreferrer"
diff --git a/client/src/javascript/components/modals/torrent-details-modal/TorrentContents.tsx b/client/src/javascript/components/modals/torrent-details-modal/TorrentContents.tsx
index 769e58fb7..47ce4d2a3 100644
--- a/client/src/javascript/components/modals/torrent-details-modal/TorrentContents.tsx
+++ b/client/src/javascript/components/modals/torrent-details-modal/TorrentContents.tsx
@@ -143,29 +143,17 @@ const TorrentContents: FC = observer(() => {
               }}
             />
           </FormRowItem>
-          <Button
-            onClick={(event) => {
-              event.preventDefault();
-              const {baseURI} = ConfigStore;
-              const link = document.createElement('a');
-
-              link.download = '';
-              link.href = `${baseURI}api/torrents/${hash}/contents/${selectedIndices.join(',')}/data`;
-              link.style.display = 'none';
-
-              document.body.appendChild(link);
-              link.click();
-              document.body.removeChild(link);
-            }}
-            grow={false}
-            shrink={false}
-          >
-            <Trans
-              id="torrents.details.files.download.file"
-              values={{
-                count: selectedIndices.length,
-              }}
-            />
+          <Button>
+            <a
+              href={`${ConfigStore.baseURI}api/torrents/${hash}/contents/${selectedIndices.join(',')}/data`}
+              style={{textDecoration: 'none'}}
+              download
+            >
+              <Trans
+                id="torrents.details.files.download.file"
+                values={{count: selectedIndices.length}}
+              />
+            </a>
           </Button>
           <Select id="file-priority" persistentPlaceholder shrink={false} defaultID="">
             <SelectItem id={-1} isPlaceholder>
diff --git a/server/routes/api/torrents.ts b/server/routes/api/torrents.ts
index e75785706..ff7bc7b3b 100644
--- a/server/routes/api/torrents.ts
+++ b/server/routes/api/torrents.ts
@@ -3,6 +3,7 @@ import contentDisposition from 'content-disposition';
 import createTorrent from 'create-torrent';
 import express, {Response} from 'express';
 import fs from 'fs';
+import qs from 'qs';
 import path from 'path';
 import rateLimit from 'express-rate-limit';
 import sanitize from 'sanitize-filename';
@@ -692,9 +693,10 @@ router.get<{hash: string; indices: string}, unknown, unknown, {token: string}>(
  * @security User
  * @param {string} hash.path
  * @param {string} indices.path - 'all' or indices of selected contents separated by ','
- * @return {object} 200 - contents archived in .tar - application/x-tar
+ * @param {string} streaming - if present with a single index will try to make browsers display the data
+ * @return {object} 200 - file data for a single index or multiple files archived in .tar - application/x-tar
  */
-router.get<{hash: string; indices: string}, unknown, unknown, {token: string}>(
+router.get<{hash: string; indices: string}, unknown, unknown, {token: string; streaming?: string}>(
   '/:hash/contents/:indices/data',
   // This operation is resource-intensive
   // Limit each IP to 200 requests every 5 minutes
@@ -706,13 +708,12 @@ router.get<{hash: string; indices: string}, unknown, unknown, {token: string}>(
     const {hash, indices: stringIndices} = req.params;
 
     if (req.user != null && req.query.token == null) {
-      res.redirect(
-        `?token=${getToken<ContentToken>({
-          username: req.user.username,
-          hash,
-          indices: stringIndices,
-        })}`,
-      );
+      const token = getToken<ContentToken>({
+        username: req.user.username,
+        hash,
+        indices: stringIndices,
+      });
+      res.redirect('?' + qs.stringify({...req.query, token}));
       return res;
     }
 
@@ -760,26 +761,25 @@ router.get<{hash: string; indices: string}, unknown, unknown, {token: string}>(
           const fileExt = path.extname(file);
 
           let processedType: string = fileExt;
-          switch (fileExt) {
-            // Browsers don't support MKV streaming. However, browsers do support WebM which is a
-            // subset of MKV. Chromium supports MKV when encoded in selected codecs.
-            case '.mkv':
-              processedType = 'video/webm';
-              break;
-            // MIME database uses x-flac which is not recognized by browsers as streamable audio.
-            case '.flac':
-              processedType = 'audio/flac';
-              break;
-            default:
-              break;
+          let contentDispositionType = 'attachment';
+
+          if (req.query.streaming !== undefined) {
+            processedType =
+              {
+                // Browsers don't support MKV streaming. However, browsers do support WebM which is a
+                // subset of MKV. Chromium supports MKV when encoded in selected codecs.
+                '.mkv': 'video/webm',
+                // MIME database uses x-flac which is not recognized by browsers as streamable audio.
+                '.flac': 'audio/flac',
+              }[fileExt] ?? fileExt;
+
+            // Allow browsers to display the content inline when only a single content is requested.
+            // This is useful for texts, videos and audios. Users can still download them if needed.
+            contentDispositionType = 'inline';
           }
 
           res.type(processedType);
-
-          // Allow browsers to display the content inline when only a single content is requested.
-          // This is useful for texts, videos and audios. Users can still download them if needed.
-          res.setHeader('content-disposition', contentDisposition(fileName, {type: 'inline'}));
-
+          res.setHeader('content-disposition', contentDisposition(fileName, {type: contentDispositionType}));
           res.sendFile(file);
 
           return res;