Chapril/drop.chapril.org-firefoxsend
Chapril/drop.chapril.org-firefoxsend
25
1
Fork 0
Code Issues Releases Activity

expired ids should reject instead of returning null

Browse Source
This commit is contained in:
Danny Coates 2017-07-25 12:00:52 -07:00
parent 0761fcf902
commit 15ac0e1d49
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/server.js
View File

@ -117,7 +117,7 @@ app.get('/download/:id', (req, res) => {
} }
storage.filename(id).then(filename => { storage.filename(id).then(filename => {
storage return storage
.length(id) .length(id)
.then(contentLength => { .then(contentLength => {
storage.ttl(id).then(timeToExpiry => { storage.ttl(id).then(timeToExpiry => {
@ -128,11 +128,11 @@ app.get('/download/:id', (req, res) => {
timeToExpiry: timeToExpiry timeToExpiry: timeToExpiry
}); });
}); });
});
}) })
.catch(() => { .catch(() => {
res.status(404).render('notfound'); res.status(404).render('notfound');
}); });;
});
}); });
app.get('/assets/download/:id', (req, res) => { app.get('/assets/download/:id', (req, res) => {

7
server/storage.js
View File

@ -90,11 +90,10 @@ function ttl(id) {
function filename(id) { function filename(id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
redis_client.hget(id, 'filename', (err, reply) => { redis_client.hget(id, 'filename', (err, reply) => {
if (!err) { if (err || !reply) {
resolve(reply); return reject();
} else {
reject(err);
} }
resolve(reply);
}); });
}); });
} }