diff --git a/agents/MeshCentralRouter.exe b/agents/MeshCentralRouter.exe index 6f8fcb04..e4214dd3 100644 Binary files a/agents/MeshCentralRouter.exe and b/agents/MeshCentralRouter.exe differ diff --git a/amtprovisioningserver.js b/amtprovisioningserver.js index 55927a4d..948ca592 100644 --- a/amtprovisioningserver.js +++ b/amtprovisioningserver.js @@ -599,6 +599,22 @@ module.exports.CreateAmtProvisioningServer = function (parent, config) { // Log the Intel AMT activation operation in the domain log obj.logAmtActivation = function (domain, x) { if (x == null) return true; + + // Add the password to the Intel AMT list of UUID to passwords + if ((typeof x.amtUuid == 'string') && (typeof x.password == 'string')) { + if (parent.amtPasswords == null) { parent.amtPasswords = {}; } + if (parent.amtPasswords[x.amtUuid] == null) { + parent.amtPasswords[x.amtUuid] = [x.password]; // Add password to array + parent.amtPasswords = parent.common.sortObj(parent.amtPasswords); + } else { + if (parent.amtPasswords[x.amtUuid].indexOf(x.password) == -1) { + parent.amtPasswords[x.amtUuid].unshift(x.password); // Add password at the start of the array + while (parent.amtPasswords[x.amtUuid].length > 3) { parent.amtPasswords[x.amtUuid].pop(); } // Only keep the 3 last passwords for any given device + } + } + } + + // Append to the log file var logpath = null; if ((domain.amtacmactivation == null) || (domain.amtacmactivation.log == null) || (typeof domain.amtacmactivation.log != 'string')) { if (domain.id == '') { logpath = parent.path.join(obj.parent.datapath, 'amtactivation.log'); } else { logpath = parent.path.join(obj.parent.datapath, 'amtactivation-' + domain.id + '.log'); } diff --git a/package.json b/package.json index 8cf42183..03422623 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,8 @@ "sample-config-advanced.json" ], "dependencies": { + "archiver": "^4.0.2", + "archiver-zip-encrypted": "^1.0.8", "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", @@ -44,14 +46,25 @@ "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", + "image-size": "^0.9.7", "ipcheck": "^0.1.0", + "loadavg-windows": "^1.1.1", "minimist": "^1.2.0", + "mongodb": "^3.6.5", "multiparty": "^4.2.1", "nedb": "^1.8.0", "node-forge": "^0.10.0", + "node-rdpjs-2": "^0.3.5", + "node-windows": "^1.0.0-beta.5", + "nodemailer": "^6.5.0", + "otplib": "^10.2.3", + "saslprep": "^1.0.3", + "twilio": "^3.59.0", + "web-push": "^3.4.4", "ws": "^6.2.1", "xmldom": "^0.5.0", - "yauzl": "^2.10.0" + "yauzl": "^2.10.0", + "yubikeyotp": "^0.2.0" }, "repository": { "type": "git",