supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3010 from thelounge/xpaw/fix-binary-uploads

Browse Source 
Fix incorrect 404 error for files with unknown file type
This commit is contained in:
Pavel Djundik 2019-02-02 11:09:19 +02:00 committed by GitHub
commit f14490cdb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/uploader.js
View File

@ -92,18 +92,19 @@ class Uploader {
const folder = name.substring(0, 2); const folder = name.substring(0, 2);
const uploadPath = Helper.getFileUploadPath(); const uploadPath = Helper.getFileUploadPath();
const filePath = path.join(uploadPath, folder, name); const filePath = path.join(uploadPath, folder, name);
const type = Uploader.getFileType(filePath); const detectedMimeType = Uploader.getFileType(filePath);
const mimeType = type || "application/octet-stream";
const contentDisposition = Uploader.isValidType(type) ? "inline" : "attachment";
// doesn't exist // doesn't exist
if (type === undefined) { if (detectedMimeType === null) {
return res.status(404).send("Not found"); return res.status(404).send("Not found");
} }
// Force a download in the browser if it's not a whitelisted type (binary or otherwise unknown)
const contentDisposition = Uploader.isValidType(detectedMimeType) ? "inline" : "attachment";
res.setHeader("Content-Disposition", contentDisposition); res.setHeader("Content-Disposition", contentDisposition);
res.setHeader("Cache-Control", "max-age=86400"); res.setHeader("Cache-Control", "max-age=86400");
res.contentType(mimeType); res.contentType(detectedMimeType);
return res.sendFile(filePath); return res.sendFile(filePath);
}); });
@ -119,31 +120,31 @@ class Uploader {
return configOption * 1024; return configOption * 1024;
} }
// Returns null if an error occurred (e.g. file not found)
// Returns a string with the type otherwise
static getFileType(filePath) { static getFileType(filePath) {
let buffer;
let type;
try { try {
buffer = readChunk.sync(filePath, 0, fileType.minimumBytes); const buffer = readChunk.sync(filePath, 0, fileType.minimumBytes);
} catch (e) {
if (e.code === "ENOENT") { // doesn't exist // returns {ext, mime} if found, null if not.
return; const file = fileType(buffer);
if (file) {
return file.mime;
} }
log.warn(`Failed to read ${filePath}`); if (isUtf8(buffer)) {
return; return "text/plain";
}
return "application/octet-stream";
} catch (e) {
if (e.code !== "ENOENT") {
log.warn(`Failed to read ${filePath}: ${e.message}`);
}
} }
// returns {ext, mime} if found, null if not. return null;
const file = fileType(buffer);
if (file) {
type = file.mime;
} else if (isUtf8(buffer)) {
type = "text/plain";
}
return type;
} }
} }