Node.js based forum software built for the modern web
fix: use helpers.escape when creating markup
Barış Soner Uşaklı4dcfd152b4f7
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.jsindex ca6a8cac84..6ad30ec216 100644--- a/public/src/admin/settings.js+++ b/public/src/admin/settings.js@@ -2,8 +2,8 @@define('admin/settings', [- 'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap', 'admin/modules/relogin-timer',-], function (uploader, mousetrap, hooks, alerts, settings, bootstrap, reloginTimer) {+ 'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap', 'admin/modules/relogin-timer', 'helpers',+], function (uploader, mousetrap, hooks, alerts, settings, bootstrap, reloginTimer, helpers) {const Settings = {};Settings.populateTOC = function () {@@ -21,7 +21,7 @@ define('admin/settings', [if (anchor.startsWith('section')) {$this.parent().attr('id', anchor);}- tocList.append(`<a class="btn btn-ghost btn-sm text-xs text-start text-decoration-none" href="#${anchor}">${header}</a>`);+ tocList.append(`<a class="btn btn-ghost btn-sm text-xs text-start text-decoration-none" href="#${helpers.escape(anchor)}">${helpers.escape(header)}</a>`);});const offset = mainHader.outerHeight(true);// https://stackoverflow.com/a/11814275/583363diff --git a/public/src/client/post-queue.js b/public/src/client/post-queue.jsindex edaebea8dd..d5455329cb 100644--- a/public/src/client/post-queue.js+++ b/public/src/client/post-queue.js@@ -4,10 +4,11 @@define('forum/post-queue', ['categoryFilter', 'categorySelector', 'api', 'alerts','translator', 'modals', 'accounts/moderate', 'accounts/delete',- 'autocomplete', 'uploader', 'benchpress',+ 'autocomplete', 'uploader', 'benchpress', 'helpers',], function (- categoryFilter, categorySelector, api, alerts, translator,- modals, AccountModerate, AccountsDelete, autocomplete, uploader, Benchpress+ categoryFilter, categorySelector, api, alerts,+ translator, modals, AccountModerate, AccountsDelete,+ autocomplete, uploader, Benchpress, helpers) {const PostQueue = {};@@ -121,7 +122,7 @@ define('forum/post-queue', [const linkList = linkContainer.find('[component="post-queue/link-container/list"]');const linksInPost = $el.find('.post-content a');linksInPost.each((idx, link) => {- const href = $(link).attr('href');+ const href = helpers.escape($(link).attr('href'));linkList.append(`<li><a href="${href}">${href}</a></li>`);});linkContainer.toggleClass('hidden', !linksInPost.length);diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.jsindex f6e127a768..374fa7f200 100644--- a/public/src/client/topic/events.js+++ b/public/src/client/topic/events.js@@ -69,14 +69,14 @@ define('forum/topic/events', [return $(el).closest('[data-pid]').attr('data-pid') === String(data.post.pid);});const reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]');- votes.html(data.post.votes).attr('data-votes', data.post.votes);- reputationElements.html(data.user.reputation).attr('data-reputation', data.user.reputation);+ votes.text(data.post.votes).attr('data-votes', data.post.votes);+ reputationElements.text(data.user.reputation).attr('data-reputation', data.user.reputation);}function updateBookmarkCount(data) {$('[data-pid="' + data.post.pid + '"] .bookmarkCount').filter(function (index, el) {return $(el).closest('[data-pid]').attr('data-pid') === String(data.post.pid);- }).html(data.post.bookmarks).attr('data-bookmarks', data.post.bookmarks);+ }).text(data.post.bookmarks).attr('data-bookmarks', data.post.bookmarks);}function onTopicPurged(data) {diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.jsindex 56cd38e294..46aaa3c10f 100644--- a/public/src/modules/taskbar.js+++ b/public/src/modules/taskbar.js@@ -1,7 +1,7 @@'use strict';-define('taskbar', ['translator', 'hooks'], function (translator, hooks) {+define('taskbar', ['translator', 'hooks', 'helpers'], function (translator, hooks, helpers) {const taskbar = {};let noTaskbar = false;taskbar.init = function () {@@ -177,12 +177,13 @@ define('taskbar', ['translator', 'hooks'], function (translator, hooks) {}translator.translate(data.options.title, function (taskTitle) {const title = $('<div></div>').text(taskTitle || 'NodeBB Task').html();-+ const image = data.options.image ? helpers.escape(data.options.image) : '';+ const icon = data.options.icon ? helpers.escape(data.options.icon) : '';const taskbarEl = $('<li></li>').addClass(data.options.className)- .html('<a href="#"' + (data.options.image ? ' style="background-image: url(\'' + data.options.image.replace(///g, '/') + '\'); background-size: cover;"' : '') + '>' +- (data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +- '<span aria-label="' + title + '" component="taskbar/title">' + title + '</span>' ++ .html('<a href="#"' + (image ? ` style="background-image: url('${image}'); background-size: cover;"` : '') + '>' ++ (icon ? `<i class="fa ${icon}"></i> ` : '') ++ `<span aria-label="${title}" component="taskbar/title">${title}</span>` +'</a>').attr({title: title,