Skip to content

Node.js based forum software built for the modern web

fix: use renderCategory for move event

Barış Soner Uşaklı6972b70fd6e0
diff --git a/src/topics/events.js b/src/topics/events.js
index c409cdbd75..57504c7c55 100644
--- a/src/topics/events.js
+++ b/src/topics/events.js
@@ -54,7 +54,7 @@ Events._types = {
},
move: {
icon: 'fa-arrow-circle-right',
- translation: async (event, language) => translateEventArgs(event, language, 'topic:user-moved-topic-from', renderUser(event), `${event.fromCategory.name}`, renderTimeago(event)),
+ translation: async (event, language) => translateEventArgs(event, language, 'topic:user-moved-topic-from', renderUser(event), renderCategory(event.fromCategory), renderTimeago(event)),
},
share: {
icon: 'fa-share-alt',
@@ -89,7 +89,7 @@ async function translateEventArgs(event, language, prefix, ...args) {
const txArgs = args.map(arg => utils.escapeHTML(arg));
const compiled = tx.compile.apply(null, [key, ...txArgs]);
const translated = await tx.translateKey(compiled, [], language);
- return utils.decodeHTMLEntities(translated);
+ return posts.sanitize(utils.decodeHTMLEntities(translated));
}
async function translateSimple(event, language, prefix) {
diff --git a/test/topics/events.js b/test/topics/events.js
index 5fb12e7a24..b638034e62 100644
--- a/test/topics/events.js
+++ b/test/topics/events.js
@@ -131,4 +131,27 @@ describe('Topic Events', () => {
meta.config.showFullnameAsDisplayName = oldVlaueShowFullnameAsDisplayName;
});
+
+ it('should properly escape topic event with plain text in their arguments', async () => {
+ const oldCategory = await categories.create({
+ name: '<img onerror=alert(origin)>',
+ });
+ const { topicData } = await topics.post({
+ title: 'topic events testing',
+ content: 'foobar one two three',
+ uid: fooUid,
+ cid: oldCategory.cid,
+ });
+
+ const uid = await user.create({ username: 'barmove' });
+ const now = Date.now();
+ await topics.events.log(topicData.tid, {
+ uid: uid,
+ type: 'move',
+ fromCid: oldCategory.cid,
+ timestamp: now,
+ });
+ const events = await topics.events.get(topicData.tid, uid);
+ assert.strictEqual(events[0].text, `<span title="barmove" data-uid="${uid}" class="avatar avatar-rounded" component="avatar/icon" style="--avatar-size: 16px; background-color: #33691e">B</span> <a href="/user/barmove">barmove</a> moved this topic from <a component="topic/category" href="/category/2/img-onerror-alert-origin" class="badge px-1 text-truncate text-decoration-none " style="color: ${oldCategory.color};background-color: ${oldCategory.bgColor};border-color: ${oldCategory.bgColor}!important; max-width: 70vw;"> <i class="fa fa-fw hidden"></i> &lt;img onerror&#x3D;alert(origin)&gt; </a> <span class="timeago timeline-text" title="${new Date(now).toISOString()}"></span>`);
+ });
});