MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Guest name support to multiplexor, fix for #2812

This commit is contained in:
Ylian Saint-Hilaire 2021-07-02 14:09:20 -07:00
parent 3a6947b483
commit 69aa0c0d1c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meshdesktopmultiplex.js
View File

@ -318,7 +318,14 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
obj.sendSessionMetadata = function () { obj.sendSessionMetadata = function () {
var allUsers = {}; var allUsers = {};
if (obj.viewers != null) { if (obj.viewers != null) {
for (var i in obj.viewers) { var v = obj.viewers[i]; if ((v.user != null) && (v.user._id != null)) { if (allUsers[v.user._id] == null) { allUsers[v.user._id] = 1; } else { allUsers[v.user._id]++; } } } for (var i in obj.viewers) {
var v = obj.viewers[i];
if ((v.user != null) && (v.user._id != null)) {
var id = v.user._id;
if (v.guestName) { id += '/guest:' + Buffer.from(v.guestName).toString('base64'); } // If this is a guest connect, add the Base64 guest name.
if (allUsers[id] == null) { allUsers[id] = 1; } else { allUsers[id]++; }
}
}
obj.sendToAllViewers(JSON.stringify({ type: 'metadata', 'ctrlChannel': '102938', users: allUsers, startTime: obj.startTime })); obj.sendToAllViewers(JSON.stringify({ type: 'metadata', 'ctrlChannel': '102938', users: allUsers, startTime: obj.startTime }));
} }
@ -907,6 +914,7 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
// If the identifier is removed, drop the connection // If the identifier is removed, drop the connection
if ((cookie != null) && (typeof cookie.pid == 'string')) { if ((cookie != null) && (typeof cookie.pid == 'string')) {
obj.pid = cookie.pid; obj.pid = cookie.pid;
obj.guestName = cookie.gn;
parent.parent.AddEventDispatch([obj.nodeid], obj); parent.parent.AddEventDispatch([obj.nodeid], obj);
obj.HandleEvent = function (source, event, ids, id) { if ((event.action == 'removedDeviceShare') && (obj.pid == event.publicid)) { obj.close(); } } obj.HandleEvent = function (source, event, ids, id) { if ((event.action == 'removedDeviceShare') && (obj.pid == event.publicid)) { obj.close(); } }
} }