Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-21 16:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't crash on objects with toString property

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-03-28 08:08:59 -04:00
parent 7397873db3
commit 4d2d76897a
1 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/socket.io/index.js
View File

@@ -112,16 +112,18 @@ async function onMessage(socket, payload) {
return winston.warn('[socket.io] Empty payload'); return winston.warn('[socket.io] Empty payload');
} }
const eventName = payload.data[0]; let eventName = payload.data[0];
const params = typeof payload.data[1] === 'function' ? {} : payload.data[1]; const params = typeof payload.data[1] === 'function' ? {} : payload.data[1];
const callback = typeof payload.data[payload.data.length - 1] === 'function' ? payload.data[payload.data.length - 1] : function () {}; const callback = typeof payload.data[payload.data.length - 1] === 'function' ? payload.data[payload.data.length - 1] : function () {};
try {
if (!eventName) { if (!eventName) {
return winston.warn('[socket.io] Empty method name'); return winston.warn('[socket.io] Empty method name');
} }
if (typeof eventName !== 'string') { if (typeof eventName !== 'string') {
const escapedName = validator.escape(String(eventName)); eventName = typeof eventName;
const escapedName = validator.escape(eventName);
return callback({ message: `[[error:invalid-event, ${escapedName}]]` }); return callback({ message: `[[error:invalid-event, ${escapedName}]]` });
} }
@@ -153,7 +155,6 @@ async function onMessage(socket, payload) {
return socket.disconnect(); return socket.disconnect();
} }
try {
await checkMaintenance(socket); await checkMaintenance(socket);
await validateSession(socket, '[[error:revalidate-failure]]'); await validateSession(socket, '[[error:revalidate-failure]]');