From fb15d949766a4f80a4f1f917892c1b99e7046523 Mon Sep 17 00:00:00 2001
From: bennyc-huji <108459999+bennyc-huji@users.noreply.github.com>
Date: Sat, 17 Feb 2024 21:48:50 +0200
Subject: [PATCH] update full version, and marking of the amt to check if
activated (#5803)
---
amtmanager.js | 15 ++++++++++-----
amtprovisioningserver.js | 7 +++++--
views/default.handlebars | 6 ++++++
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/amtmanager.js b/amtmanager.js
index 4c1d6026..9ef8eac0 100644
--- a/amtmanager.js
+++ b/amtmanager.js
@@ -707,7 +707,7 @@ module.exports.CreateAmtManager = function (parent) {
dev.aquired.controlMode = responses['IPS_HostBasedSetupService'].response.CurrentControlMode; // 1 = CCM, 2 = ACM
if (typeof stack.wsman.comm.amtVersion == 'string') { // Set the Intel AMT version using the HTTP header if present
var verSplit = stack.wsman.comm.amtVersion.split('.');
- 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]); }
+ 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]);}
}
dev.aquired.realm = stack.wsman.comm.digestRealm;
dev.aquired.user = dev.intelamt.user = stack.wsman.comm.user;
@@ -2621,7 +2621,7 @@ module.exports.CreateAmtManager = function (parent) {
if (domain && domain.amtmanager && (domain.amtmanager.tlsacmactivation == true)) { TlsAcmActivation = true; }
// Check Intel AMT version
- 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]); } }
+ 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]);} }
// If this is Intel AMT 14 or better and allowed, we are going to attempt a host-based end-to-end TLS activation.
if (TlsAcmActivation && (dev.aquired.majorver >= 14)) {
@@ -2677,7 +2677,7 @@ module.exports.CreateAmtManager = function (parent) {
dev.aquired.controlMode = 1; // 1 = CCM, 2 = ACM
if (typeof dev.amtstack.wsman.comm.amtVersion == 'string') {
var verSplit = dev.amtstack.wsman.comm.amtVersion.split('.');
- 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]); }
+ 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]);}
}
if ((typeof dev.mpsConnection.tag.meiState.OsHostname == 'string') && (typeof dev.mpsConnection.tag.meiState.OsDnsSuffix == 'string')) {
dev.aquired.host = dev.mpsConnection.tag.meiState.OsHostname + '.' + dev.mpsConnection.tag.meiState.OsDnsSuffix;
@@ -2812,8 +2812,12 @@ module.exports.CreateAmtManager = function (parent) {
var vs = getInstance(amtlogicalelements, 'AMT')['VersionString'];
if (vs != null) {
dev.aquired.version = vs;
- dev.aquired.versionmajor = parseInt(dev.aquired.version.split('.')[0]);
- dev.aquired.versionminor = parseInt(dev.aquired.version.split('.')[1]);
+ version = dev.aquired.version.split('.')
+ dev.aquired.versionmajor = parseInt(version[0]);
+ dev.aquired.versionminor = parseInt(version[1]);
+ if(version.length > 2){
+ dev.aquired.versionmaintenance = version[2];
+ }
}
}
}
@@ -2825,6 +2829,7 @@ module.exports.CreateAmtManager = function (parent) {
dev.aquired.version = s[0] + '.' + s[1] + '.' + s[2];
dev.aquired.versionmajor = parseInt(s[0]);
dev.aquired.versionminor = parseInt(s[1]);
+ dev.aquired.versionmaintenance = parseInt(s[2]);
}
}
diff --git a/amtprovisioningserver.js b/amtprovisioningserver.js
index 84a07df9..369b1864 100644
--- a/amtprovisioningserver.js
+++ b/amtprovisioningserver.js
@@ -201,8 +201,10 @@ module.exports.CreateAmtProvisioningServer = function (parent, config) {
var vs = getInstance(amtlogicalelements, 'AMT')['VersionString'];
if (vs != null) {
dev.aquired.version = vs;
- dev.aquired.versionmajor = parseInt(dev.aquired.version.split('.')[0]);
- dev.aquired.versionminor = parseInt(dev.aquired.version.split('.')[1]);
+ version = parseInt(dev.aquired.version.split('.'));
+ dev.aquired.versionmajor = parseInt(version[0]);
+ dev.aquired.versionminor = parseInt(version[1]);
+ dev.aquired.maintenance = parseInt(version[2]);
}
}
}
@@ -214,6 +216,7 @@ module.exports.CreateAmtProvisioningServer = function (parent, config) {
dev.aquired.version = s[0] + '.' + s[1] + '.' + s[2];
dev.aquired.versionmajor = parseInt(s[0]);
dev.aquired.versionminor = parseInt(s[1]);
+ dev.aquired.maintenance = parseInt(s[2]);
}
}
diff --git a/views/default.handlebars b/views/default.handlebars
index 308e9c62..273806a5 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -4004,6 +4004,8 @@
x += '
';
x += '
';
x += '
';
+ x += '
';
+ x += '
';
setDialogMode(2, "Device View Columns", 3, onDeviceViewSettingsEx, x);
}
@@ -4022,6 +4024,8 @@
if (Q('d2c11').checked) { cols.push('windowsav'); }
if (Q('d2c12').checked) { cols.push('windowsupdate'); }
if (Q('d2c13').checked) { cols.push('windowsfirewall'); }
+ if (Q('d2c15').checked) { cols.push('host'); }
+ if (Q('d2c17').checked) { cols.push('activated'); }
deviceViewSettings.devsCols = cols;
putstore('_deviceViewSettings', JSON.stringify(deviceViewSettings));
mainUpdate(4);
@@ -4466,6 +4470,8 @@
if (deviceViewSettings.devsCols.indexOf('user') >= 0) { colums += '' + "User"; }
if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { colums += ' | ' + "Address"; }
if (deviceViewSettings.devsCols.indexOf('conn') >= 0) { colums += ' | ' + "Connectivity"; }
+ if (deviceViewSettings.devsCols.indexOf('host') >= 0){ colums += ' | ' + "Host"; }
+ if (deviceViewSettings.devsCols.indexOf('activated') >= 0){ colums += ' | ' + "Activated"; }
if (deviceViewSettings.devsCols.indexOf('lastseen') >= 0) {
colums += ' | ' + "Last Seen";
if (requestedLastConnects == false) { requestedLastConnects = true; meshserver.send({ action: 'lastconnects' }); }
|