Skip to content

Node.js based forum software built for the modern web

fix(topic-events): escape user-controlled values in buildAvatar and renderUser

Julian Lam4c4bf76d5d38
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 5e84dbbcd9..058aa3019b 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -309,8 +309,12 @@ module.exports = function (utils, Benchpress, relative_path) {
userObj = this;
}
classNames = classNames || '';
+ const displayname = escape(String(userObj.displayname || ''));
+ const picture = escape(String(userObj.picture || ''));
+ const iconBgColor = escape(String(userObj['icon:bgColor'] || ''));
+ const iconText = escape(String(userObj['icon:text'] || ''));
const attributes = new Map([
- ['title', userObj.displayname],
+ ['title', displayname],
['data-uid', userObj.uid],
['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`],
]);
@@ -323,9 +327,9 @@ module.exports = function (utils, Benchpress, relative_path) {
let output = '';
if (userObj.picture) {
- output += `<img${attr2String(attributes)} alt="${userObj.displayname}" loading="lazy" component="${component || 'avatar/picture'}" src="${userObj.picture}" style="${styles.join(' ')}" onError="this.remove()" itemprop="image" />`;
+ output += `<img${attr2String(attributes)} alt="${displayname}" loading="lazy" component="${component || 'avatar/picture'}" src="${picture}" style="${styles.join(' ')}" onError="this.remove()" itemprop="image" />`;
}
- output += `<span${attr2String(attributes)} component="${component || 'avatar/icon'}" style="${styles.join(' ')} background-color: ${userObj['icon:bgColor']}">${userObj['icon:text']}</span>`;
+ output += `<span${attr2String(attributes)} component="${component || 'avatar/icon'}" style="${styles.join(' ')} background-color: ${iconBgColor}">${iconText}</span>`;
return output;
}
diff --git a/src/topics/events.js b/src/topics/events.js
index 61bb1d1765..0c4c50c5c6 100644
--- a/src/topics/events.js
+++ b/src/topics/events.js
@@ -116,6 +116,7 @@ function renderUser(event) {
const user = {
...event.user,
displayname: validator.escape(String(event.user.displayname)),
+ userslug: validator.escape(String(event.user.userslug)),
};
return `${helpers.buildAvatar(user, '16px', true)} <a href="${relative_path}/user/${user.userslug}">${user.displayname}</a>`;