set downloadMetadata.status to 404 on unfound downloads. fixes mozill…

…a#1501 Co-authored-by: timvisee <[email protected]>
giang12 · Oct 16, 2020 · 28c48f5 · 28c48f5
1 parent 239fba4
commit 28c48f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/app/ui/download.js b/app/ui/download.js
@@ -55,9 +55,13 @@ module.exports = function(state, emit) {
   let content = '';
   if (!state.fileInfo) {
     state.fileInfo = createFileInfo(state);
-    if (!state.fileInfo.nonce) {
+    if (downloadMetadata.status === 404) {
       return notFound(state);
     }
+    if (!state.fileInfo.nonce) {
+      // coming from something like the browser back button
+      return location.reload();
+    }
   }
 
   if (!state.transfer && !state.fileInfo.requiresPassword) {

diff --git a/server/routes/pages.js b/server/routes/pages.js
@@ -56,6 +56,15 @@ module.exports = {
 
   notfound: async function(req, res) {
     const appState = await state(req);
-    res.status(404).send(stripEvents(routes().toString('/404', appState)));
+    res
+      .status(404)
+      .send(
+        stripEvents(
+          routes().toString(
+            '/404',
+            Object.assign(appState, { downloadMetadata: { status: 404 } })
+          )
+        )
+      );
   }
 };