Added session identifier to desktop multiplex events, #3606
Ylian Saint-Hilaire committed
Feb 4, 2022 at 08:00 UTC
15e494ef26f79138d09f1281140f746478df7665
2 files changed
+22
-16
meshdesktopmultiplex.js
+10
-9
@@ -58,10 +58,11 @@ MNG_ENCAPSULATE_AGENT_COMMAND = 70,
58
MNG_KVM_DISPLAY_INFO = 82
59
*/
60
61
-function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
61
+function CreateDesktopMultiplexor(parent, domain, nodeid, id, func) {
62
var obj = {};
63
- obj.nodeid = nodeid;
64
- obj.parent = parent;
63
+ obj.id = id; // Unique identifier for this session
64
+ obj.nodeid = nodeid; // Remote device nodeid for this session
65
+ obj.parent = parent; // Parent web server instance
66
obj.agent = null; // Reference to the connection object that is the agent.
67
obj.viewers = []; // Array of references to all viewers.
68
obj.viewersOverflowCount = 0; // Number of viewers currently in overflow state.
@@ -180,7 +181,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
181
182
// Log joining the multiplex session
183
if (obj.startTime != null) {
183
- var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, userid: peer.user ? peer.user._id : null, username: peer.user.name, msgid: 4, msg: "Joined desktop multiplex session", protocol: 2 };
184
+ var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, userid: peer.user ? peer.user._id : null, username: peer.user.name, msgid: 143, msgArgs: [obj.id], msg: "Joined desktop multiplex session \"" + obj.id + "\"", protocol: 2 };
185
parent.parent.DispatchEvent(['*', obj.nodeid, peer.user._id, obj.meshid], obj, event);
186
}
187
@@ -208,7 +209,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
209
210
// Log multiplex session start
211
if ((obj.agent != null) && (obj.viewers.length > 0) && (obj.startTime == null)) {
211
- var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 6, msg: "Started desktop multiplex session", protocol: 2 };
212
+ var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 145, msgArgs: [obj.id], msg: "Started desktop multiplex session \"" + obj.id + "\"", protocol: 2 };
213
if (obj.viewers[0].user != null) { event.userid = obj.viewers[0].user._id; event.username = obj.viewers[0].user.name; }
214
const targets = ['*', obj.nodeid, obj.meshid];
215
if (obj.viewers[0].user != null) { targets.push(obj.viewers[0].user._id); }
@@ -288,7 +289,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
289
290
//var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, userid: peer.user._id, username: peer.user.name, msgid: 5, msg: "Left the desktop multiplex session", protocol: 2 };
291
const sessionSeconds = Math.floor((Date.now() - peer.startTime) / 1000);
291
- var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 122, msgArgs: [sessionSeconds], msg: "Left the desktop multiplex session after " + sessionSeconds + " second(s).", protocol: 2, bytesin: inTraffc, bytesout: outTraffc };
292
+ var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 144, msgArgs: [obj.id, sessionSeconds], msg: "Left the desktop multiplex session \"" + obj.id + "\" after " + sessionSeconds + " second(s).", protocol: 2, bytesin: inTraffc, bytesout: outTraffc };
293
if (peer.user != null) { event.userid = peer.user._id; event.username = peer.user.name; }
294
if (peer.guestName) { event.guestname = peer.guestName; }
295
const targets = ['*', obj.nodeid, obj.meshid];
@@ -342,7 +343,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
343
344
// Add a event entry about this recording
345
var basefile = parent.parent.path.basename(filename);
345
- var event = { etype: 'relay', action: 'recording', domain: domain.id, nodeid: obj.nodeid, msgid: 7, msgArgs: [obj.sessionLength], msg: "Finished recording session" + (obj.sessionLength ? (', ' + obj.sessionLength + ' second(s)') : ''), filename: basefile, size: obj.recordingFileSize, protocol: 2, icon: obj.icon, name: obj.name, meshid: obj.meshid, userids: obj.userIds, multiplex: true };
346
+ var event = { etype: 'relay', action: 'recording', domain: domain.id, nodeid: obj.nodeid, msgid: 146, msgArgs: [obj.id, obj.sessionLength], msg: "Finished recording session \"" + obj.id + "\", " + obj.sessionLength + " second(s)", filename: basefile, size: obj.recordingFileSize, protocol: 2, icon: obj.icon, name: obj.name, meshid: obj.meshid, userids: obj.userIds, multiplex: true };
347
var mesh = parent.meshes[obj.meshid];
348
if (mesh != null) { event.meshname = mesh.name; }
349
if (obj.sessionStart) { event.startTime = obj.sessionStart; event.lengthTime = obj.sessionLength; }
@@ -354,7 +355,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
355
356
// Log end of multiplex session
357
if (obj.startTime != null) {
357
- var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 8, msgArgs: [Math.floor((Date.now() - obj.startTime) / 1000)], msg: "Closed desktop multiplex session" + ', ' + Math.floor((Date.now() - obj.startTime) / 1000) + ' second(s)', protocol: 2 };
358
+ var event = { etype: 'relay', action: 'relaylog', domain: domain.id, nodeid: obj.nodeid, msgid: 147, msgArgs: [obj.id, Math.floor((Date.now() - obj.startTime) / 1000)], msg: "Closed desktop multiplex session \"" + obj.id + "\", " + Math.floor((Date.now() - obj.startTime) / 1000) + ' second(s)', protocol: 2 };
359
parent.parent.DispatchEvent(['*', obj.nodeid, obj.meshid], obj, event);
360
obj.startTime = null;
361
}
@@ -1203,7 +1204,7 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
1204
if (obj.deskMultiplexor == null) {
1205
parent.desktoprelays[obj.nodeid] = 1; // Indicate that the creating of the desktop multiplexor is pending.
1206
parent.parent.debug('relay', 'DesktopRelay: Creating new desktop multiplexor');
1206
- CreateDesktopMultiplexor(parent, domain, obj.nodeid, function (deskMultiplexor) {
1207
+ CreateDesktopMultiplexor(parent, domain, obj.nodeid, obj.id, function (deskMultiplexor) {
1208
if (deskMultiplexor != null) {
1209
// Desktop multiplexor was created, use it.
1210
obj.deskMultiplexor = deskMultiplexor;
views/default.handlebars
+12
-7
@@ -13341,11 +13341,11 @@
13341
1: "Account login",
13342
2: "Account logout",
13343
3: "Changed language from {1} to {2}",
13344
- 4: "Joined desktop multiplex session",
13345
- 5: "Left the desktop multiplex session",
13346
- 6: "Started desktop multiplex session",
13347
- 7: "Finished recording session, {0} second(s)",
13348
- 8: "Closed desktop multiplex session, {0} second(s)",
13344
+ 4: "Joined desktop multiplex session", // No longer in use, replaced with 143
13345
+ 5: "Left the desktop multiplex session", // No longer in use, replaced with 144
13346
+ 6: "Started desktop multiplex session", // No longer in use, replaced with 145
13347
+ 7: "Finished recording session, {0} second(s)", // No longer in use, replaced with 146
13348
+ 8: "Closed desktop multiplex session, {0} second(s)", // No longer in use, replaced with 147
13349
9: "Ended relay session \"{0}\" from {1} to {2}, {3} second(s)",
13350
10: "Ended terminal session \"{0}\" from {1} to {2}, {3} second(s)",
13351
11: "Ended desktop session \"{0}\" from {1} to {2}, {3} second(s)",
@@ -13459,7 +13459,7 @@
13459
119: "This agent is using insecure tunnels, consider updating.",
13460
120: "Started local relay session \"{0}\", protocol {1} to {2}",
13461
121: "Ended local relay session \"{0}\", protocol {1} to {2}, {3} second(s)",
13462
- 122: "Left the desktop multiplex session after {0} second(s).",
13462
+ 122: "Left the desktop multiplex session after {0} second(s).", // No longer in use, replaced with 144
13463
123: "Left Web-SSH session after {0} second(s).",
13464
124: "Left Web-SFTP session after {0} second(s).",
13465
125: "Left Web-RDP session after {0} second(s).",
@@ -13479,7 +13479,12 @@
13479
139: "Added device share {0} recurring weekly.",
13480
140: "Changed device {0} from group {1}: {2}",
13481
141: "Intel(r) AMT policy change",
13482
- 142: "Device group {0} was changed: {1}"
13482
+ 142: "Device group {0} was changed: {1}",
13483
+ 143: "Joined desktop multiplex session \"{0}\"",
13484
+ 144: "Left the desktop multiplex session \"{0}\" after {0} second(s).",
13485
+ 145: "Started desktop multiplex session \"{0}\"",
13486
+ 146: "Finished recording session \"{0}\", {0} second(s)",
13487
+ 147: "Closed desktop multiplex session \"{0}\", {0} second(s)"
13488
};
13489
13490
var eventsShortMessageId = {