Fixed ACM/CCM display on web page and MeshCmd/MeshCore for AMT v5
Ylian Saint-Hilaire committed
Apr 22, 2018 at 10:47 UTC
72c14d9d5fa620abd41965fc183c5ed0792abc87
6 files changed
+23
-11
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/meshcmd.js
+14
-6
@@ -331,18 +331,26 @@ function run(argv) {
331
amtMei.getVersion(function (val) { for (var version in val.Versions) { if (val.Versions[version].Description == 'AMT') { mestate.ver = val.Versions[version].Version; } } });
332
amtMei.getProvisioningState(function (result) { mestate.ProvisioningState = result; });
333
amtMei.getProvisioningMode(function (result) { mestate.ProvisioningMode = result; });
334
- amtMei.getEHBCState(function (result) { mestate.ehbc = result; });
335
- amtMei.getControlMode(function (result) { mestate.controlmode = result; });
336
- amtMei.getMACAddresses(function (result) { mestate.mac = result; });
337
- amtMei.getLanInterfaceSettings(0, function (result) { mestate.net0 = result; });
338
- amtMei.getLanInterfaceSettings(1, function (result) { mestate.net1 = result; });
334
+ amtMei.getEHBCState(function (result) { if (result) { mestate.ehbc = result; } });
335
+ amtMei.getControlMode(function (result) { if (result) { mestate.controlmode = result; } });
336
+ amtMei.getMACAddresses(function (result) { if (result) { mestate.mac = result; } });
337
+ amtMei.getLanInterfaceSettings(0, function (result) { if (result) { mestate.net0 = result; } });
338
+ amtMei.getLanInterfaceSettings(1, function (result) { if (result) { mestate.net1 = result; } });
339
amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { mestate.uuid = result.uuid; } });
340
amtMei.getDnsSuffix(function (result) {
341
mestate.dns = result;
342
var str = 'Intel AMT v' + mestate.ver;
343
if (mestate.ProvisioningState.stateStr == 'PRE') { str += ', pre-provisioning state'; }
344
else if (mestate.ProvisioningState.stateStr == 'IN') { str += ', in-provisioning state'; }
345
- else if (mestate.ProvisioningState.stateStr == 'POST') { if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; } }
345
+ else if (mestate.ProvisioningState.stateStr == 'POST') {
346
+ if (mestate.ProvisioningMode) {
347
+ if (mestate.controlmode) {
348
+ if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; }
349
+ } else {
350
+ str += ', activated in ' + mestate.ProvisioningMode.modeStr;
351
+ }
352
+ }
353
+ }
354
if ((mestate.ehbc) && (mestate.ehbc.EHBC == true)) { str += ', EHBC enabled'; }
355
str += '.';
356
if (mestate.net0 != null) { str += '\r\nWired ' + ((mestate.net0.enabled == 1) ? 'Enabled' : 'Disabled') + ((mestate.net0.dhcpEnabled == 1) ? ', DHCP' : ', Static') + ', ' + mestate.net0.mac + (mestate.net0.address == '0.0.0.0' ? '' : (', ' + mestate.net0.address)); }
agents/meshcore.js
+2
-2
@@ -1253,7 +1253,7 @@ function createMeshCore(agent) {
1253
var intelamt = {}, p = false;
1254
if (meinfo.Versions && meinfo.Versions.AMT) { intelamt.ver = meinfo.Versions.AMT; p = true; }
1255
if (meinfo.ProvisioningState) { intelamt.state = meinfo.ProvisioningState; p = true; }
1256
- if (meinfo.flags) { intelamt.flags = meinfo.Flags; p = true; }
1256
+ if (meinfo.Flags) { intelamt.flags = meinfo.Flags; p = true; }
1257
if (meinfo.OsHostname) { intelamt.host = meinfo.OsHostname; p = true; }
1258
if (meinfo.UUID) { intelamt.uuid = meinfo.UUID; p = true; }
1259
if (p == true) { r.intelamt = intelamt }
@@ -1298,7 +1298,7 @@ function createMeshCore(agent) {
1298
amtMei.getProvisioningMode(function (result) { amtMeiTmpState.ProvisioningMode = result.mode; });
1299
amtMei.getProvisioningState(function (result) { amtMeiTmpState.ProvisioningState = result.state; });
1300
amtMei.getEHBCState(function (result) { if ((result != null) && (result.EHBC == true)) { amtMeiTmpState.Flags += 1; } });
1301
- amtMei.getControlMode(function (result) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } });
1301
+ amtMei.getControlMode(function (result) { if (result != null) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } } });
1302
amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { amtMeiTmpState.UUID = result.uuid; } });
1303
//amtMei.getMACAddresses(function (result) { amtMeiTmpState.mac = result; });
1304
amtMei.getDnsSuffix(function (result) { if (result != null) { amtMeiTmpState.dns = result; } if (func != null) { func(amtMeiTmpState); } });
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.6-w",
3
+ "version": "0.1.6-y",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default.handlebars
+6
-2
@@ -2809,8 +2809,12 @@
2809
if (node.intelamt != null) {
2810
var str = '';
2811
var provisioningStates = { 0: 'Not Activated (Pre)', 1: 'Not Activated (In)', 2: 'Activated' };
2812
- if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else { str += (provisioningStates[node.intelamt.state] + ', v' + node.intelamt.ver); }
2813
- if (node.intelamt.tls == 1) { str += ', TLS'; }
2812
+ if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else {
2813
+ str += provisioningStates[node.intelamt.state];
2814
+ if (node.intelamt.flags) { if (node.intelamt.flags & 2) { str += ' <span title="Intel AMT is activated in Client Control Mode">CCM</span>'; } else if (node.intelamt.flags & 4) { str += ' <span title="Intel AMT is activated in Admin Control Mode">ACM</span>'; } }
2815
+ str += (', v' + node.intelamt.ver);
2816
+ }
2817
+ if (node.intelamt.tls == 1) { str += ', <span title="Intel AMT is setup with TLS network security">TLS</span>'; }
2818
if (node.intelamt.user == null || node.intelamt.user == '') {
2819
if ((meshrights & 4) != 0) {
2820
str += ', <i style=color:#FF0000;cursor:pointer title="Edit Intel® AMT credentials" onclick=editDeviceAmtSettings("' + node._id + '")>No Credentials</i>';