libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

PadMessageHandler: Fix readability of duplicate user check

Browse source
This commit is contained in:
Richard Hansen 2021-10-30 01:31:17 -04:00
parent 00e7b04518
commit b7de24c85f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/node/handler/PadMessageHandler.js
View file

@ -847,13 +847,15 @@ const handleClientReady = async (socket, message) => {
// Check if this author is already on the pad, if yes, kick the other sessions!
const roomSockets = _getRoomSockets(pad.id);
for (const socket of roomSockets) {
const sinfo = sessioninfos[socket.id];
for (const otherSocket of roomSockets) {
// The user shouldn't have joined the room yet, but check anyway just in case.
if (otherSocket.id === socket.id) continue;
const sinfo = sessioninfos[otherSocket.id];
if (sinfo && sinfo.author === sessionInfo.author) {
// fix user's counter, works on page refresh or if user closes browser window and then rejoins
sessioninfos[socket.id] = {};
socket.leave(padIds.padId);
socket.json.send({disconnect: 'userdup'});
sessioninfos[otherSocket.id] = {};
otherSocket.leave(padIds.padId);
otherSocket.json.send({disconnect: 'userdup'});
}
}