Skip to content

Node.js based forum software built for the modern web

fix: sanitize system messages

Barış Soner Uşaklıf5be7f6d68fd
diff --git a/src/messaging/create.js b/src/messaging/create.js
index 23728fd9ee..1e464f4f3b 100644
--- a/src/messaging/create.js
+++ b/src/messaging/create.js
@@ -50,6 +50,10 @@ module.exports = function (Messaging) {
if (!await Messaging.canViewMessage(data.toMid, roomId, uid)) {
throw new Error('[[error:no-privileges]]');
}
+ const system = await Messaging.getMessageField(data.toMid, 'system');
+ if (system) {
+ throw new Error('[[error:invalid-mid]]');
+ }
}
const mid = data.mid || await db.incrObjectField('global', 'nextMid');
const timestamp = data.timestamp || Date.now();
diff --git a/src/messaging/data.js b/src/messaging/data.js
index 893606eefd..f283a34b8d 100644
--- a/src/messaging/data.js
+++ b/src/messaging/data.js
@@ -136,7 +136,7 @@ module.exports = function (Messaging) {
parentMids = parentMids.filter((mid, idx) => canView[idx]);
const parentMessages = await Messaging.getMessagesFields(parentMids, [
- 'mid', 'fromuid', 'content', 'timestamp', 'deleted',
+ 'mid', 'fromuid', 'content', 'timestamp', 'deleted', 'system',
]);
const parentUids = _.uniq(parentMessages.map(msg => msg && msg.fromuid));
const usersMap = _.zipObject(
@@ -185,9 +185,7 @@ module.exports = function (Messaging) {
}));
}
async function parseMessage(message, uid, roomId, isNew) {
- if (message.system) {
- return message.content;
- } else if (!utils.isNumber(message.mid)) {
+ if (message.system || !utils.isNumber(message.mid)) {
return posts.sanitize(message.content);
}
diff --git a/src/messaging/pins.js b/src/messaging/pins.js
index a2581487df..5e2eade5ba 100644
--- a/src/messaging/pins.js
+++ b/src/messaging/pins.js
@@ -4,7 +4,13 @@ const db = require('../database');
module.exports = function (Messaging) {
Messaging.pinMessage = async (mid, roomId) => {
- const isMessageInRoom = await db.isSortedSetMember(`chat:room:${roomId}:mids`, mid);
+ const [isMessageInRoom, isSystem] = await Promise.all([
+ db.isSortedSetMember(`chat:room:${roomId}:mids`, mid),
+ Messaging.getMessageField(mid, 'system'),
+ ]);
+ if (isSystem) {
+ throw new Error('[[error:invalid-mid]]');
+ }
if (isMessageInRoom) {
await db.sortedSetAdd(`chat:room:${roomId}:mids:pinned`, Date.now(), mid);
await Messaging.setMessageFields(mid, { pinned: 1 });
diff --git a/src/views/partials/chats/parent.tpl b/src/views/partials/chats/parent.tpl
index 79acf8590a..deb8a15b16 100644
--- a/src/views/partials/chats/parent.tpl
+++ b/src/views/partials/chats/parent.tpl
@@ -7,6 +7,6 @@
</div>
<span class="chat-timestamp text-muted timeago text-nowrap hidden" title="{messages.parent.timestampISO}"></span>
</div>
- <div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{{{ if messages.parent.txContent }}}{{tx(messages.parent.content)}}{{{ else }}}{{txEscape(messages.parent.content)}}{{{ end }}}</div>
+ <div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{{{ if (messages.parent.txContent || messages.parent.system) }}}{{tx(messages.parent.content)}}{{{ else }}}{{txEscape(messages.parent.content)}}{{{ end }}}</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/views/partials/chats/pinned-messages-list.tpl b/src/views/partials/chats/pinned-messages-list.tpl
index 9286a29a5b..7db966801a 100644
--- a/src/views/partials/chats/pinned-messages-list.tpl
+++ b/src/views/partials/chats/pinned-messages-list.tpl
@@ -14,7 +14,7 @@
</div>
<div class="message-body-wrapper">
<div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">
- {{txEscape(messages.content)}}
+ {{{ if (messages.txContent || messages.system) }}}{{tx(messages.content)}}{{{ else }}}{{txEscape(messages.content)}}{{{ end }}}
</div>
<div component="chat/message/controls" class="position-relative">
<div class="btn-group border shadow-sm controls position-absolute bg-body end-0" style="bottom:1rem;">
diff --git a/test/messaging.js b/test/messaging.js
index f300396fe0..5d05a24589 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -16,6 +16,7 @@ const api = require('../src/api');
const helpers = require('./helpers');
const request = require('../src/request');
const translator = require('../src/translator');
+const utils = require('../src/utils');
describe('Messaging Library', () => {
const mocks = {
@@ -225,6 +226,35 @@ describe('Messaging Library', () => {
assert.equal(body2.status.message, await translator.translate('[[error:cant-edit-chat-message]]'));
});
+ it('should sanitize system messages', async () => {
+ const oldValue = meta.config.showFullnameAsDisplayName;
+ meta.config.showFullnameAsDisplayName = true;
+ const uid1 = await User.create({
+ username: utils.generateUUID().slice(0, 8),
+ fullname: '<script>alert("xss")</script>',
+ });
+ await User.setSetting(uid1, 'showfullname', 1);
+ const uid2 = await User.create({
+ username: utils.generateUUID().slice(0, 8),
+ fullname: '<img src=x onerror="alert(origin)">',
+ });
+ await User.setSetting(uid2, 'showfullname', 1);
+
+ const sessMock = {};
+ const roomData = await api.chats.create({ uid: uid1, session: sessMock }, {
+ joinLeaveMessages: 1,
+ uids: [uid2],
+ });
+
+ const data = await api.chats.get({ uid: uid1, session: sessMock }, {
+ roomId: roomData.roomId,
+ });
+
+ assert.strictEqual(data.messages[0].content, `[[modules:chat.system.user-join, <img src="x" />, ${data.messages[0].timestampISO}]]`);
+ assert.strictEqual(data.messages[1].content, `[[modules:chat.system.user-join, , ${data.messages[1].timestampISO}]]`);
+ meta.config.showFullnameAsDisplayName = oldValue;
+ });
+
it('should fail to add user to room with invalid data', async () => {
let { response, body } = await callv3API('post', `/chats/${roomId}/users`, {}, 'foo');
assert.strictEqual(response.statusCode, 400);