OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

Fix bug in /api/readFromArchive

Browse source 
Well, two bugs: one with URL encoding, and another minor one where I forgot to return after ending the request with 404, oops lol :p
This commit is contained in:
Emi Matchu 2022-10-13 14:02:37 -07:00
parent 5e6939309a
commit 861f3ab881
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pages/api/readFromArchive.js
View file

@ -47,7 +47,14 @@ async function handle(req, res) {
// So basically, just the host, path, and query string; no protocol or hash. // So basically, just the host, path, and query string; no protocol or hash.
// (Most archive keys don't have a query string, but some do! And don't // (Most archive keys don't have a query string, but some do! And don't
// worry, `parsedUrl.search` will just be empty if there's no query string.) // worry, `parsedUrl.search` will just be empty if there's no query string.)
const archiveKey = `${parsedUrl.host}${parsedUrl.pathname}${parsedUrl.search}`; //
// The archive key doesn't include URL encoding (e.g. it has " " instead of
// "%20"), but the URI object gives us encoded paths and queries for safety
// by default, so we need to decode them when constructing the key!
const archiveKey =
parsedUrl.host +
decodeURIComponent(parsedUrl.pathname) +
decodeURIComponent(parsedUrl.search);
let archiveRes; let archiveRes;
try { try {
archiveRes = await fetchFromArchive(archiveKey); archiveRes = await fetchFromArchive(archiveKey);
@ -55,6 +62,7 @@ async function handle(req, res) {
if (error.Code === "NoSuchKey") { if (error.Code === "NoSuchKey") {
res.status(404); res.status(404);
res.end(); res.end();
return;
} }
res.end(`Error loading file from archive: ${error.message}`); res.end(`Error loading file from archive: ${error.message}`);