external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Made use of AMT user/pass provided by MeshCMD in amtconfig.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-14 08:30:55 -07:00
parent 7b6fbaf107
commit ab85ec9a3d
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
amtmanager.js
View file

@ -458,8 +458,13 @@ module.exports.CreateAmtManager = function (parent) {
if (dev.acctry == null) {
dev.acctry = [];
// Add Intel AMT username and password provided by MeshCMD if available
if ((dev.mpsConnection != null) && (dev.mpsConnection.tag != null) && (dev.mpsConnection.tag.meiState != null) && (typeof dev.mpsConnection.tag.meiState.amtuser == 'string') && (typeof dev.mpsConnection.tag.meiState.amtpass == 'string') && (dev.mpsConnection.tag.meiState.amtuser != '') && (dev.mpsConnection.tag.meiState.amtpass != '')) {
dev.acctry.push([dev.mpsConnection.tag.meiState.amtuser, dev.mpsConnection.tag.meiState.amtpass]);
}
// Add the know Intel AMT password for this device if available
if ((typeof dev.intelamt.user == 'string') && (typeof dev.intelamt.pass == 'string')) { dev.acctry.push([dev.intelamt.user, dev.intelamt.pass]); }
if ((typeof dev.intelamt.user == 'string') && (typeof dev.intelamt.pass == 'string') && (dev.intelamt.user != '') && (dev.intelamt.pass != '')) { dev.acctry.push([dev.intelamt.user, dev.intelamt.pass]); }
// Add the policy password as an alternative
if ((typeof dev.policy.password == 'string') && (dev.policy.password != '')) { dev.acctry.push(['admin', dev.policy.password]); }
@ -669,7 +674,7 @@ module.exports.CreateAmtManager = function (parent) {
}
}
// If this devics is in CCM mode and we have a bad password reset policy, do it now.
// If this device is in CCM mode and we have a bad password reset policy, do it now.
if ((dev.connType == 2) && (dev.policy.badPass == 1) && (dev.mpsConnection != null) && (dev.mpsConnection.tag != null) && (dev.mpsConnection.tag.meiState != null) && (dev.mpsConnection.tag.meiState.Flags != null) && ((dev.mpsConnection.tag.meiState.Flags & 2) != 0)) {
deactivateIntelAmtCCM(dev);
return;

8
mpsserver.js
View file

@ -600,8 +600,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
}
if (obj.parent.webserver.meshes[cookie.m] == null) {
meshNotFoundCount++;
socket.ControlMsg({ action: 'console', msg: 'Device group not found' });
parent.debug('mps', 'Device group not found', username, password);
socket.ControlMsg({ action: 'console', msg: 'Device group not found (1)' });
parent.debug('mps', 'Device group not found (1)', username, password);
SendUserAuthFail(socket);
return -1;
}
@ -645,8 +645,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
}
if (mesh == null) {
meshNotFoundCount++;
socket.ControlMsg({ action: 'console', msg: 'Device group not found' });
parent.debug('mps', 'Device group not found', username, password);
socket.ControlMsg({ action: 'console', msg: 'Device group not found (2)' });
parent.debug('mps', 'Device group not found (2)', username, password);
SendUserAuthFail(socket);
return -1;
}