Node.js based forum software built for the modern web
fix: closes #14321
Barış Soner Uşaklı48831566e8e1
diff --git a/install/package.json b/install/package.jsonindex 0ed70131dc..85e5dac056 100644--- a/install/package.json+++ b/install/package.json@@ -111,10 +111,10 @@"nodebb-plugin-spam-be-gone": "2.3.3","nodebb-plugin-web-push": "0.7.8","nodebb-rewards-essentials": "1.0.3",- "nodebb-theme-harmony": "2.2.71",+ "nodebb-theme-harmony": "2.2.72","nodebb-theme-lavender": "7.1.22",- "nodebb-theme-peace": "2.2.59",- "nodebb-theme-persona": "14.2.41",+ "nodebb-theme-peace": "2.2.60",+ "nodebb-theme-persona": "14.2.42","nodebb-widget-essentials": "7.0.44","nodemailer": "8.0.10","nprogress": "0.2.0",diff --git a/src/controllers/topics.js b/src/controllers/topics.jsindex eeda0f2bbd..4d5582d2f7 100644--- a/src/controllers/topics.js+++ b/src/controllers/topics.js@@ -367,7 +367,7 @@ async function addOGImageTags(res, topicData, postAtIndex) {images.push(topicData.category.backgroundImage);}if (postAtIndex && postAtIndex.user && postAtIndex.user.picture) {- images.push(validator.unescape(postAtIndex.user.picture));+ images.push(postAtIndex.user.picture);}images.forEach(path => addOGImageTag(res, path));}diff --git a/src/socket.io/user/picture.js b/src/socket.io/user/picture.jsindex 4d48ca541b..3ec0237fd0 100644--- a/src/socket.io/user/picture.js+++ b/src/socket.io/user/picture.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const nconf = require('nconf');const db = require('../../database');@@ -48,8 +47,8 @@ module.exports = function (SocketUser) {list.pictures = list.pictures.map(({ type, url, text }) => ({type,username: text,- picture: validator.escape(String(url)),- selected: url === validator.unescape(String(userObj.picture)),+ picture: String(url),+ selected: url === String(userObj.picture),}));list.pictures.unshift({diff --git a/src/user/data.js b/src/user/data.jsindex 40bb3b33ad..7a7382d315 100644--- a/src/user/data.js+++ b/src/user/data.js@@ -387,7 +387,7 @@ module.exports = function (User) {const trimmedValue = user[field].trim();const isValid = isValidUserUrlField(trimmedValue);if (isValid) {- user[field] = translator.escape(validator.escape(trimmedValue));+ user[field] = translator.escape(trimmedValue);} else {if (field === 'picture') {user.picture = User.getDefaultAvatar();diff --git a/src/user/picture.js b/src/user/picture.jsindex 8424ff024f..e97d46609e 100644--- a/src/user/picture.js+++ b/src/user/picture.js@@ -4,7 +4,6 @@ const winston = require('winston');const mime = require('mime').default;const path = require('path');const nconf = require('nconf');-const validator = require('validator');const db = require('../database');const file = require('../file');@@ -226,7 +225,6 @@ module.exports = function (User) {User.removeProfileImage = async function (uid, picture) {const userData = await User.getUserFields(uid, ['uploadedpicture', 'picture']);- userData.picture = validator.unescape(String(userData.picture || ''));if (!picture) {picture = userData.uploadedpicture;}