Node.js based forum software built for the modern web
fix: escape src on wrapImage
Barış Soner Uşaklı62e05f39eee3
diff --git a/public/src/client/topic/images.js b/public/src/client/topic/images.jsindex c4c30319d8..996fd5cf1b 100644--- a/public/src/client/topic/images.js+++ b/public/src/client/topic/images.js@@ -26,10 +26,11 @@ define('forum/topic/images', [], function () {const srcExt = src.split('.').slice(1).pop();const altFilename = alt.split('/').pop();const altExt = altFilename.split('.').slice(1).pop();-- imageEl.wrap('<a href="' + src + '" ' +- (!srcExt && altExt ? ' download="' + utils.escapeHTML(altFilename) + '" ' : '') +- ' target="_blank" rel="noopener">');+ const wrapperLink = $(`<a target="_blank" rel="noopener"></a>`).attr('href', src);+ if (!srcExt && altExt) {+ wrapperLink.attr('download', altFilename);+ }+ imageEl.wrap(wrapperLink);}};diff --git a/src/api/users.js b/src/api/users.jsindex 35fa345143..9055d6e910 100644--- a/src/api/users.js+++ b/src/api/users.js@@ -348,6 +348,13 @@ usersAPI.generateToken = async (caller, { uid, description }) => {}const tokenObj = await api.utils.tokens.generate({ uid, description });+ await events.log({+ type: 'token-add',+ uid: caller.uid,+ ip: caller.ip,+ _tokenUid: uid,+ description,+ });return tokenObj.token;};@@ -359,6 +366,11 @@ usersAPI.deleteToken = async (caller, { uid, token }) => {}await api.utils.tokens.delete(token);+ await events.log({+ type: 'token-delete',+ uid: caller.uid,+ ip: caller.ip,+ });return true;};diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.jsindex cfd135a554..a3f574a0e8 100644--- a/src/controllers/write/admin.js+++ b/src/controllers/write/admin.js@@ -37,6 +37,13 @@ Admin.getAnalyticsData = async (req, res) => {Admin.generateToken = async (req, res) => {const { uid, description } = req.body;const token = await api.utils.tokens.generate({ uid, description });+ await events.log({+ type: 'token-add',+ uid: req.uid,+ ip: req.ip,+ _tokenUid: uid,+ description,+ });helpers.formatApiResponse(200, res, await api.utils.tokens.get(token));};@@ -60,7 +67,13 @@ Admin.rollToken = async (req, res) => {Admin.deleteToken = async (req, res) => {const { token } = req.params;- helpers.formatApiResponse(200, res, await api.utils.tokens.delete(token));+ await api.utils.tokens.delete(token);+ await events.log({+ type: 'token-delete',+ uid: req.uid,+ ip: req.ip,+ });+ helpers.formatApiResponse(200, res);};Admin.chats = {};diff --git a/src/events.js b/src/events.jsindex df67223e46..e8a6da4d36 100644--- a/src/events.js+++ b/src/events.js@@ -76,6 +76,8 @@ events.types = ['getUsersCSV','getGroupCSV','chat-room-deleted',+ 'token-add',+ 'token-delete',// To add new types from plugins, just Array.push() to this array];