Node.js based forum software built for the modern web
fix: escape uid in buildAvatar
Barış Soner Uşaklıf2615ed9492c
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex 289384bc03..ee1538a554 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -395,7 +395,7 @@ module.exports = function (utils, Benchpress, tx, relative_path) {const iconText = escape(String(userObj['icon:text'] || ''));const attributes = new Map([['title', displayname],- ['data-uid', userObj.uid],+ ['data-uid', escape(String(userObj.uid || ''))],['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`],]);const style = escape(`--avatar-size: ${size};`);diff --git a/test/template-helpers.js b/test/template-helpers.jsindex b848629c24..e8e7147902 100644--- a/test/template-helpers.js+++ b/test/template-helpers.js@@ -347,4 +347,30 @@ describe('helpers', () => {assert(str.includes('col-3'));done();});++ describe.only('buildAvatar', () => {+ it('should build avatar with picture', () => {+ const user = {+ uid: 1,+ displayname: 'john',+ picture: '/uploads/1.png',+ 'icon:text': 'J',+ 'icon:bgColor': '#ff0000',+ };+ const html = helpers.buildAvatar(user, 32, true);+ assert.strictEqual(html, `<img title="john" data-uid="1" class="avatar avatar-rounded" alt="john" loading="lazy" component="avatar/picture" src="/uploads/1.png" style="--avatar-size: 32;" onError="this.remove()" itemprop="image" /><span title="john" data-uid="1" class="avatar avatar-rounded" component="avatar/icon" style="--avatar-size: 32; background-color: #ff0000">J</span>`);+ });++ it('should escape all attributes', () => {+ const user = {+ uid: '"remoteuid',+ displayname: '"remoteusername',+ picture: '"/uploads/1.png',+ 'icon:text': '"icon',+ 'icon:bgColor': '"#ff0000',+ };+ const html = helpers.buildAvatar(user, 32, true, '"custom-class', '"component');+ assert.strictEqual(html, `<img title=""remoteusername" data-uid=""remoteuid" class="avatar "custom-class avatar-rounded" alt=""remoteusername" loading="lazy" component=""component" src=""/uploads/1.png" style="--avatar-size: 32;" onError="this.remove()" itemprop="image" /><span title=""remoteusername" data-uid=""remoteuid" class="avatar "custom-class avatar-rounded" component=""component" style="--avatar-size: 32; background-color: "#ff0000">"icon</span>`);+ });+ });});