Node.js based forum software built for the modern web
fix: private upload path bypass
Barış Soner Uşaklı35e7587cf025
diff --git a/src/middleware/index.js b/src/middleware/index.jsindex 91af064ae6..edaec2cd7b 100644--- a/src/middleware/index.js+++ b/src/middleware/index.js@@ -213,12 +213,12 @@ middleware.privateUploads = function privateUploads(req, res, next) {const uploadPrefix = `${nconf.get('relative_path')}/assets/uploads/files`;let requestPath = req.path;try {- requestPath = decodeURIComponent(requestPath);+ requestPath = path.posix.normalize(decodeURIComponent(requestPath));} catch (err) {return res.status(403).json('not-allowed');}- if (requestPath.startsWith(uploadPrefix)) {+ if (requestPath === uploadPrefix || requestPath.startsWith(`${uploadPrefix}/`)) {const extensions = (meta.config.privateUploadsExtensions || '').split(',').map(ext => ext.trim().toLowerCase())@@ -282,10 +282,11 @@ middleware.buildSkinAsset = helpers.try(async (req, res, next) => {res.status(200).type('text/css').send(req.originalUrl.includes('-rtl') ? rtl : ltr);});-middleware.addUploadHeaders = function addUploadHeaders(req, res, next) {+middleware.addUploadHeaders = helpers.try(function addUploadHeaders(req, res, next) {// Trim uploaded files' timestamps when downloading + force download if unsafe- let basename = path.basename(req.path);- const extname = path.extname(req.path).toLowerCase();+ const p = path.posix.normalize(decodeURIComponent(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',@@ -296,7 +297,7 @@ middleware.addUploadHeaders = function addUploadHeaders(req, res, next) {];const isInlineSafe = !unsafeExtensions.includes(extname);const dispositionType = isInlineSafe ? 'inline' : 'attachment';- if (req.path.startsWith('/uploads/')) {+ if (p.startsWith('/uploads/')) {if (middleware.regexes.timestampedUpload.test(basename)) {basename = basename.slice(14);}@@ -305,7 +306,7 @@ middleware.addUploadHeaders = function addUploadHeaders(req, res, next) {}next();-};+});middleware.validateAuth = helpers.try(async (req, res, next) => {try {diff --git a/test/uploads.js b/test/uploads.jsindex 2184d796a2..2508d835a9 100644--- a/test/uploads.js+++ b/test/uploads.js@@ -262,6 +262,41 @@ describe('Upload Controllers', () => {}});+ it('should block path traversal and double slashes for unauthenticated users', async () => {+ const oldPrivateUploads = meta.config.privateUploads;+ const oldPrivateUploadsExtensions = meta.config.privateUploadsExtensions;+ const uploadPath = nconf.get('upload_path');+ const filename = `private-ext-${Date.now()}.pdf`;+ const filePath = path.join(uploadPath, 'files', filename);++ meta.config.privateUploads = 1;+ meta.config.privateUploadsExtensions = 'pdf';++ try {+ await fs.writeFile(filePath, 'PDFSECRET', 'utf8');++ const requestPathsToCheck = [+ `/assets/uploads//files/${filename}`,+ `/assets/uploads///files/${filename}`,+ `/assets/uploads/../uploads/files/${filename}`,+ `/assets/uploads/./files/${filename}`,+ `/assets/x/../uploads/files/${filename}`,+ `/assets/uploads/%2e%2e/uploads/files/${filename}`,+ `/assets/uploads/%2e/files/${filename}`,+ ];+ for (const p of requestPathsToCheck) {+ // eslint-disable-next-line no-await-in-loop+ const { response: encodedResponse } = await request.get(`${nconf.get('url')}${p}`);+ assert.strictEqual(encodedResponse.statusCode, 403, `Failed for path: ${p}`);+ }+ } finally {+ await file.delete(filePath);+ meta.config.privateUploads = oldPrivateUploads;+ meta.config.privateUploadsExtensions = oldPrivateUploadsExtensions;+ }+ });++it('should fail to upload image to post if image dimensions are too big', async () => {const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/post/upload`, path.join(__dirname, '../test/files/toobig.png'), {}, jar, csrf_token);assert.strictEqual(response.statusCode, 500);@@ -542,9 +577,23 @@ describe('Upload Controllers', () => {}, jar, csrf_token);assert.equal(body[0].url, '/assets/uploads/xss-dirty.xml');- const { response: fileResponse, body: uploadedBody } = await request.get(`${nconf.get('url')}${body[0].url}`);- assert.strictEqual(fileResponse.headers['content-disposition'], 'attachment; filename="xss-dirty.xml"');- assert.equal(fileResponse.statusCode, 200);+ const urlsToTest = [+ body[0].url,+ `/assets/../assets/uploads//xss-dirty.xml`,+ `/assets/uploads///xss-dirty.xml`,+ `/assets/uploads/../uploads/xss-dirty.xml`,+ `/assets/uploads/./xss-dirty.xml`,+ `/assets/x/../uploads/xss-dirty.xml`,+ `/assets/uploads/%2e%2e/uploads/xss-dirty.xml`,+ `/assets/uploads/%2e/xss-dirty.xml`,+ ];++ 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);+ }});it('should keep valid xml file unchanged', async () => {