Skip to content

Node.js based forum software built for the modern web

fix: closes #14565

Barış Soner Uşaklı5ae326c2babc
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 0c007c8ed6..456d138a25 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -209,7 +209,7 @@ middleware.privateUploads = function privateUploads(req, res, next) {
if (req.loggedIn || !meta.config.privateUploads) {
return next();
}
-
+ console.log({ path: req.path, url: req.url });
const uploadPrefix = `${nconf.get('relative_path')}/assets/uploads/files`.toLowerCase();
let requestPath = req.path;
try {
diff --git a/src/user/data.js b/src/user/data.js
index 471a650057..b8629fdb00 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -250,14 +250,10 @@ module.exports = function (User) {
};
async function modifyUserData(users, requestedFields, fieldsToRemove) {
- let uidToSettings = {};
- if (meta.config.showFullnameAsDisplayName) {
- const uids = users.map(user => user.uid);
- uidToSettings = _.zipObject(uids, await db.getObjectsFields(
- uids.map(uid => `user:${uid}:settings`),
- ['showfullname']
- ));
+ if (!requestedFields.length || requestedFields.includes('fullname')) {
+ await parseDisplayNames(users);
}
+
if (!iconBackgrounds) {
iconBackgrounds = await User.getIconBackgrounds();
}
@@ -272,7 +268,6 @@ module.exports = function (User) {
db.parseIntFields(user, intFields, requestedFields);
if (user.hasOwnProperty('username')) {
- parseDisplayName(user, uidToSettings);
user.username = String(user.username || '');
}
@@ -419,25 +414,38 @@ module.exports = function (User) {
return normalizedPath === upload_url || normalizedPath.startsWith(`${upload_url}/`);
};
- function parseDisplayName(user, uidToSettings) {
- let showfullname = parseInt(meta.config.showfullname, 10) === 1;
- if (uidToSettings[user.uid]) {
- const userSetting = parseInt(uidToSettings[user.uid].showfullname, 10);
- if (userSetting === 0 || userSetting === 1) {
- showfullname = userSetting === 1;
- }
- }
- // Always show full name for remote users
- if (!utils.isNumber(user.uid)) {
- showfullname = true;
+ async function parseDisplayNames(users) {
+ if (meta.config.hideFullname || !meta.config.showFullnameAsDisplayName) {
+ users.forEach((user) => {
+ if (user) {
+ user.displayname = String(user.username || '');
+ }
+ });
+ return;
}
- user.displayname = String(
- meta.config.showFullnameAsDisplayName && showfullname && user.fullname ?
- utils.stripBidiControls(user.fullname) :
- user.username
+ // otherwise check user setting showfullname and set displayname accordingly
+ const userAcpDefault = parseInt(meta.config.showfullname, 10) === 1;
+ const userSettings = await db.getObjectsFields(
+ users.map(u => `user:${u.uid}:settings`),
+ ['showfullname']
);
+
+ users.forEach((user, index) => {
+ if (user) {
+ const userSetting = parseInt(userSettings[index].showfullname, 10);
+ const showfullname = utils.isNumber(user.uid) ?
+ (userSetting === 0 || userSetting === 1 ? userSetting : userAcpDefault) :
+ 1; // Always show full name for remote users
+
+ user.displayname = String(
+ showfullname && user.fullname ?
+ utils.stripBidiControls(user.fullname) :
+ user.username || ''
+ );
+ }
+ });
}
function parseGroupTitle(user) {
diff --git a/test/messaging.js b/test/messaging.js
index 5d05a24589..5f890f5f11 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -228,7 +228,8 @@ describe('Messaging Library', () => {
it('should sanitize system messages', async () => {
const oldValue = meta.config.showFullnameAsDisplayName;
- meta.config.showFullnameAsDisplayName = true;
+ meta.config.showFullnameAsDisplayName = 1;
+ meta.config.hideFullname = 0;
const uid1 = await User.create({
username: utils.generateUUID().slice(0, 8),
fullname: '<script>alert("xss")</script>',