MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 22:55:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added session disconnection log for desktop multiplex, #3437

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-01-10 15:28:46 -08:00
parent f8e9426350
commit 42137aa1d1
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agents/meshcore.js
View File

@ -1069,7 +1069,11 @@ function handleServerCommand(data) {
else if ((data.protocol == 'files') && (tunnels[i].protocol == 5)) { disconnect = true; } else if ((data.protocol == 'files') && (tunnels[i].protocol == 5)) { disconnect = true; }
else if ((data.protocol == 'tcp') && (tunnels[i].tcpport != null)) { disconnect = true; } else if ((data.protocol == 'tcp') && (tunnels[i].tcpport != null)) { disconnect = true; }
else if ((data.protocol == 'udp') && (tunnels[i].udpport != null)) { disconnect = true; } else if ((data.protocol == 'udp') && (tunnels[i].udpport != null)) { disconnect = true; }
if (disconnect) { if (tunnels[i].s != null) { tunnels[i].s.end(); } else { tunnels[i].end(); } } if (disconnect) {
if (tunnels[i].s != null) { tunnels[i].s.end(); } else { tunnels[i].end(); }
// TODO: Log tunnel disconnection
}
} }
} }
break; break;

10
meshuser.js
View File

@ -4848,6 +4848,16 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if ((viewer.user._id == command.xuserid) && (viewer.guestName == command.guestname)) { viewersToClose.push(viewer); } // Only close viewers that match the userid and guestname if present. if ((viewer.user._id == command.xuserid) && (viewer.guestName == command.guestname)) { viewersToClose.push(viewer); } // Only close viewers that match the userid and guestname if present.
} }
for (var i = 0; i < viewersToClose.length; i++) { viewersToClose[i].close(); } // Close any viewers we need closed. for (var i = 0; i < viewersToClose.length; i++) { viewersToClose[i].close(); } // Close any viewers we need closed.
// Log the desktop session disconnection
var targets = ['*', user._id, command.xuserid];
const splitxuser = command.xuserid.split('/');
var xusername = splitxuser[2];
if (command.guestname != null) { xusername += '/' + command.guestname; }
var event = { etype: 'user', userid: user._id, username: user.name, nodeid: command.nodeid, xuserid: command.xuserid, action: 'endsession', msgid: 134, msgArgs: [xusername], msg: 'Disconnected desktop session of user ' + xusername, domain: domain.id };
if (command.guestname != null) { event.guestname = command.guestname; }
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
parent.parent.DispatchEvent(targets, obj, event);
}); });
break; break;

6
views/default.handlebars
View File

@ -13354,7 +13354,11 @@
130: "User notifications changed", 130: "User notifications changed",
131: "Added device share {0} with unlimited time.", 131: "Added device share {0} with unlimited time.",
132: "Turn on.", 132: "Turn on.",
133: "Turn off." 133: "Turn off.",
134: "Disconnected desktop session of user {0}",
135: "Disconnected terminal session of user {0}",
136: "Disconnected files session of user {0}",
137: "Disconnected routing session of user {0}"
}; };
// Highlights the device being hovered // Highlights the device being hovered