Skip to content

Node.js based forum software built for the modern web

fix: #14608

Barış Soner Uşaklı979654dca43d
diff --git a/src/middleware/index.js b/src/middleware/index.js
index f998e84cdf..8c66a51d4d 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -219,35 +219,38 @@ middleware.privateUploads = function privateUploads(req, res, next) {
}
if (requestPath === uploadPrefix || requestPath.startsWith(`${uploadPrefix}/`)) {
- const extensions = (meta.config.privateUploadsExtensions || '')
+ const privateExtensions = (meta.config.privateUploadsExtensions || '')
.split(',')
.map(ext => ext.trim().toLowerCase())
.filter(Boolean);
let ext = path.extname(requestPath);
- ext = ext ? ext.replace(/^\./, '').toLowerCase() : ext;
- if (!extensions.length || extensions.includes(ext)) {
+ ext = ext ? ext.replace(/^\./, '').trim().toLowerCase() : ext;
+ if (!ext || !privateExtensions.length || privateExtensions.includes(ext)) {
return res.status(403).json('not-allowed');
}
}
next();
};
+const unsafeExtensions = new Set([
+ '', '.',
+ '.html', '.htm', '.xhtml', '.mht', '.mhtml', '.stm', '.shtm', '.shtml',
+ '.svg', '.svgz',
+ '.xml', '.xsl', '.xslt',
+ '.rss', '.atom', '.rpf', '.rng', '.sch', '.dtd', '.epub',
+ '.xaml', '.plist', '.vcf', '.opf', '.rdf', '.wsdl', '.resx',
+ '.xsd', '.mathml', '.xht',
+]);
+
middleware.addUploadHeaders = helpers.try(function addUploadHeaders(req, res, next) {
// Trim uploaded files' timestamps when downloading + force download if unsafe
const p = normalizeUploadRequestPath(req.path);
- let basename = path.basename(p);
- const extname = path.extname(p).toLowerCase();
- const unsafeExtensions = [
- '.html', '.htm', '.xhtml', '.mht', '.mhtml', '.stm', '.shtm', '.shtml',
- '.svg', '.svgz',
- '.xml', '.xsl', '.xslt',
- '.rss', '.atom', '.rpf', '.rng', '.sch', '.dtd', '.epub',
- '.xaml', '.plist', '.vcf', '.opf', '.rdf', '.wsdl', '.resx',
- '.xsd', '.mathml', '.xht',
- ];
- const isInlineSafe = !unsafeExtensions.includes(extname);
- const dispositionType = isInlineSafe ? 'inline' : 'attachment';
+
if (p.startsWith('/uploads/')) {
+ let basename = path.basename(p);
+ const extname = path.extname(p).trim().toLowerCase();
+ const isInlineSafe = !unsafeExtensions.has(extname);
+ const dispositionType = isInlineSafe ? 'inline' : 'attachment';
if (middleware.regexes.timestampedUpload.test(basename)) {
basename = basename.slice(14);
}
@@ -260,7 +263,7 @@ middleware.addUploadHeaders = helpers.try(function addUploadHeaders(req, res, ne
function normalizeUploadRequestPath(requestPath) {
const decodedPath = decodeURIComponent(requestPath);
- if (decodedPath.includes(':')) {
+ if (decodedPath.includes(':') || /[. ](\/|$)/.test(decodedPath)) {
const err = new Error('[[error:invalid-path]]');
err.status = 403;
throw err;
diff --git a/test/uploads.js b/test/uploads.js
index 19c9328086..88b7d62f1c 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -262,7 +262,7 @@ describe('Upload Controllers', () => {
}
});
- it('should block NTFS stream ::$DATA', async () => {
+ it('should block NTFS stream ::$DATA and . bypass', async () => {
const oldPrivateUploads = meta.config.privateUploads;
const oldPrivateUploadsExtensions = meta.config.privateUploadsExtensions;
const uploadPath = nconf.get('upload_path');
@@ -280,15 +280,31 @@ describe('Upload Controllers', () => {
const directUrl = new URL(publicPath, nconf.get('base_url')).href;
const streamUrl = new URL(publicPath.replace(/\.pdf$/, '.pdf::$DATA'), nconf.get('base_url')).href;
const percentEncoded = new URL(publicPath.replace(/\.pdf$/, '.pdf%3A%3A%24DATA'), nconf.get('base_url')).href;
+ const extraDot = new URL(publicPath.replace(/\.pdf$/, '.pdf.'), nconf.get('base_url')).href;
+ const extraDotEncoded = new URL(publicPath.replace(/\.pdf$/, '.pdf%2E'), nconf.get('base_url')).href;
+ const space = new URL(publicPath.replace(/\.pdf$/, '.pdf '), nconf.get('base_url')).href;
+ const spaceEncoded = new URL(publicPath.replace(/\.pdf$/, '.pdf%20'), nconf.get('base_url')).href;
const { response: directResponse } = await request.get(directUrl);
- assert.strictEqual(directResponse.statusCode, 403);
+ assert.strictEqual(directResponse.statusCode, 403, `Failed for url: ${directUrl}`);
const { response: streamResponse } = await request.get(streamUrl);
- assert.strictEqual(streamResponse.statusCode, 403);
+ assert.strictEqual(streamResponse.statusCode, 403, `Failed for url: ${streamUrl}`);
const { response: percentEncodedResponse } = await request.get(percentEncoded);
- assert.strictEqual(percentEncodedResponse.statusCode, 403);
+ assert.strictEqual(percentEncodedResponse.statusCode, 403, `Failed for url: ${percentEncoded}`);
+
+ const { response: extraDotResponse } = await request.get(extraDot);
+ assert.strictEqual(extraDotResponse.statusCode, 403, `Failed for url: ${extraDot}`);
+
+ const { response: extraDotEncodedResponse } = await request.get(extraDotEncoded);
+ assert.strictEqual(extraDotEncodedResponse.statusCode, 403, `Failed for url: ${extraDotEncoded}`);
+
+ const { response: spaceResponse } = await request.get(space);
+ assert.strictEqual(spaceResponse.statusCode, 403, `Failed for url: ${space}`);
+
+ const { response: spaceEncodedResponse } = await request.get(spaceEncoded);
+ assert.strictEqual(spaceEncodedResponse.statusCode, 403, `Failed for url: ${spaceEncoded}`);
} finally {
await file.delete(filePath);
meta.config.privateUploads = oldPrivateUploads;
@@ -621,13 +637,28 @@ describe('Upload Controllers', () => {
`/assets/x/../uploads/xss-dirty.xml`,
`/assets/uploads/%2e%2e/uploads/xss-dirty.xml`,
`/assets/uploads/%2e/xss-dirty.xml`,
+ `/assets/uploads/xss-dirty.xml `,
+ ];
+
+ const urlsTo403 = [
+ `/assets/uploads/xss-dirty.xml::$DATA`,
+ `/assets/uploads/xss-dirty.xml%3A%3A%24DATA`,
+ `/assets/uploads/xss-dirty.xml.`,
+ `/assets/uploads/xss-dirty.xml%2E`,
+ `/assets/uploads/xss-dirty.xml%20`,
];
for (const url of urlsToTest) {
// eslint-disable-next-line no-await-in-loop
const { response: fileResponse } = await request.get(`${nconf.get('url')}${url}`);
- assert.strictEqual(fileResponse.headers['content-disposition'], 'attachment; filename="xss-dirty.xml"');
assert.equal(fileResponse.statusCode, 200, `Failed for url: ${url}`);
+ assert.strictEqual(fileResponse.headers['content-disposition'], 'attachment; filename="xss-dirty.xml"', `Failed for url: ${url}`);
+ }
+
+ for (const url of urlsTo403) {
+ // eslint-disable-next-line no-await-in-loop
+ const { response: fileResponse } = await request.get(`${nconf.get('url')}${url}`);
+ assert.equal(fileResponse.statusCode, 403, `Failed for url: ${url}`);
}
});