Added relay device groups support in UI.
Ylian Saint-Hilaire committed
Apr 13, 2022 at 15:53 UTC
40ef17d071891fe1290637a7ca2b1850b45ac9f1
3 files changed
+101
-8
meshuser.js
+13
-1
@@ -1955,6 +1955,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1955
// Add KVM information if needed
1956
if (command.meshtype == 4) { mesh.kvm = { model: command.kvmmodel, host: command.kvmhost, user: command.kvmuser, pass: command.kvmpass }; }
1957
1958
+ // If this is device group that requires a relay device, store that now
1959
+ if ((parent.args.lanonly != true) && (command.meshtype == 3) && (typeof command.relayid == 'string')) {
1960
+ // Check the relay id
1961
+ var relayIdSplit = command.relayid.split('/');
1962
+ if ((relayIdSplit[0] == 'node') && (relayIdSplit[1] == domain.id)) { mesh.relayid = command.relayid; }
1963
+ }
1964
+
1965
// Save the new device group
1966
db.Set(mesh);
1967
parent.meshes[meshid] = mesh;
@@ -2120,6 +2127,11 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2127
if ((common.validateInt(command.consent) == true) && (command.consent != mesh.consent)) { if (change != '') change += ' and consent changed'; else change += 'Device group "' + mesh.name + '" consent changed'; changesids.push(4); mesh.consent = command.consent; }
2128
if ((common.validateInt(command.expireDevs, 0, 2000) == true) && (command.expireDevs != mesh.expireDevs)) { if (change != '') change += ' and auto-remove changed'; else change += 'Device group "' + mesh.name + '" auto-remove changed'; changesids.push(5); if (command.expireDevs == 0) { delete mesh.expireDevs; } else { mesh.expireDevs = command.expireDevs; } }
2129
2130
+ if ((typeof command.relayid == 'string') && (mesh.mtype == 3) && (mesh.relayid != null) && (command.relayid != mesh.relayid)) {
2131
+ var relayIdSplit = command.relayid.split('/');
2132
+ if ((relayIdSplit.length == 3) && (relayIdSplit[0] = 'node') && (relayIdSplit[1] == domain.id)) { if (change != '') { change += ' and device relay changed'; } else { change = 'Device relay changed'; } changesids.push(7); mesh.relayid = command.relayid; }
2133
+ }
2134
+
2135
// See if we need to change device group invitation codes
2136
if (mesh.mtype == 2) {
2137
if (command.invite === '*') {
@@ -2152,7 +2164,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2164
2165
if (change != '') {
2166
db.Set(mesh);
2155
- var event = { etype: 'mesh', userid: user._id, username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, flags: mesh.flags, consent: mesh.consent, action: 'meshchange', links: mesh.links, msgid: 142, msgArgs: [ mesh.name, changesids ], msg: change, domain: domain.id, invite: mesh.invite, expireDevs: command.expireDevs };
2167
+ var event = { etype: 'mesh', userid: user._id, username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, flags: mesh.flags, consent: mesh.consent, action: 'meshchange', links: mesh.links, msgid: 142, msgArgs: [mesh.name, changesids], msg: change, domain: domain.id, invite: mesh.invite, expireDevs: command.expireDevs, relayid: mesh.relayid };
2168
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come.
2169
parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(mesh, [user._id]), obj, event);
2170
}
views/default-mobile.handlebars
+35
-2
@@ -1796,7 +1796,7 @@
1796
1797
// This is a new mesh for us
1798
if (add) {
1799
- meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
1799
+ meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links, relayid: message.event.relayid };
1800
meshserver.send({ action: 'nodes' }); // Request a refresh of all nodes (TODO: We could optimize this to only request nodes for the new mesh).
1801
}
1802
} else {
@@ -1807,6 +1807,7 @@
1807
}
1808
meshes[message.event.meshid].desc = message.event.desc;
1809
meshes[message.event.meshid].links = message.event.links;
1810
+ if (message.event.relayid != null) { meshes[message.event.meshid].relayid = message.event.relayid; }
1811
1812
// Check if we lost rights to this mesh in this change.
1813
if (IsMeshViewable(message.event.meshid) == false) {
@@ -6043,7 +6044,7 @@
6044
var meshrights = GetMeshRights(currentMesh);
6045
if (currentMesh.mtype == 1) meshtype = "Intel® AMT only, no agent";
6046
if (currentMesh.mtype == 2) meshtype = "Managed using a software agent";
6046
- if (currentMesh.mtype == 3) meshtype = "Local devices, no agent";
6047
+ if (currentMesh.mtype == 3) { if (currentMesh.relayid == null) { meshtype = "Local devices, no agent"; } else { meshtype = "No agent devices relayed thru agent"; } }
6048
if (currentMesh.mtype == 4) { meshtype = "IP-KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
6049
6050
var x = '';
@@ -6052,6 +6053,14 @@
6053
x += addHtmlValue("Type", meshtype);
6054
//x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]);
6055
6056
+ // Display the relay device if applicable
6057
+ if ((currentMesh.mtype == 3) && (currentMesh.relayid != null)) {
6058
+ var relayName = '<i>' + "Unknown" + '</i>';
6059
+ var relayNode = getNodeFromId(currentMesh.relayid);
6060
+ if (relayNode != null) { relayName = EscapeHtml(relayNode.name); }
6061
+ x += addHtmlValue("Relay Device", addLinkConditional(relayName, 'p20editmeshrelay()', (meshrights & 1) != 0));
6062
+ }
6063
+
6064
// Display IP-KVM information if needed
6065
if (currentMesh.mtype == 4) {
6066
x += addHtmlValue("Hostname", currentMesh.kvm.host);
@@ -6145,6 +6154,29 @@
6154
meshserver.send({ action: 'deletemesh', meshid: currentMesh._id, meshname: currentMesh.name });
6155
}
6156
6157
+ function p20editmeshrelay() {
6158
+ if (xxdialogMode) return;
6159
+
6160
+ // Look for all relay devices
6161
+ var relayDevices = [];
6162
+ if ((features & 2) == 0) { for (var i in nodes) { var node = nodes[i]; if ((node.mtype == 2) && (node.agent != null) && (GetNodeRights(node) == 0xFFFFFFFF)) { relayDevices.push(node); } } }
6163
+ relayDevices.sort(nameSort);
6164
+
6165
+ if (relayDevices.length == 0) {
6166
+ // Relay relay devices available
6167
+ setDialogMode(2, "Edit Device Group", 1, null, "No relay devices available.");
6168
+ } else {
6169
+ var relayDevices2 = [];
6170
+ for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + '</option>'); }
6171
+ var x = addHtmlValue("Relay Device", '<div style=width:170px><select id=d2devrelay style=width:100%>' + relayDevices2.join('') + '</select></div>');
6172
+ setDialogMode(2, "Edit Device Group", 3, p20editmeshrelayEx, x);
6173
+ }
6174
+ }
6175
+
6176
+ function p20editmeshrelayEx() {
6177
+ meshserver.send({ action: 'editmesh', meshid: currentMesh._id, relayid: Q('d2devrelay').value });
6178
+ }
6179
+
6180
function p20editmesh(focus) {
6181
if (xxdialogMode) return;
6182
var x = addHtmlValue("Name", '<input id=dp20meshname style=width:170px maxlength=32 onchange=p20editmeshValidate() onkeyup=p20editmeshValidate() />');
@@ -6712,6 +6744,7 @@
6744
// Generic Methods
6745
//
6746
6747
+ function nameSort(a, b) { var aa = a.name.toLowerCase(), bb = b.name.toLowerCase(); return sortCollator.compare(aa, bb); }
6748
function getNodeAmtVersion(node) { if ((node == null) || (node.intelamt == null) || (typeof node.intelamt.ver != 'string')) return 0; var verSplit = node.intelamt.ver.split('.'); if (verSplit.length < 2) return 0; return parseInt(verSplit[0]) + (parseInt(verSplit[1]) / 100); }
6749
function putstore(name, val) { try { if ((typeof (localStorage) === 'undefined') || (localStorage.getItem(name) == val)) return; if (val == null) { localStorage.removeItem(name); } else { localStorage.setItem(name, val); } } catch (e) { } if (name[0] != '_') { var s = {}; for (var i = 0, len = localStorage.length; i < len; ++i) { var k = localStorage.key(i); if (k[0] != '_') { s[k] = localStorage.getItem(k); } } meshserver.send({ action: 'userWebState', state: JSON.stringify(s) }); } }
6750
function getstore(name, val) { try { if (typeof (localStorage) === 'undefined') return val; var v = localStorage.getItem(name); if ((v == null) || (v == null)) return val; return v; } catch (e) { return val; } }
views/default.handlebars
+53
-5
@@ -3045,7 +3045,7 @@
3045
3046
// This is a new mesh for us
3047
if (add) {
3048
- meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
3048
+ meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links, amt: message.event.amt, invite: message.event.invite, expireDevs: message.event.expireDevs, relayid: message.event.relayid };
3049
meshserver.send({ action: 'nodes' }); // Request a refresh of all nodes (TODO: We could optimize this to only request nodes for the new mesh).
3050
}
3051
} else {
@@ -3061,6 +3061,7 @@
3061
if (message.event.amt) { meshes[message.event.meshid].amt = message.event.amt; }
3062
if (message.event.invite != null) { meshes[message.event.meshid].invite = message.event.invite; } else { delete meshes[message.event.meshid].invite; }
3063
if (message.event.expireDevs != null) { if (message.event.expireDevs > 0) { meshes[message.event.meshid].expireDevs = message.event.expireDevs; } else { delete meshes[message.event.meshid].expireDevs; } }
3064
+ if (message.event.relayid != null) { meshes[message.event.meshid].relayid = message.event.relayid; }
3065
3066
// Check if we lost rights to this mesh in this change.
3067
if (IsMeshViewable(message.event.meshid) == false) {
@@ -11574,12 +11575,25 @@
11575
// Remind the user to add two factor authentication
11576
if ((features & 0x00040000) && (count2factoraAuths() == 0)) { setDialogMode(2, "Account Security", 1, null, "Unable to access this feature until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" tab and look at the \"Account Security\" section."); return false; }
11577
11578
+ // Look for all relay devices
11579
+ var relayDevices = [];
11580
+ if ((features & 2) == 0) { for (var i in nodes) { var node = nodes[i]; if ((node.mtype == 2) && (node.agent != null) && (GetNodeRights(node) == 0xFFFFFFFF)) { relayDevices.push(node); } } }
11581
+
11582
// We are allowed, let's prompt to information
11583
var x = "Create a new device group using the options below." + '<br /><br />', localGroupType = '';
11584
x += addHtmlValue("Name", '<input id=dp2meshname style=width:230px maxlength=128 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,1) />');
11585
if ((features & 1) == 0) { localGroupType += '<option value=3>' + "Local devices, no agent" + '</option>'; }
11586
+ if (((features & 2) == 0) && (relayDevices.length > 0)) { localGroupType += '<option value=5>' + "No agent devices relayed thru agent" + '</option>'; }
11587
if (features2 & 0x10000) { localGroupType += '<option value=4>' + "IP-KVM / Power device" + '</option>'; }
11588
x += addHtmlValue("Type", '<div style=width:230px;margin:0;padding:0><select id=dp2meshtype style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) ><option value=2>' + "Manage using a software agent" + '</option><option value=1>' + "Intel® AMT only, no agent" + '</option>' + localGroupType + '</select></div>');
11589
+ if (relayDevices.length > 0) {
11590
+ x += '<div id=d2devrelaydiv style=display:none>';
11591
+ relayDevices.sort(nameSort);
11592
+ var relayDevices2 = [];
11593
+ for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + '</option>'); }
11594
+ x += addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) >' + relayDevices2.join('') + '</select></div>');
11595
+ x += '</div>';
11596
+ }
11597
x += addHtmlValue("Description", '<div style=width:230px;margin:0;padding:0><textarea id=dp2meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
11598
x += '<div id=d2ipkvm style=display:none><hr />';
11599
x += addHtmlValue("Model", '<div style=width:230px;margin:0;padding:0><select id=dp2ipkvmmodel style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) ><option value=1>' + "Raritan Dominion KX III" + '</option><option value=2>' + "Web Power Switch 7" + '</option></select></div>');
@@ -11599,9 +11613,8 @@
11613
if ((x == 2) && (e != null) && (e.key == "Enter")) { Q('dp2meshdesc').focus(); }
11614
var ok = (Q('dp2meshname').value.length > 0);
11615
QV('d2ipkvm', meshtype == 4);
11602
- if (meshtype == 4) {
11603
- if ((Q('dp2ipkvmhost').value.length == 0) && (Q('dp2ipkvmuser').value.length == 0) && (Q('dp2ipkvmpass').value.length == 0)) { ok = false; }
11604
- }
11616
+ try { QV('d2devrelaydiv', meshtype == 5); } catch (ex) {}
11617
+ if (meshtype == 4) { if ((Q('dp2ipkvmhost').value.length == 0) && (Q('dp2ipkvmuser').value.length == 0) && (Q('dp2ipkvmpass').value.length == 0)) { ok = false; } }
11618
QE('idx_dlgOkButton', ok);
11619
}
11620
@@ -11614,6 +11627,10 @@
11627
cmd.kvmuser = Q('dp2ipkvmuser').value;
11628
cmd.kvmpass = Q('dp2ipkvmpass').value;
11629
}
11630
+ if (meshtype == 5) {
11631
+ cmd.meshtype = 3;
11632
+ cmd.relayid = Q('d2devrelay').value;
11633
+ }
11634
meshserver.send(cmd);
11635
}
11636
@@ -11829,7 +11846,7 @@
11846
var meshtype = format("Unknown #{0}", currentMesh.mtype);
11847
if (currentMesh.mtype == 1) meshtype = "Intel® AMT only, no agent";
11848
if (currentMesh.mtype == 2) meshtype = "Managed using a software agent";
11832
- if (currentMesh.mtype == 3) meshtype = "Local devices, no agent";
11849
+ if (currentMesh.mtype == 3) { if (currentMesh.relayid == null) { meshtype = "Local devices, no agent"; } else { meshtype = "No agent devices relayed thru agent"; } }
11850
if (currentMesh.mtype == 4) { meshtype = "IP-KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
11851
11852
var x = '';
@@ -11840,6 +11857,14 @@
11857
x += addHtmlValue("Type", meshtype);
11858
//x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]);
11859
11860
+ // Display the relay device if applicable
11861
+ if ((currentMesh.mtype == 3) && (currentMesh.relayid != null)) {
11862
+ var relayName = '<i>' + "Unknown" + '</i>';
11863
+ var relayNode = getNodeFromId(currentMesh.relayid);
11864
+ if (relayNode != null) { relayName = EscapeHtml(relayNode.name); }
11865
+ x += addHtmlValue("Relay Device", addLinkConditional(relayName, 'p20editmeshrelay()', (meshrights & 1) != 0));
11866
+ }
11867
+
11868
// Display IP-KVM information if needed
11869
if (currentMesh.mtype == 4) {
11870
x += addHtmlValue("Hostname", currentMesh.kvm.host);
@@ -12230,6 +12255,29 @@
12255
meshserver.send({ action: 'deletemesh', meshid: currentMesh._id, meshname: currentMesh.name });
12256
}
12257
12258
+ function p20editmeshrelay() {
12259
+ if (xxdialogMode) return;
12260
+
12261
+ // Look for all relay devices
12262
+ var relayDevices = [];
12263
+ if ((features & 2) == 0) { for (var i in nodes) { var node = nodes[i]; if ((node.mtype == 2) && (node.agent != null) && (GetNodeRights(node) == 0xFFFFFFFF)) { relayDevices.push(node); } } }
12264
+ relayDevices.sort(nameSort);
12265
+
12266
+ if (relayDevices.length == 0) {
12267
+ // Relay relay devices available
12268
+ setDialogMode(2, "Edit Device Group", 1, null, "No relay devices available.");
12269
+ } else {
12270
+ var relayDevices2 = [];
12271
+ for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + '</option>'); }
12272
+ var x = addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100%>' + relayDevices2.join('') + '</select></div>');
12273
+ setDialogMode(2, "Edit Device Group", 3, p20editmeshrelayEx, x);
12274
+ }
12275
+ }
12276
+
12277
+ function p20editmeshrelayEx() {
12278
+ meshserver.send({ action: 'editmesh', meshid: currentMesh._id, relayid: Q('d2devrelay').value });
12279
+ }
12280
+
12281
function p20editmesh(focus) {
12282
if (xxdialogMode) return;
12283
var x = addHtmlValue("Name", '<input id=dp20meshname style=width:230px maxlength=128 onchange=p20editmeshValidate() onkeyup=p20editmeshValidate(event) />');