Node.js based forum software built for the modern web
fix: on the manage uploads page files can be uploaded to the uploads folder
Barış Soner Uşaklı8d0600473782
diff --git a/public/language/en-GB/admin/manage/uploads.json b/public/language/en-GB/admin/manage/uploads.jsonindex e5f3a2a940..642703670c 100644--- a/public/language/en-GB/admin/manage/uploads.json+++ b/public/language/en-GB/admin/manage/uploads.json@@ -8,5 +8,6 @@"confirm-delete": "Do you really want to delete this file?","filecount": "%1 files","new-folder": "New Folder",- "name-new-folder": "Enter a name for new the folder"+ "name-new-folder": "Enter a name for new the folder",+ "unsafe-file-warning": "Warning: Do not upload files that you do not trust. Files with certain extensions will be downloaded as attachments to prevent XSS attacks, but it is still possible for malicious files to cause harm if opened on your computer."}\ No newline at end of filediff --git a/public/language/en-GB/admin/settings/uploads.json b/public/language/en-GB/admin/settings/uploads.jsonindex 9cd7b7d8f2..c1c6c31e36 100644--- a/public/language/en-GB/admin/settings/uploads.json+++ b/public/language/en-GB/admin/settings/uploads.json@@ -31,6 +31,7 @@"topic-thumb-size": "Topic Thumb Size","allowed-file-extensions": "Allowed File Extensions","allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>). An empty list means all extensions are allowed.",+ "allowed-file-extension-warning": "Warning: Allowing all file extensions can be dangerous. NodeBB will attempt to mitigate risks by serving files with certain extensions as attachments. If you are using a reverse proxy, you should also ensure it serves files with dangerous extensions as attachments.","upload-limit-threshold": "Rate limit user uploads to:","upload-limit-threshold-per-minute": "Per %1 Minute","upload-limit-threshold-per-minutes": "Per %1 Minutes",diff --git a/src/middleware/index.js b/src/middleware/index.jsindex a831490c01..dda66d403a 100644--- a/src/middleware/index.js+++ b/src/middleware/index.js@@ -282,20 +282,24 @@ middleware.buildSkinAsset = helpers.try(async (req, res, next) => {});middleware.addUploadHeaders = function addUploadHeaders(req, res, next) {- // Trim uploaded files' timestamps when downloading + force download if html+ // Trim uploaded files' timestamps when downloading + force download if unsafelet basename = path.basename(req.path);const extname = path.extname(req.path).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 (req.path.startsWith('/uploads/files/')) {+ if (req.path.startsWith('/uploads/')) {if (middleware.regexes.timestampedUpload.test(basename)) {basename = basename.slice(14);}+ res.setHeader('X-Content-Type-Options', 'nosniff');res.header('Content-Disposition', `${dispositionType}; filename="${basename}"`);}diff --git a/src/routes/index.js b/src/routes/index.jsindex c59114825e..95f3ed58e3 100644--- a/src/routes/index.js+++ b/src/routes/index.js@@ -179,16 +179,10 @@ function addCoreRoutes(app, router, middleware, mounts) {];const staticOptions = {maxAge: app.enabled('cache') ? 5184000000 : 0,- setHeaders: (res, filePath) => {- if (path.extname(filePath).toLowerCase() === '.xml') {- res.setHeader('X-Content-Type-Options', 'nosniff');- res.setHeader('Content-Disposition', `attachment; filename="${path.basename(filePath)}"`);- }- },};if (path.resolve(__dirname, '../../public/uploads') !== nconf.get('upload_path')) {- statics.unshift({ route: '/assets/uploads', path: nconf.get('upload_path') });+ statics.unshift({ route: '/assets', path: path.join(nconf.get('upload_path'), '..') });}statics.forEach((obj) => {diff --git a/src/views/admin/manage/uploads.tpl b/src/views/admin/manage/uploads.tplindex e2f6e3a179..19e4ac51b4 100644--- a/src/views/admin/manage/uploads.tpl+++ b/src/views/admin/manage/uploads.tpl@@ -11,7 +11,12 @@</div></div>- <div class="">+ <div class="alert alert-warning text-sm alert-dismissible fade show mb-0" role="alert">+ [[admin/manage/uploads:unsafe-file-warning]]+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>+ </div>++ <div><!-- IMPORT admin/partials/breadcrumbs.tpl --></div>diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tplindex d2bb25076c..f59210b584 100644--- a/src/views/admin/settings/uploads.tpl+++ b/src/views/admin/settings/uploads.tpl@@ -114,6 +114,9 @@<p class="form-text">[[admin/settings/uploads:allowed-file-extensions-help]]</p>+ <div class="alert alert-warning text-sm alert-dismissible fade show mb-0" role="alert">+ [[admin/settings/uploads:allowed-file-extension-warning]]+ </div></div><div class="mb-3">diff --git a/test/uploads.js b/test/uploads.jsindex bb8c6baa76..541f8e9c78 100644--- a/test/uploads.js+++ b/test/uploads.js@@ -500,6 +500,19 @@ describe('Upload Controllers', () => {assert.strictEqual(uploadedBody.includes('JAVASCRIPT:alert(1)'), false);});+ it('should set content-disposition header to attachment for xml', async () => {+ const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/admin/upload/file`, path.join(__dirname, '../test/files/xss-dirty.xml'), {+ params: JSON.stringify({+ folder: '',+ }),+ }, 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);+ });+it('should keep valid xml file unchanged', async () => {const validXmlPath = path.join(__dirname, '../test/files/xss-valid.xml');const validXmlContent = await fs.readFile(validXmlPath, 'utf-8');