update full version, and marking of the amt to check if activated (#5803)
bennyc-huji committed
Feb 17, 2024 at 21:48 UTC
fb15d949766a4f80a4f1f917892c1b99e7046523
3 files changed
+21
-7
amtmanager.js
+10
-5
@@ -707,7 +707,7 @@ module.exports.CreateAmtManager = function (parent) {
707
dev.aquired.controlMode = responses['IPS_HostBasedSetupService'].response.CurrentControlMode; // 1 = CCM, 2 = ACM
708
if (typeof stack.wsman.comm.amtVersion == 'string') { // Set the Intel AMT version using the HTTP header if present
709
var verSplit = stack.wsman.comm.amtVersion.split('.');
710
- if (verSplit.length >= 3) { dev.aquired.version = verSplit[0] + '.' + verSplit[1] + '.' + verSplit[2]; dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); }
710
+ if (verSplit.length >= 3) { dev.aquired.version = verSplit[0] + '.' + verSplit[1] + '.' + verSplit[2]; dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); dev.aquired.maintenance=parseInt(verSplit[2]);}
711
}
712
dev.aquired.realm = stack.wsman.comm.digestRealm;
713
dev.aquired.user = dev.intelamt.user = stack.wsman.comm.user;
@@ -2621,7 +2621,7 @@ module.exports.CreateAmtManager = function (parent) {
2621
if (domain && domain.amtmanager && (domain.amtmanager.tlsacmactivation == true)) { TlsAcmActivation = true; }
2622
2623
// Check Intel AMT version
2624
- if (typeof dev.intelamt.ver == 'string') { var verSplit = dev.intelamt.ver.split('.'); if (verSplit.length >= 3) { dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); } }
2624
+ if (typeof dev.intelamt.ver == 'string') { var verSplit = dev.intelamt.ver.split('.'); if (verSplit.length >= 3) { dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); dev.aquired.maintenance = parseInt(verSplit[2]);} }
2625
2626
// If this is Intel AMT 14 or better and allowed, we are going to attempt a host-based end-to-end TLS activation.
2627
if (TlsAcmActivation && (dev.aquired.majorver >= 14)) {
@@ -2677,7 +2677,7 @@ module.exports.CreateAmtManager = function (parent) {
2677
dev.aquired.controlMode = 1; // 1 = CCM, 2 = ACM
2678
if (typeof dev.amtstack.wsman.comm.amtVersion == 'string') {
2679
var verSplit = dev.amtstack.wsman.comm.amtVersion.split('.');
2680
- if (verSplit.length >= 3) { dev.aquired.version = verSplit[0] + '.' + verSplit[1] + '.' + verSplit[2]; dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); }
2680
+ if (verSplit.length >= 3) { dev.aquired.version = verSplit[0] + '.' + verSplit[1] + '.' + verSplit[2]; dev.aquired.majorver = parseInt(verSplit[0]); dev.aquired.minorver = parseInt(verSplit[1]); dev.aquired.maintenance = parseInt(verSplit[2]);}
2681
}
2682
if ((typeof dev.mpsConnection.tag.meiState.OsHostname == 'string') && (typeof dev.mpsConnection.tag.meiState.OsDnsSuffix == 'string')) {
2683
dev.aquired.host = dev.mpsConnection.tag.meiState.OsHostname + '.' + dev.mpsConnection.tag.meiState.OsDnsSuffix;
@@ -2812,8 +2812,12 @@ module.exports.CreateAmtManager = function (parent) {
2812
var vs = getInstance(amtlogicalelements, 'AMT')['VersionString'];
2813
if (vs != null) {
2814
dev.aquired.version = vs;
2815
- dev.aquired.versionmajor = parseInt(dev.aquired.version.split('.')[0]);
2816
- dev.aquired.versionminor = parseInt(dev.aquired.version.split('.')[1]);
2815
+ version = dev.aquired.version.split('.')
2816
+ dev.aquired.versionmajor = parseInt(version[0]);
2817
+ dev.aquired.versionminor = parseInt(version[1]);
2818
+ if(version.length > 2){
2819
+ dev.aquired.versionmaintenance = version[2];
2820
+ }
2821
}
2822
}
2823
}
@@ -2825,6 +2829,7 @@ module.exports.CreateAmtManager = function (parent) {
2829
dev.aquired.version = s[0] + '.' + s[1] + '.' + s[2];
2830
dev.aquired.versionmajor = parseInt(s[0]);
2831
dev.aquired.versionminor = parseInt(s[1]);
2832
+ dev.aquired.versionmaintenance = parseInt(s[2]);
2833
}
2834
}
2835
amtprovisioningserver.js
+5
-2
@@ -201,8 +201,10 @@ module.exports.CreateAmtProvisioningServer = function (parent, config) {
201
var vs = getInstance(amtlogicalelements, 'AMT')['VersionString'];
202
if (vs != null) {
203
dev.aquired.version = vs;
204
- dev.aquired.versionmajor = parseInt(dev.aquired.version.split('.')[0]);
205
- dev.aquired.versionminor = parseInt(dev.aquired.version.split('.')[1]);
204
+ version = parseInt(dev.aquired.version.split('.'));
205
+ dev.aquired.versionmajor = parseInt(version[0]);
206
+ dev.aquired.versionminor = parseInt(version[1]);
207
+ dev.aquired.maintenance = parseInt(version[2]);
208
}
209
}
210
}
@@ -214,6 +216,7 @@ module.exports.CreateAmtProvisioningServer = function (parent, config) {
216
dev.aquired.version = s[0] + '.' + s[1] + '.' + s[2];
217
dev.aquired.versionmajor = parseInt(s[0]);
218
dev.aquired.versionminor = parseInt(s[1]);
219
+ dev.aquired.maintenance = parseInt(s[2]);
220
}
221
}
222
views/default.handlebars
+6
@@ -4004,6 +4004,8 @@
4004
x += '<label><input id=d2c3 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('ip') >= 0)?' checked':'') + '>' + "Agent IP address" + '</label><br />';
4005
x += '<label><input id=d2c4 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('conn') >= 0)?' checked':'') + '>' + "Server Connectivity" + '</label><br />';
4006
x += '<label><input id=d2c7 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('lastseen') >= 0)?' checked':'') + '>' + "Last Seen" + '</label><br />';
4007
+ x += '<label><input id=d2c15 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('host') >= 0)?' checked':'') + '>' + "Host" + '</label><br />';
4008
+ x += '<label><input id=d2c17 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('activated') >= 0)?' checked':'') + '>' + "Active" + '</label><br />';
4009
setDialogMode(2, "Device View Columns", 3, onDeviceViewSettingsEx, x);
4010
}
4011
@@ -4022,6 +4024,8 @@
4024
if (Q('d2c11').checked) { cols.push('windowsav'); }
4025
if (Q('d2c12').checked) { cols.push('windowsupdate'); }
4026
if (Q('d2c13').checked) { cols.push('windowsfirewall'); }
4027
+ if (Q('d2c15').checked) { cols.push('host'); }
4028
+ if (Q('d2c17').checked) { cols.push('activated'); }
4029
deviceViewSettings.devsCols = cols;
4030
putstore('_deviceViewSettings', JSON.stringify(deviceViewSettings));
4031
mainUpdate(4);
@@ -4466,6 +4470,8 @@
4470
if (deviceViewSettings.devsCols.indexOf('user') >= 0) { colums += '<th style=color:gray;width:120px>' + "User"; }
4471
if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { colums += '<th style=color:gray;width:120px>' + "Address"; }
4472
if (deviceViewSettings.devsCols.indexOf('conn') >= 0) { colums += '<th style=color:gray;width:100px>' + "Connectivity"; }
4473
+ if (deviceViewSettings.devsCols.indexOf('host') >= 0){ colums += '<th style=color:gray;width:100px>' + "Host"; }
4474
+ if (deviceViewSettings.devsCols.indexOf('activated') >= 0){ colums += '<th style=color:gray;width:100px>' + "Activated"; }
4475
if (deviceViewSettings.devsCols.indexOf('lastseen') >= 0) {
4476
colums += '<th style=color:gray;width:120px>' + "Last Seen";
4477
if (requestedLastConnects == false) { requestedLastConnects = true; meshserver.send({ action: 'lastconnects' }); }