Node.js based forum software built for the modern web
fix: closes #14316
Barış Soner Uşaklı8985e4327bfc
diff --git a/public/src/modules/accounts/picture.js b/public/src/modules/accounts/picture.jsindex bd38d10250..19cf39a7e0 100644--- a/public/src/modules/accounts/picture.js+++ b/public/src/modules/accounts/picture.js@@ -109,7 +109,7 @@ define('accounts/picture', [if (picture) {if (headerPictureEl.length) {- headerPictureEl.attr('src', picture);+ headerPictureEl.attr('src', utils.decodeHTMLEntities(picture));} else if (headerIconEl.length) {const img = $('<img/>');$(headerIconEl[0].attributes).each(function () {diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.jsindex ddb9954f16..a0a8fc05b1 100644--- a/src/controllers/accounts/helpers.js+++ b/src/controllers/accounts/helpers.js@@ -123,12 +123,9 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})});userData.banned = Boolean(userData.banned);- userData.fullname = escape(userData.fullname);- userData.signature = escape(userData.signature);- userData.birthday = validator.escape(String(userData.birthday || ''));- userData.moderationNote = validator.escape(String(userData.moderationNote || ''));- userData['cover:url'] = validator.escape(String(userData['cover:url'] || ''));- userData['cover:position'] = validator.escape(String(userData['cover:position'] || '50% 50%'));+ userData.fullname = userData.fullname || '';+ userData.signature = userData.signature || '';+ userData.birthday = userData.birthday || '';userData['username:disableEdit'] = !userData.isAdmin && meta.config['username:disableEdit'];userData['email:disableEdit'] = !userData.isAdmin && meta.config['email:disableEdit'];@@ -149,7 +146,11 @@ helpers.getCustomUserFields = async function (callerUID, userData) {const fields = Array.from(new URLSearchParams(customFields)).reduce((memo, [name, value]) => {- const isUrl = validator.isURL(value);+ const isUrl = validator.isURL(value, {+ require_protocol: true,+ require_valid_protocol: true,+ require_tld: true,+ });memo.push({key: slugify(name),name,@@ -212,16 +213,12 @@ helpers.getCustomUserFields = async function (callerUID, userData) {if (Array.isArray(userValue)) {userValue = userValue.join(', ');}- f.value = validator.escape(String(userValue));+ f.value = translator.escape(validator.escape(String(userValue)));}});return fields;};-function escape(value) {- return translator.escape(validator.escape(String(value || '')));-}-async function getAllData(uid, callerUID) {// loading these before caches them, so the big promiseParallel doesn't make extra db callsconst [[isTargetAdmin, isCallerAdmin], isGlobalModerator] = await Promise.all([@@ -359,9 +356,7 @@ async function parseAboutMe(userData) {userData.aboutmeParsed = userData.aboutme;return;}-- userData.aboutme = validator.escape(String(userData.aboutme || ''));- const parsed = await plugins.hooks.fire('filter:parse.aboutme', userData.aboutme);+ const parsed = await plugins.hooks.fire('filter:parse.aboutme', String(userData.aboutme || ''));userData.aboutme = translator.escape(userData.aboutme);userData.aboutmeParsed = translator.escape(parsed);}diff --git a/src/middleware/render.js b/src/middleware/render.jsindex 3cbac1f22a..72b3d5ac78 100644--- a/src/middleware/render.js+++ b/src/middleware/render.js@@ -179,7 +179,7 @@ module.exports = function (middleware) {isModerator: user.isModeratorOfAnyCategory(req.uid),privileges: privileges.global.get(req.uid),blocks: user.blocks.list(req.uid),- user: user.getUserData(req.uid),+ user: user.getUserFields(req.uid, ['uid', 'username', 'fullname', 'userslug', 'email', 'email:confirmed', 'picture', 'status', 'reputation']),isEmailConfirmSent: req.uid <= 0 ? false : await user.email.isValidationPending(req.uid),languageDirection: translator.translate('[[language:dir]]', userLang),timeagoCode: languages.userTimeagoCode(userLang),diff --git a/src/plugins/install.js b/src/plugins/install.jsindex 14f410555f..395ee5be67 100644--- a/src/plugins/install.js+++ b/src/plugins/install.js@@ -121,18 +121,43 @@ module.exports = function (Plugins) {}function runPackageManagerCommand(command, pkgName, version, callback) {- cproc.execFile(packageManagerExecutable, [+ const args = [packageManagerCommands[packageManager][command],pkgName + (command === 'install' && version ? `@${version}` : ''),'--save',- ], (err, stdout) => {- if (err) {- return callback(err);- }-- winston.verbose(`[plugins/${command}] ${stdout}`);- callback();- });+ ];++ if (process.platform === 'win32') {+ const child = cproc.spawn(packageManagerExecutable, args, { shell: true });+ let stdout = '';+ let stderr = '';++ child.stdout.on('data', (data) => {+ stdout += data;+ });+ child.stderr.on('data', (data) => {+ stderr += data;+ });++ child.on('close', (code) => {+ if (code !== 0) {+ const err = new Error(stderr || `Process exited with code ${code}`);+ return callback(err);+ }+ winston.verbose(`[plugins/${command}] ${stdout}`);+ callback();+ });+ child.on('error', callback);+ } else {+ cproc.execFile(packageManagerExecutable, args, (err, stdout) => {+ if (err) {+ return callback(err);+ }++ winston.verbose(`[plugins/${command}] ${stdout}`);+ callback();+ });+ }}diff --git a/src/posts/parse.js b/src/posts/parse.jsindex ae2bcb713e..5f5d21dbf0 100644--- a/src/posts/parse.js+++ b/src/posts/parse.js@@ -77,7 +77,9 @@ module.exports = function (Posts) {Posts.parseSignature = async function (userData, uid) {userData.signature = sanitizeSignature(userData.signature || '');- return await plugins.hooks.fire('filter:parse.signature', { userData: userData, uid: uid });+ const result = await plugins.hooks.fire('filter:parse.signature', { userData: userData, uid: uid });+ userData.signature = translator.escape(result.userData.signature);+ return result;};Posts.relativeToAbsolute = function (content, regex) {diff --git a/src/posts/user.js b/src/posts/user.jsindex 05bc6d49d4..a30b586524 100644--- a/src/posts/user.js+++ b/src/posts/user.js@@ -24,8 +24,7 @@ module.exports = function (Posts) {const groupsMap = await getGroupsMap(userData);userData.forEach((userData, index) => {- userData.signature = validator.escape(String(userData.signature || ''));- userData.fullname = userSettings[index].showfullname ? validator.escape(String(userData.fullname || '')) : undefined;+ userData.fullname = userSettings[index].showfullname ? userData.fullname || '' : undefined;userData.selectedGroups = [];if (meta.config.hideFullname) {diff --git a/src/socket.io/user/picture.js b/src/socket.io/user/picture.jsindex 5800a0e794..4d48ca541b 100644--- a/src/socket.io/user/picture.js+++ b/src/socket.io/user/picture.js@@ -49,7 +49,7 @@ module.exports = function (SocketUser) {type,username: text,picture: validator.escape(String(url)),- selected: url === userObj.picture,+ selected: url === validator.unescape(String(userObj.picture)),}));list.pictures.unshift({diff --git a/src/user/data.js b/src/user/data.jsindex 2adf2dfcc2..a282a146b6 100644--- a/src/user/data.js+++ b/src/user/data.js@@ -14,6 +14,7 @@ const coverPhoto = require('../coverPhoto');const translator = require('../translator');const relative_path = nconf.get('relative_path');+const upload_url = nconf.get('upload_url');const prependRelativePath = url => url.startsWith('http') ? url : relative_path + url;@@ -35,6 +36,13 @@ module.exports = function (User) {];let customFieldWhiteList = null;+ const escapeFieldList = [+ 'email', 'username', 'fullname', 'signature', 'displayname',+ 'cover:position', 'birthday', 'aboutme',+ ];+ const urlFieldList = [+ 'picture', 'cover:url',+ ];User.guestData = {uid: 0,@@ -266,7 +274,7 @@ module.exports = function (User) {if (user.hasOwnProperty('username')) {parseDisplayName(user, uidToSettings);- user.username = validator.escape(user.username ? user.username.toString() : '');+ user.username = String(user.username || '');}// works around renderOverride supplying `url` to templates@@ -277,7 +285,7 @@ module.exports = function (User) {}if (user.hasOwnProperty('email')) {- user.email = validator.escape(String(user.email || ''));+ user.email = String(user.email || '');}if (!user.uid && !activitypub.helpers.isUri(user.uid)) {@@ -297,9 +305,6 @@ module.exports = function (User) {user.picture = user.uploadedpicture;}}- if (user.picture) {- user.picture = validator.escape(String(user.picture || ''));- }if (user.hasOwnProperty('cover:url')) {user['cover:url'] = user['cover:url'] ?@@ -362,20 +367,23 @@ module.exports = function (User) {}});- // remove fields that were added just for processing- fieldsToRemove.forEach((field) => {- users.forEach((user) => {+ users.forEach((user) => {+ // remove fields that were added just for processing+ fieldsToRemove.forEach((field) => {if (user) {user[field] = undefined;}});- });- users.forEach((user) => {- const fields = Object.keys(user);- fields.forEach((field) => {+ escapeFieldList.forEach((field) => {+ if (user[field] && typeof user[field] === 'string') {+ user[field] = translator.escape(validator.escape(String(user[field])));+ }+ });+ urlFieldList.forEach((field) => {if (user[field] && typeof user[field] === 'string') {- user[field] = translator.escape(user[field]);+ const trimmedValue = user[field].trim();+ user[field] = isValidUserUrlField(trimmedValue) ? translator.escape(validator.escape(trimmedValue)) : '';}});});@@ -388,6 +396,26 @@ module.exports = function (User) {return await plugins.hooks.fire('filter:users.get', users);}+ function isValidUserUrlField(value) {+ const trimmedValue = String(value).trim();+ const isHttpUrl = validator.isURL(trimmedValue, {+ require_protocol: true,+ require_valid_protocol: true,+ protocols: ['http', 'https'],+ require_tld: false,+ });++ if (isHttpUrl || trimmedValue.startsWith(upload_url)) {+ return true;+ }++ if (relative_path && trimmedValue.startsWith(relative_path)) {+ return trimmedValue.slice(relative_path.length).startsWith(upload_url);+ }++ return false;+ };+function parseDisplayName(user, uidToSettings) {let showfullname = parseInt(meta.config.showfullname, 10) === 1;if (uidToSettings[user.uid]) {@@ -402,11 +430,11 @@ module.exports = function (User) {showfullname = true;}- user.displayname = validator.escape(String(+ user.displayname = String(meta.config.showFullnameAsDisplayName && showfullname && user.fullname ?utils.stripBidiControls(user.fullname) :user.username- ));+ );}function parseGroupTitle(user) {diff --git a/test/api/schema.js b/test/api/schema.jsindex 1fc40d6a5e..70172133df 100644--- a/test/api/schema.js+++ b/test/api/schema.js@@ -437,6 +437,7 @@ describe('schema', () => {});it('should not error out when called', async function () {+ // Uncomment if there is a failing test console.log(this.url, method, path);this.result = await executeRequest.call(this, method, path, context);});diff --git a/test/controllers.js b/test/controllers.jsindex f463e0f8c0..8beb15097a 100644--- a/test/controllers.js+++ b/test/controllers.js@@ -1292,11 +1292,11 @@ describe('Controllers', () => {});it('should parse about me', async () => {- await user.setUserFields(fooUid, { picture: '/path/to/picture', aboutme: 'hi i am a bot' });+ await user.setUserFields(fooUid, { picture: '/assets/uploads/path/to/picture', aboutme: 'hi i am a bot [[topic:moved-from]] <script>alert("xss")</script>' });const { response, body } = await request.get(`${nconf.get('url')}/api/user/foo`);assert.equal(response.statusCode, 200);- assert.equal(body.aboutme, 'hi i am a bot');- assert.equal(body.picture, '/path/to/picture');+ assert.equal(body.aboutmeParsed, 'hi i am a bot [[topic:moved-from]] <script>alert("xss")</script>');+ assert.equal(body.picture, '/assets/uploads/path/to/picture');});it('should not return reputation if reputation is disabled', async () => {diff --git a/test/uploads.js b/test/uploads.jsindex 541f8e9c78..6caed4115c 100644--- a/test/uploads.js+++ b/test/uploads.js@@ -346,16 +346,16 @@ describe('Upload Controllers', () => {});});- it('should escape cover:url when user profile is loaded', async () => {+ it('should return empty string for invalid cover:url when user profile is loaded', async () => {await user.setUserField(1, 'cover:url', 'http://example.com/"><script>alert(1)</script>');const { body: userData } = await helpers.request('get', '/api/user/admin');- assert.strictEqual(userData['cover:url'], 'http://example.com/"><script>alert(1)</script>');+ assert.strictEqual(userData['cover:url'], '');});- it('should escape picture when user profile is loaded', async () => {+ it('should return empty string for invalid picture when user profile is loaded', async () => {await user.setUserField(1, 'picture', 'http://example.com/"><script>alert(1)</script>');const { body: userData } = await helpers.request('get', '/api/user/admin');- assert.strictEqual(userData['picture'], 'http://example.com/"><script>alert(1)</script>');+ assert.strictEqual(userData['picture'], '');});it('should delete users uploads if account is deleted', async () => {diff --git a/test/user.js b/test/user.jsindex bc12b60b70..ea77a40ee7 100644--- a/test/user.js+++ b/test/user.js@@ -1027,11 +1027,11 @@ describe('User', () => {});it('should set user picture to uploaded', async () => {- await User.setUserField(uid, 'uploadedpicture', '/test');- await db.sortedSetAdd(`uid:${uid}:profile:pictures`, Date.now(), '/test');- await apiUser.changePicture({ uid: uid }, { type: 'uploaded', picture: '/test', uid: uid });+ await User.setUserField(uid, 'uploadedpicture', '/assets/uploads/test');+ await db.sortedSetAdd(`uid:${uid}:profile:pictures`, Date.now(), '/assets/uploads/test');+ await apiUser.changePicture({ uid: uid }, { type: 'uploaded', picture: '/assets/uploads/test', uid: uid });const picture = await User.getUserField(uid, 'picture');- assert.equal(picture, validator.escape(`${nconf.get('relative_path')}/test`));+ assert.equal(picture, validator.escape(`${nconf.get('relative_path')}/assets/uploads/test`));});it('should return error if profile image uploads disabled', (done) => {