From 75e587021f2916e279d63f9c32bb2015153261bf Mon Sep 17 00:00:00 2001 From: Nirmal Khedkar Date: Sat, 24 Oct 2026 13:18:59 -0700 Subject: [PATCH] fix: contain message attachment writes Signed-off-by: Nirmal Khedkar --- backend/__tests__/messages.test.js | 49 ++++++++++++++++++++++++++++++ backend/models/message.js | 7 +++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/backend/__tests__/messages.test.js b/backend/__tests__/messages.test.js index 28f62d7b..b777f527 100644 --- a/backend/__tests__/messages.test.js +++ b/backend/__tests__/messages.test.js @@ -1,5 +1,8 @@ const { test } = require('node:test'); const assert = require('node:assert'); +const fs = require('node:fs'); +const path = require('node:path'); +const { randomUUID } = require('node:crypto'); const Message = require('../models/message'); test('sendMessage stores and listMessages retrieves', async () => { @@ -18,3 +21,49 @@ test('sendMessage stores and listMessages retrieves', async () => { assert.strictEqual(list[0].content, 'hello'); }); +test('attachment names cannot overwrite files outside uploads', async (t) => { + const targetName = `upload-sentinel-${randomUUID()}.txt`; + const target = path.join(__dirname, '..', targetName); + fs.writeFileSync(target, 'keep existing content'); + t.after(() => fs.rmSync(target, { force: true })); + Message.setDocClient({ put: () => ({ promise: async () => ({}) }) }); + + const msg = await Message.sendMessage('c1', { + from: 'u1', + file: { + name: `/../../${targetName}`, + data: Buffer.from('uploaded content').toString('base64'), + type: 'text/plain', + }, + }); + const storedPath = path.join(__dirname, '..', msg.file.path); + if (path.dirname(storedPath) === path.join(__dirname, '../uploads')) { + t.after(() => fs.rmSync(storedPath, { force: true })); + } + + assert.strictEqual(fs.readFileSync(target, 'utf8'), 'keep existing content'); + assert.strictEqual(path.dirname(storedPath), path.join(__dirname, '../uploads')); + assert.strictEqual(fs.readFileSync(storedPath, 'utf8'), 'uploaded content'); + assert.strictEqual(msg.file.originalname, `/../../${targetName}`); + assert.strictEqual(msg.file.mimetype, 'text/plain'); +}); + +test('an existing attachment is never overwritten or persisted on a filename collision', async (t) => { + const writeFileSync = fs.writeFileSync; + let target; + let persisted = false; + Message.setDocClient({ put: () => ({ promise: async () => { persisted = true; } }) }); + t.mock.method(fs, 'writeFileSync', (filename, data, options) => { + target = filename; + writeFileSync(filename, 'existing attachment'); + return writeFileSync(filename, data, options); + }); + t.after(() => { if (target) fs.rmSync(target, { force: true }); }); + + await assert.rejects(Message.sendMessage('c1', { + file: { name: 'report.txt', data: Buffer.from('replacement').toString('base64') }, + }), { code: 'EEXIST' }); + assert.strictEqual(fs.readFileSync(target, 'utf8'), 'existing attachment'); + assert.strictEqual(persisted, false); +}); + diff --git a/backend/models/message.js b/backend/models/message.js index 3f0f0353..e0a7c8fa 100644 --- a/backend/models/message.js +++ b/backend/models/message.js @@ -26,9 +26,10 @@ async function sendMessage( }; if (file && file.data) { - const filename = Date.now() + '_' + file.name; + // Client filenames are metadata only, never part of a filesystem path. + const filename = randomUUID(); const filePath = path.join(UPLOAD_DIR, filename); - fs.writeFileSync(filePath, Buffer.from(file.data, 'base64')); + fs.writeFileSync(filePath, Buffer.from(file.data, 'base64'), { flag: 'wx' }); msg.file = { path: '/uploads/' + filename, originalname: file.name, @@ -66,4 +67,4 @@ function setDocClient(client) { docClient = client; } -module.exports = { sendMessage, listMessages, removeByConversation, setDocClient }; \ No newline at end of file +module.exports = { sendMessage, listMessages, removeByConversation, setDocClient };