MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Intel AMT manager overhall, many improvements.

This commit is contained in:
Ylian Saint-Hilaire 2020-10-15 16:08:36 -07:00
parent 75acc04e7c
commit 3f5a85be99
6 changed files with 316 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
amt/amt-wsman-comm.js
View File

@ -26,7 +26,7 @@ limitations under the License.
"use strict"; "use strict";
// Construct a WSMAN stack communication object // Construct a WSMAN stack communication object
var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraConnection) { var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConnection) {
//console.log('CreateWsmanComm', host, port, user, pass, tls, tlsoptions); //console.log('CreateWsmanComm', host, port, user, pass, tls, tlsoptions);
var obj = {}; var obj = {};
@ -59,7 +59,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
obj.pass = pass; obj.pass = pass;
obj.xtls = tls; obj.xtls = tls;
obj.xtlsoptions = tlsoptions; obj.xtlsoptions = tlsoptions;
obj.ciraConnection = ciraConnection; // This can be a CIRA or APF server, if null, local sockets are used as transport. obj.mpsConnection = mpsConnection; // Link to a MPS connection, this can be CIRA, Relay or LMS. If null, local sockets are used as transport.
obj.xtlsFingerprint; obj.xtlsFingerprint;
obj.xtlsCertificate = null; obj.xtlsCertificate = null;
obj.xtlsCheck = 0; // 0 = No TLS, 1 = CA Checked, 2 = Pinned, 3 = Untrusted obj.xtlsCheck = 0; // 0 = No TLS, 1 = CA Checked, 2 = Pinned, 3 = Untrusted
@ -197,10 +197,10 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
obj.socketState = 1; obj.socketState = 1;
obj.kerberosDone = 0; obj.kerberosDone = 0;
if (obj.ciraConnection != null) { if (obj.mpsConnection != null) {
if (obj.xtls != 1) { if (obj.xtls != 1) {
// Setup a new channel using the CIRA/Relay/LMS connection // Setup a new channel using the CIRA/Relay/LMS connection
obj.socket = obj.ciraConnection.SetupChannel(obj.port); obj.socket = obj.mpsConnection.SetupChannel(obj.port);
if (obj.socket == null) { obj.xxOnSocketClosed(); return; } if (obj.socket == null) { obj.xxOnSocketClosed(); return; }
// Connect without TLS // Connect without TLS
@ -221,7 +221,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
} }
} else { } else {
// Setup a new channel using the CIRA/Relay/LMS connection // Setup a new channel using the CIRA/Relay/LMS connection
obj.cirasocket = obj.ciraConnection.SetupChannel(obj.port); obj.cirasocket = obj.mpsConnection.SetupChannel(obj.port);
if (obj.cirasocket == null) { obj.xxOnSocketClosed(); return; } if (obj.cirasocket == null) { obj.xxOnSocketClosed(); return; }
// Connect with TLS // Connect with TLS
@ -425,7 +425,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
if (isNaN(s)) s = 500; if (isNaN(s)) s = 500;
if (s == 401 && ++(obj.authcounter) < 3) { if (s == 401 && ++(obj.authcounter) < 3) {
obj.challengeParams = obj.parseDigest(header['www-authenticate']); // Set the digest parameters, after this, the socket will close and we will auto-retry obj.challengeParams = obj.parseDigest(header['www-authenticate']); // Set the digest parameters, after this, the socket will close and we will auto-retry
if (obj.ciraConnection == null) { obj.socket.end(); } else { obj.socket.close(); } if (obj.mpsConnection == null) { obj.socket.end(); } else { obj.socket.close(); }
} else { } else {
var r = obj.pendingAjaxCall.shift(); var r = obj.pendingAjaxCall.shift();
if (r == null || r.length < 1) { console.log("pendingAjaxCall error, " + r); return; } if (r == null || r.length < 1) { console.log("pendingAjaxCall error, " + r); return; }
@ -443,7 +443,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
obj.socketState = 0; obj.socketState = 0;
if (obj.socket != null) { if (obj.socket != null) {
try { try {
if (obj.ciraConnection == null) { if (obj.mpsConnection == null) {
obj.socket.destroy(); obj.socket.destroy();
} else { } else {
if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); }
@ -461,7 +461,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, ciraCon
obj.xxOnSocketTimeout = function () { obj.xxOnSocketTimeout = function () {
if (obj.socket != null) { if (obj.socket != null) {
try { try {
if (obj.ciraConnection == null) { if (obj.mpsConnection == null) {
obj.socket.destroy(); obj.socket.destroy();
} else { } else {
if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); }

415
amtmanager.js
View File

@ -11,64 +11,142 @@
/*jshint strict:false */ /*jshint strict:false */
/*jshint -W097 */ /*jshint -W097 */
/*jshint esversion: 6 */ /*jshint esversion: 6 */
"use strict"; 'use strict';
module.exports.CreateAmtManager = function(parent) { module.exports.CreateAmtManager = function(parent) {
var obj = {}; var obj = {};
obj.parent = parent; obj.parent = parent;
obj.amtDevices = {}; // Nodeid --> dev obj.amtDevices = {}; // Nodeid --> [ dev ]
obj.activeLocalConnections = {}; // Host --> dev obj.activeLocalConnections = {}; // Host --> [ dev ]
obj.amtAdminAccounts = []; obj.amtAdminAccounts = {}; // DomainId -> [ { user, pass } ]
// WSMAN stack // WSMAN stack
const CreateWsmanComm = require('./amt/amt-wsman-comm'); const CreateWsmanComm = require('./amt/amt-wsman-comm');
const WsmanStackCreateService = require('./amt/amt-wsman'); const WsmanStackCreateService = require('./amt/amt-wsman');
const AmtStackCreateService = require('./amt/amt'); const AmtStackCreateService = require('./amt/amt');
const ConnectionTypeStrings = { 0: "CIRA", 1: "Relay", 2: "LMS", 3: "Local" };
// Load the Intel AMT admin accounts // Load the Intel AMT admin accounts credentials for each domain
if ((typeof parent.args.amtmanager == 'object') && (Array.isArray(parent.args.amtmanager.amtadminaccount) == true)) { if ((parent.config != null) && (parent.config.domains != null)) {
for (var i in parent.args.amtmanager.amtadminaccount) { for (var domainid in parent.config.domains) {
var c = parent.args.amtmanager.amtadminaccount[i], c2 = { user: 'admin' }; var domain = parent.config.domains[domainid];
if ((typeof domain.amtmanager == 'object') && (Array.isArray(domain.amtmanager.amtadminaccount) == true)) {
for (var i in domain.amtmanager.amtadminaccount) {
var c = domain.amtmanager.amtadminaccount[i], c2 = { user: 'admin' };
if (typeof c.user == 'string') { c2.user = c.user; } if (typeof c.user == 'string') { c2.user = c.user; }
if (typeof c.pass == 'string') { c2.pass = c.pass; obj.amtAdminAccounts.push(c2); } if (typeof c.pass == 'string') {
c2.pass = c.pass;
if (obj.amtAdminAccounts[domainid] == null) { obj.amtAdminAccounts[domainid] = []; }
obj.amtAdminAccounts[domainid].push(c2);
} }
} }
}
}
}
// Check if an Intel AMT device is being managed
function isAmtDeviceValid(dev) {
var devices = obj.amtDevices[dev.nodeid];
if (devices == null) return false;
return (devices.indexOf(dev) >= 0)
}
// Add an Intel AMT managed device
function addAmtDevice(dev) {
var devices = obj.amtDevices[dev.nodeid];
if (devices == null) { obj.amtDevices[dev.nodeid] = [dev]; return true; }
if (devices.indexOf(dev) >= 0) { return false; } // This device is already in the list
devices.push(dev); // Add the device to the list
return true;
}
// Remove an Intel AMT managed device
function removeAmtDevice(dev) {
// Find the device in the list
var devices = obj.amtDevices[dev.nodeid];
if (devices == null) return false;
var i = devices.indexOf(dev);
if (i == -1) return false;
// Clean up this device
if (dev.amtstack != null) { dev.amtstack.wsman.comm.FailAllError = 999; delete dev.amtstack; } // Disconnect any active connections.
if (dev.polltimer != null) { clearInterval(dev.polltimer); delete dev.polltimer; }
// Remove the device from the list
devices.splice(i, 1);
if (devices.length == 0) { delete obj.amtDevices[dev.nodeid]; } else { obj.amtDevices[dev.nodeid] = devices; }
return true;
}
// Remove all Intel AMT devices for a given nodeid
function removeDevice(nodeid) {
// Find the devices in the list
var devices = obj.amtDevices[nodeid];
if (devices == null) return false;
for (var i in devices) {
// Clean up this device
var dev = devices[i];
if (dev.amtstack != null) { dev.amtstack.wsman.comm.FailAllError = 999; delete dev.amtstack; } // Disconnect any active connections.
if (dev.polltimer != null) { clearInterval(dev.polltimer); delete dev.polltimer; }
}
// Remove all devices
delete obj.amtDevices[nodeid];
return true;
}
// Start Intel AMT management
obj.startAmtManagement = function (nodeid, connType, connection) {
//if (connType == 3) return; // DEBUG
var devices = obj.amtDevices[nodeid], dev = null;
if (devices != null) { for (var i in devices) { if ((devices[i].mpsConnection == connection) || (devices[i].host == connection)) { dev = devices[i]; } } }
if (dev != null) return false; // We are already managing this device on this connection
dev = { nodeid: nodeid, connType: connType };
if (typeof connection == 'string') { dev.host = connection; }
if (typeof connection == 'object') { dev.mpsConnection = connection; }
parent.debug('amt', "Start Management", nodeid, connType);
addAmtDevice(dev);
fetchIntelAmtInformation(dev);
}
// Stop Intel AMT management
obj.stopAmtManagement = function (nodeid, connType, connection) {
var devices = obj.amtDevices[nodeid], dev = null;
if (devices != null) { for (var i in devices) { if ((devices[i].mpsConnection == connection) || (devices[i].host == connection)) { dev = devices[i]; } } }
if (dev == null) return false; // We are not managing this device on this connection
parent.debug('amt', "Stop Management", nodeid, connType);
return removeAmtDevice(dev);
}
// Get a string status of the managed devices
obj.getStatusString = function () {
var r = '';
for (var nodeid in obj.amtDevices) {
var devices = obj.amtDevices[nodeid];
r += devices[0].nodeid + ', ' + devices[0].name + '\r\n';
for (var i in devices) {
var dev = devices[i];
var items = [];
if (dev.state == 1) { items.push('Connected'); } else { items.push('Trying'); }
items.push(ConnectionTypeStrings[dev.connType]);
if (dev.connType == 3) { items.push(dev.host); }
if (dev.polltimer != null) { items.push('Polling Power'); }
r += ' ' + items.join(', ') + '\r\n';
}
}
if (r == '') { r = "No managed Intel AMT devices"; }
return r;
}
// Subscribe to server events // Subscribe to server events
parent.AddEventDispatch(['*'], obj); parent.AddEventDispatch(['*'], obj);
// Handle server events // Handle server events
// TODO: Only manage devices with connections to this server. In a multi-server setup, we don't want multiple managers talking to the same device. // Make sure to only manage devices with connections to this server. In a multi-server setup, we don't want multiple managers talking to the same device.
obj.HandleEvent = function (source, event, ids, id) { obj.HandleEvent = function (source, event, ids, id) {
switch (event.action) { switch (event.action) {
case 'nodeconnect': { // React to nodes connecting and disconnecting
// See if we have an existing device we manage
var dev = obj.amtDevices[event.nodeid];
// If the connection type we are using is not longer valid, remove our managed device.
if ((dev != null) && (dev.conntype != null) && ((dev.conntype & event.conn) == 0)) { removeDevice(event.nodeid); dev = null; }
// Debug line, to only manage CIRA/Relay connections
//if ((event.conn & 10) == 0) return;
// Create or update a managed device
if ((event.conn & 14) != 0) { // connectType: Bitmask, 1 = MeshAgent, 2 = Intel AMT CIRA, 4 = Intel AMT local, 8 = Intel AMT Relay, 16 = MQTT
// We have an OOB connection to Intel AMT, update our information
if (dev == null) {
obj.amtDevices[event.nodeid] = dev = { conn: event.conn }; fetchIntelAmtInformation(event.nodeid);
} else {
dev.conn = event.conn;
}
} else if (((event.conn & 1) != 0) && (parent.webserver != null)) {
// We have an agent connection without CIRA/Local/Relay, check if this agent supports Intel AMT
var agent = parent.webserver.wsagents[event.nodeid];
if ((agent != null) && (agent.agentInfo != null) && (parent.meshAgentsArchitectureNumbers[agent.agentInfo.agentId].amt == true)) {
// We could turn on LMS relay at this point.
}
}
break;
}
case 'removenode': { // React to node being removed case 'removenode': { // React to node being removed
removeDevice(event.nodeid); removeDevice(event.nodeid);
break; break;
@ -77,27 +155,13 @@ module.exports.CreateAmtManager = function(parent) {
if (Array.isArray(event.nodeids)) { for (var i in event.nodeids) { performPowerAction(event.nodeids[i], 2); } } if (Array.isArray(event.nodeids)) { for (var i in event.nodeids) { performPowerAction(event.nodeids[i], 2); } }
break; break;
} }
case 'changenode': { // React to changes in a node case 'changenode': { // React to changes in a device
var devices = obj.amtDevices[event.nodeid];
if (devices = null) break; // We are not managing this device
if (event.amtchange === 1) { if (event.amtchange === 1) {
// A change occured in the Intel AMT credentials, we need to reset the connection // TODO
removeDevice(event.nodeid);
// Check if the agent is connected
var constate = parent.GetConnectivityState(event.nodeid);
if (constate == null) return; // No OOB connectivity, exit now.
if ((constate & 14) != 0) { // connectType: Bitmask, 1 = MeshAgent, 2 = Intel AMT CIRA, 4 = Intel AMT local, 8 = Intel AMT Relay, 16 = MQTT
// We have an OOB connection to Intel AMT, update our information
var dev = obj.amtDevices[event.nodeid];
if (dev == null) { obj.amtDevices[event.nodeid] = dev = { conn: constate }; fetchIntelAmtInformation(event.nodeid); } else { dev.conn = constate; }
} else if (((event.conn & 1) != 0) && (parent.webserver != null)) {
// We have an agent connection without OOB, check if this agent supports Intel AMT
var agent = parent.webserver.wsagents[event.nodeid];
if ((agent == null) || (agent.agentInfo == null) || (parent.meshAgentsArchitectureNumbers[agent.agentInfo.agentId].amt == false)) { removeDevice(event.nodeid); return; }
var dev = obj.amtDevices[event.nodeid];
if (dev == null) { obj.amtDevices[event.nodeid] = dev = { conn: constate }; fetchIntelAmtInformation(event.nodeid); } else { dev.conn = constate; }
}
} else { } else {
/*
var dev = obj.amtDevices[event.nodeid]; var dev = obj.amtDevices[event.nodeid];
if (dev != null) { if (dev != null) {
var amtchange = 0; var amtchange = 0;
@ -108,90 +172,24 @@ module.exports.CreateAmtManager = function(parent) {
if ((dev.conn & 4) != 0) { removeDevice(dev.nodeid); return; } // We are going to wait for the AMT scanned to find this device again. if ((dev.conn & 4) != 0) { removeDevice(dev.nodeid); return; } // We are going to wait for the AMT scanned to find this device again.
} }
} }
*/
} }
break; break;
} }
} }
} }
// Remove a device
function removeDevice(nodeid) {
const dev = obj.amtDevices[nodeid];
if (dev == null) return;
if (dev.amtstack != null) { dev.amtstack.wsman.comm.FailAllError = 999; delete dev.amtstack; } // Disconnect any active connections.
if (dev.polltimer != null) { clearInterval(dev.polltimer); delete dev.polltimer; }
delete obj.amtDevices[nodeid];
}
// Get the current power state of a device
function fetchPowerState(dev) {
dev = obj.amtDevices[dev.nodeid];
if ((dev == null) || (dev.amtstack == null)) return;
// Check if the agent is connected
var constate = parent.GetConnectivityState(dev.nodeid);
if ((constate == null) || (constate.connectivity & 1)) return; // If there is no connectivity or the agent is connected, skip trying to poll power state.
// Fetch the power state
dev.amtstack.BatchEnum(null, ['CIM_ServiceAvailableToElement'], function (stack, name, responses, status) {
const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response.
if ((status != 200) || (responses['CIM_ServiceAvailableToElement'] == null) || (responses['CIM_ServiceAvailableToElement'].responses == null) || (responses['CIM_ServiceAvailableToElement'].responses.length < 1)) return; // If the polling fails, just skip it.
var powerstate = responses['CIM_ServiceAvailableToElement'].responses[0].PowerState;
if ((powerstate == 2) && (dev.aquired.majorver > 9)) {
// Device is powered on and Intel AMT 10+, poll the OS power state.
dev.amtstack.Get('IPS_PowerManagementService', function (stack, name, response, status) {
const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response.
if (status != 200) return;
// Convert the OS power state
var meshPowerState = -1;
if (response.Body.OSPowerSavingState == 2) { meshPowerState = 1; } // Fully powered (S0);
else if (response.Body.OSPowerSavingState == 3) { meshPowerState = 2; } // Modern standby (We are going to call this S1);
// Set OS power state
if (meshPowerState >= 0) { parent.SetConnectivityState(dev.meshid, dev.nodeid, Date.now(), 4, meshPowerState); }
});
} else {
// Convert the power state
// AMT power: 1 = Other, 2 = On, 3 = Sleep-Light, 4 = Sleep-Deep, 5 = Power Cycle (Off-Soft), 6 = Off-Hard, 7 = Hibernate (Off-Soft), 8 = Off-Soft, 9 = Power Cycle (Off-Hard), 10 = Master Bus Reset, 11 = Diagnostic Interrupt (NMI), 12 = Off-Soft Graceful, 13 = Off-Hard Graceful, 14 = Master Bus Reset Graceful, 15 = Power Cycle (Off- oft Graceful), 16 = Power Cycle (Off - Hard Graceful), 17 = Diagnostic Interrupt (INIT)
// Mesh power: 0 = Unknown, 1 = S0 power on, 2 = S1 Sleep, 3 = S2 Sleep, 4 = S3 Sleep, 5 = S4 Hibernate, 6 = S5 Soft-Off, 7 = Present
var meshPowerState = -1, powerConversionTable = [-1, -1, 1, 2, 3, 6, 6, 5, 6];
if (powerstate < powerConversionTable.length) { meshPowerState = powerConversionTable[powerstate]; } else { powerstate = 6; }
// Set power state
if (meshPowerState >= 0) { parent.SetConnectivityState(dev.meshid, dev.nodeid, Date.now(), 4, meshPowerState); }
}
});
}
// Perform a power action: 2 = Power up, 5 = Power cycle, 8 = Power down, 10 = Reset
function performPowerAction(nodeid, action) {
var dev = obj.amtDevices[nodeid];
if ((dev == null) || (dev.amtstack == null)) return;
try { dev.amtstack.RequestPowerStateChange(action, performPowerActionResponse); } catch (ex) { }
}
// Response to Intel AMT power action
function performPowerActionResponse(stack, name, responses, status) {
//console.log('performPowerActionResponse', status);
}
// Update information about a device // Update information about a device
function fetchIntelAmtInformation(nodeid) { function fetchIntelAmtInformation(dev) {
parent.db.Get(nodeid, function (err, nodes) { parent.db.Get(dev.nodeid, function (err, nodes) {
if ((nodes == null) || (nodes.length != 1)) { removeDevice(nodeid); return; } if ((nodes == null) || (nodes.length != 1)) { removeAmtDevice(dev); return; }
const node = nodes[0]; const node = nodes[0];
if ((node.intelamt == null) || (node.meshid == null)) { removeDevice(nodeid); return; } if ((node.intelamt == null) || (node.meshid == null)) { removeAmtDevice(dev); return; }
const mesh = parent.webserver.meshes[node.meshid]; const mesh = parent.webserver.meshes[node.meshid];
if (mesh == null) { removeDevice(nodeid); return; } if (mesh == null) { removeAmtDevice(dev); return; }
const dev = obj.amtDevices[nodeid];
if (dev == null) { return; } if (dev == null) { return; }
dev.name = node.name; dev.name = node.name;
dev.nodeid = node._id; //if (node.host) { dev.host = node.host.toLowerCase(); }
if (node.host) { dev.host = node.host.toLowerCase(); }
dev.meshid = node.meshid; dev.meshid = node.meshid;
dev.intelamt = node.intelamt; dev.intelamt = node.intelamt;
attemptInitialContact(dev); attemptInitialContact(dev);
@ -200,23 +198,24 @@ module.exports.CreateAmtManager = function(parent) {
// Attempt to perform initial contact with Intel AMT // Attempt to perform initial contact with Intel AMT
function attemptInitialContact(dev) { function attemptInitialContact(dev) {
if (dev == null) return; parent.debug('amt', "Attempt Initial Contact", dev.name, dev.connType);
//console.log('attemptInitialContact', dev.name);
if ((dev.acctry == null) && ((typeof dev.intelamt.user != 'string') || (typeof dev.intelamt.pass != 'string'))) { if ((dev.acctry == null) && ((typeof dev.intelamt.user != 'string') || (typeof dev.intelamt.pass != 'string'))) {
if (obj.amtAdminAccounts.length > 0) { dev.acctry = 0; } else { return; } if ((obj.amtAdminAccounts[dev.domainid] != null) && (obj.amtAdminAccounts[dev.domainid].length > 0)) { dev.acctry = 0; } else { return; }
} }
// Handle the case where the Intel AMT CIRA is connected (conn & 2) switch (dev.connType) {
case 0: // CIRA
// Handle the case where the Intel AMT CIRA is connected (connType 0)
// In this connection type, we look at the port bindings to see if we need to do TLS or not. // In this connection type, we look at the port bindings to see if we need to do TLS or not.
if ((dev.conn & 2) != 0) {
// Check to see if CIRA is connected on this server. // Check to see if CIRA is connected on this server.
var ciraconn = parent.mpsserver.GetConnectionToNode(dev.nodeid, null, 0); // Select the CIRA connection var ciraconn = dev.mpsConnection;
if ((ciraconn == null) || (ciraconn.tag == null) || (ciraconn.tag.boundPorts == null)) { removeDevice(dev.nodeid); return; } // CIRA connection is not on this server, no need to deal with this device anymore. if ((ciraconn == null) || (ciraconn.tag == null) || (ciraconn.tag.boundPorts == null)) { removeAmtDevice(dev); return; } // CIRA connection is not on this server, no need to deal with this device anymore.
// See what user/pass to try. // See what user/pass to try.
var user = null, pass = null; var user = null, pass = null;
if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.acctry].user; pass = obj.amtAdminAccounts[dev.acctry].pass; } if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.domainid][dev.acctry].user; pass = obj.amtAdminAccounts[dev.domainid][dev.acctry].pass; }
// See if we need to perform TLS or not. We prefer not to do TLS within CIRA. // See if we need to perform TLS or not. We prefer not to do TLS within CIRA.
var dotls = -1; var dotls = -1;
@ -225,7 +224,7 @@ module.exports.CreateAmtManager = function(parent) {
if (dotls == -1) { removeDevice(dev.nodeid); return; } // The Intel AMT ports are not open, not a device we can deal with. if (dotls == -1) { removeDevice(dev.nodeid); return; } // The Intel AMT ports are not open, not a device we can deal with.
// Connect now // Connect now
//console.log('CIRA-Connect', (dotls == 1)?"TLS":"NoTLS", dev.name, dev.host, user, pass); parent.debug('amt', 'CIRA-Connect', (dotls == 1) ? "TLS" : "NoTLS", dev.name, user, pass);
var comm; var comm;
if (dotls == 1) { if (dotls == 1) {
comm = CreateWsmanComm(dev.nodeid, 16993, user, pass, 1, null, ciraconn); // Perform TLS comm = CreateWsmanComm(dev.nodeid, 16993, user, pass, 1, null, ciraconn); // Perform TLS
@ -238,29 +237,26 @@ module.exports.CreateAmtManager = function(parent) {
dev.amtstack.dev = dev; dev.amtstack.dev = dev;
obj.activeLocalConnections[dev.host] = dev; obj.activeLocalConnections[dev.host] = dev;
dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse); dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse);
dev.conntype = 2; // CIRA break;
case 1:
return; // If CIRA is connected, don't try any other methods. case 2:
} // Handle the case where the Intel AMT relay or LMS is connected (connType 1 or 2)
// Handle the case where the Intel AMT relay is connected (conn & 8)
if ((dev.conn & 8) != 0) {
// Check to see if CIRA is connected on this server. // Check to see if CIRA is connected on this server.
var ciraconn = parent.mpsserver.GetConnectionToNode(dev.nodeid, null, 1); // Select a relay connection var ciraconn = dev.mpsConnection;
if ((ciraconn == null) || (ciraconn.tag == null) || (ciraconn.tag.boundPorts == null)) { removeDevice(dev.nodeid); return; } // CIRA connection is not on this server, no need to deal with this device anymore. if ((ciraconn == null) || (ciraconn.tag == null) || (ciraconn.tag.boundPorts == null)) { removeAmtDevice(dev); return; } // Relay connection not valid
// See what user/pass to try. // See what user/pass to try.
var user = null, pass = null; var user = null, pass = null;
if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.acctry].user; pass = obj.amtAdminAccounts[dev.acctry].pass; } if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.domainid][dev.acctry].user; pass = obj.amtAdminAccounts[dev.domainid][dev.acctry].pass; }
// Connect now // Connect now
var comm; var comm;
if (dev.tlsfail !== true) { if (dev.tlsfail !== true) {
//console.log('Relay-Connect', "TLS", dev.name, dev.host, user, pass); parent.debug('amt', 'Relay-Connect', "TLS", dev.name, user, pass);
comm = CreateWsmanComm(dev.nodeid, 16993, user, pass, 1, null, ciraconn); // Perform TLS comm = CreateWsmanComm(dev.nodeid, 16993, user, pass, 1, null, ciraconn); // Perform TLS
comm.xtlsFingerprint = 0; // Perform no certificate checking comm.xtlsFingerprint = 0; // Perform no certificate checking
} else { } else {
//console.log('Relay-Connect', "NoTLS", dev.name, dev.host, user, pass); parent.debug('amt', 'Relay-Connect', "NoTLS", dev.name, user, pass);
comm = CreateWsmanComm(dev.nodeid, 16992, user, pass, 0, null, ciraconn); // No TLS comm = CreateWsmanComm(dev.nodeid, 16992, user, pass, 0, null, ciraconn); // No TLS
} }
var wsstack = WsmanStackCreateService(comm); var wsstack = WsmanStackCreateService(comm);
@ -268,13 +264,12 @@ module.exports.CreateAmtManager = function(parent) {
dev.amtstack.dev = dev; dev.amtstack.dev = dev;
obj.activeLocalConnections[dev.host] = dev; obj.activeLocalConnections[dev.host] = dev;
dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse); dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse);
dev.conntype = 8; // Relay break;
case 3:
// Handle the case where the Intel AMT local scanner found the device (connType 3)
parent.debug('amt', "Attempt Initial Local Contact", dev.name, dev.connType, dev.host);
if (typeof dev.host != 'string') { removeAmtDevice(dev); return; } // Local connection not valid
return; // If relay is connected, don't try any other methods.
}
// Handle the case where the Intel AMT local scanner found the device (conn & 4)
if (((dev.conn & 4) != 0) && (typeof dev.host == 'string')) {
// Since we don't allow two or more connections to the same host, check if a pending connection is active. // Since we don't allow two or more connections to the same host, check if a pending connection is active.
if (obj.activeLocalConnections[dev.host] != null) { if (obj.activeLocalConnections[dev.host] != null) {
// Active connection, hold and try later. // Active connection, hold and try later.
@ -284,16 +279,16 @@ module.exports.CreateAmtManager = function(parent) {
} else { } else {
// No active connections, see what user/pass to try. // No active connections, see what user/pass to try.
var user = null, pass = null; var user = null, pass = null;
if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.acctry].user; pass = obj.amtAdminAccounts[dev.acctry].pass; } if (dev.acctry == null) { user = dev.intelamt.user; pass = dev.intelamt.pass; } else { user = obj.amtAdminAccounts[dev.domainid][dev.acctry].user; pass = obj.amtAdminAccounts[dev.domainid][dev.acctry].pass; }
// Connect now // Connect now
var comm; var comm;
if (dev.tlsfail !== true) { if (dev.tlsfail !== true) {
//console.log('Direct-Connect', "TLS", dev.name, dev.host, user, pass); parent.debug('amt', 'Direct-Connect', "TLS", dev.name, dev.host, user, pass);
comm = CreateWsmanComm(dev.host, 16993, user, pass, 1); // Always try with TLS first comm = CreateWsmanComm(dev.host, 16993, user, pass, 1); // Always try with TLS first
comm.xtlsFingerprint = 0; // Perform no certificate checking comm.xtlsFingerprint = 0; // Perform no certificate checking
} else { } else {
//console.log('Direct-Connect', "NoTLS", dev.name, dev.host, user, pass); parent.debug('amt', 'Direct-Connect', "NoTLS", dev.name, dev.host, user, pass);
comm = CreateWsmanComm(dev.host, 16992, user, pass, 0); // Try without TLS comm = CreateWsmanComm(dev.host, 16992, user, pass, 0); // Try without TLS
} }
var wsstack = WsmanStackCreateService(comm); var wsstack = WsmanStackCreateService(comm);
@ -303,22 +298,24 @@ module.exports.CreateAmtManager = function(parent) {
dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse); dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse);
dev.conntype = 1; // LOCAL dev.conntype = 1; // LOCAL
} }
break;
} }
} }
function attemptLocalConnectResponse(stack, name, responses, status) { function attemptLocalConnectResponse(stack, name, responses, status) {
//console.log('attemptLocalConnectResponse', status, stack.dev.name); const dev = stack.dev;
parent.debug('amt', "Initial Contact Response", dev.name, status);
// Release active connection to this host. // If this is a local connection device, release active connection to this host.
delete obj.activeLocalConnections[stack.wsman.comm.host]; if (dev.connType == 3) { delete obj.activeLocalConnections[dev.host]; }
// Check if the device still exists // Check if the device still exists
const dev = stack.dev; if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response.
// Check the response // Check the response
if ((status == 200) && (responses['AMT_GeneralSettings'] != null) && (responses['IPS_HostBasedSetupService'] != null) && (responses['IPS_HostBasedSetupService'].response != null) && (responses['IPS_HostBasedSetupService'].response != null) && (stack.wsman.comm.digestRealm == responses['AMT_GeneralSettings'].response.DigestRealm)) { if ((status == 200) && (responses['AMT_GeneralSettings'] != null) && (responses['IPS_HostBasedSetupService'] != null) && (responses['IPS_HostBasedSetupService'].response != null) && (responses['IPS_HostBasedSetupService'].response != null) && (stack.wsman.comm.digestRealm == responses['AMT_GeneralSettings'].response.DigestRealm)) {
// Everything looks good // Everything looks good
dev.state = 1;
if (dev.aquired == null) { dev.aquired = {}; } if (dev.aquired == null) { dev.aquired = {}; }
dev.aquired.controlMode = responses['IPS_HostBasedSetupService'].response.CurrentControlMode; // 1 = CCM, 2 = ACM dev.aquired.controlMode = responses['IPS_HostBasedSetupService'].response.CurrentControlMode; // 1 = CCM, 2 = ACM
var verSplit = stack.wsman.comm.amtVersion.split('.'); var verSplit = stack.wsman.comm.amtVersion.split('.');
@ -327,20 +324,21 @@ module.exports.CreateAmtManager = function(parent) {
dev.aquired.user = stack.wsman.comm.user; dev.aquired.user = stack.wsman.comm.user;
dev.aquired.pass = stack.wsman.comm.pass; dev.aquired.pass = stack.wsman.comm.pass;
dev.aquired.lastContact = Date.now(); dev.aquired.lastContact = Date.now();
if (dev.conntype == 1) { dev.aquired.tls = stack.wsman.comm.xtls; } // Only set the TLS state if on local mode. When using CIRA, this is auto-detected. if ((dev.connType == 1) || (dev.connType == 3)) { dev.aquired.tls = stack.wsman.comm.xtls; } // Only set the TLS state if in relay or local mode. When using CIRA, this is auto-detected.
if (stack.wsman.comm.xtls == 1) { dev.aquired.hash = stack.wsman.comm.xtlsCertificate.fingerprint.split(':').join('').toLowerCase(); } else { delete dev.aquired.hash; } if (stack.wsman.comm.xtls == 1) { dev.aquired.hash = stack.wsman.comm.xtlsCertificate.fingerprint.split(':').join('').toLowerCase(); } else { delete dev.aquired.hash; }
//console.log(dev.nodeid, dev.name, dev.host, dev.aquired);
UpdateDevice(dev); UpdateDevice(dev);
// Perform Intel AMT clock sync // Perform Intel AMT clock sync
attemptSyncClock(dev, function () { attemptSyncClock(dev, function () {
attemptFetchHardwareInventory(dev); // See if we need to get hardware inventory attemptFetchHardwareInventory(dev); // See if we need to get hardware inventory
// Start power polling if (dev.connType != 2) {
// Start power polling if not connected to LMS
var ppfunc = function powerPoleFunction() { fetchPowerState(powerPoleFunction.dev); } var ppfunc = function powerPoleFunction() { fetchPowerState(powerPoleFunction.dev); }
ppfunc.dev = dev; ppfunc.dev = dev;
dev.polltimer = new setTimeout(ppfunc, 290000); // Poll for power state every 4 minutes 50 seconds. dev.polltimer = new setTimeout(ppfunc, 290000); // Poll for power state every 4 minutes 50 seconds.
fetchPowerState(dev); fetchPowerState(dev);
}
}); });
} else { } else {
// We got a bad response // We got a bad response
@ -349,20 +347,20 @@ module.exports.CreateAmtManager = function(parent) {
dev.tlsfail = true; attemptInitialContact(dev); return; dev.tlsfail = true; attemptInitialContact(dev); return;
} else if (status == 401) { } else if (status == 401) {
// Authentication error, see if we can use alternative credentials // Authentication error, see if we can use alternative credentials
if ((dev.acctry == null) && (obj.amtAdminAccounts.length > 0)) { dev.acctry = 0; attemptInitialContact(dev); return; } if ((dev.acctry == null) && (obj.amtAdminAccounts[dev.domainid] != null) && (obj.amtAdminAccounts[dev.domainid].length > 0)) { dev.acctry = 0; attemptInitialContact(dev); return; }
if ((dev.acctry != null) && (obj.amtAdminAccounts.length > (dev.acctry + 1))) { dev.acctry++; attemptInitialContact(dev); return; } if ((dev.acctry != null) && (obj.amtAdminAccounts[dev.domainid] != null) && (obj.amtAdminAccounts[dev.domainid].length > (dev.acctry + 1))) { dev.acctry++; attemptInitialContact(dev); return; }
// We are unable to authenticate to this device, clear Intel AMT credentials. // We are unable to authenticate to this device, clear Intel AMT credentials.
ClearDeviceCredentials(dev); ClearDeviceCredentials(dev);
} }
//console.log(dev.nodeid, dev.name, dev.host, status, 'Bad response'); //console.log(dev.nodeid, dev.name, dev.host, status, 'Bad response');
removeDevice(dev.nodeid); removeAmtDevice(dev);
} }
} }
// Change the current core information string and event it // Change the current core information string and event it
function UpdateDevice(dev) { function UpdateDevice(dev) {
if (obj.amtDevices[dev.nodeid] == null) return false; // Device no longer exists, ignore this request. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
// Check that the mesh exists // Check that the mesh exists
const mesh = parent.webserver.meshes[dev.meshid]; const mesh = parent.webserver.meshes[dev.meshid];
@ -412,7 +410,7 @@ module.exports.CreateAmtManager = function(parent) {
// Change the current core information string and event it // Change the current core information string and event it
function ClearDeviceCredentials(dev) { function ClearDeviceCredentials(dev) {
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this request. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
// Check that the mesh exists // Check that the mesh exists
const mesh = parent.webserver.meshes[dev.meshid]; const mesh = parent.webserver.meshes[dev.meshid];
@ -446,10 +444,71 @@ module.exports.CreateAmtManager = function(parent) {
}); });
} }
// Get the current power state of a device
function fetchPowerState(dev) {
if (isAmtDeviceValid(dev) == false) return;
// Check if the agent is connected
var constate = parent.GetConnectivityState(dev.nodeid);
if ((constate == null) || (constate.connectivity & 1)) return; // If there is no connectivity or the agent is connected, skip trying to poll power state.
// Fetch the power state
dev.amtstack.BatchEnum(null, ['CIM_ServiceAvailableToElement'], function (stack, name, responses, status) {
const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response.
if ((status != 200) || (responses['CIM_ServiceAvailableToElement'] == null) || (responses['CIM_ServiceAvailableToElement'].responses == null) || (responses['CIM_ServiceAvailableToElement'].responses.length < 1)) return; // If the polling fails, just skip it.
var powerstate = responses['CIM_ServiceAvailableToElement'].responses[0].PowerState;
if ((powerstate == 2) && (dev.aquired.majorver > 9)) {
// Device is powered on and Intel AMT 10+, poll the OS power state.
dev.amtstack.Get('IPS_PowerManagementService', function (stack, name, response, status) {
const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response.
if (status != 200) return;
// Convert the OS power state
var meshPowerState = -1;
if (response.Body.OSPowerSavingState == 2) { meshPowerState = 1; } // Fully powered (S0);
else if (response.Body.OSPowerSavingState == 3) { meshPowerState = 2; } // Modern standby (We are going to call this S1);
// Set OS power state
if (meshPowerState >= 0) { parent.SetConnectivityState(dev.meshid, dev.nodeid, Date.now(), 4, meshPowerState); }
});
} else {
// Convert the power state
// AMT power: 1 = Other, 2 = On, 3 = Sleep-Light, 4 = Sleep-Deep, 5 = Power Cycle (Off-Soft), 6 = Off-Hard, 7 = Hibernate (Off-Soft), 8 = Off-Soft, 9 = Power Cycle (Off-Hard), 10 = Master Bus Reset, 11 = Diagnostic Interrupt (NMI), 12 = Off-Soft Graceful, 13 = Off-Hard Graceful, 14 = Master Bus Reset Graceful, 15 = Power Cycle (Off- oft Graceful), 16 = Power Cycle (Off - Hard Graceful), 17 = Diagnostic Interrupt (INIT)
// Mesh power: 0 = Unknown, 1 = S0 power on, 2 = S1 Sleep, 3 = S2 Sleep, 4 = S3 Sleep, 5 = S4 Hibernate, 6 = S5 Soft-Off, 7 = Present
var meshPowerState = -1, powerConversionTable = [-1, -1, 1, 2, 3, 6, 6, 5, 6];
if (powerstate < powerConversionTable.length) { meshPowerState = powerConversionTable[powerstate]; } else { powerstate = 6; }
// Set power state
if (meshPowerState >= 0) { parent.SetConnectivityState(dev.meshid, dev.nodeid, Date.now(), 4, meshPowerState); }
}
});
}
// Perform a power action: 2 = Power up, 5 = Power cycle, 8 = Power down, 10 = Reset
function performPowerAction(nodeid, action) {
var devices = obj.amtDevices[nodeid];
if (devices == null) return;
for (var i in devices) {
var dev = devices[i];
if (dev.amtstack != null) {
// TODO: Check if the device passed initial connection
try { dev.amtstack.RequestPowerStateChange(action, performPowerActionResponse); } catch (ex) { }
}
}
}
// Response to Intel AMT power action
function performPowerActionResponse(stack, name, responses, status) {
//console.log('performPowerActionResponse', status);
}
// Attempt to sync the Intel AMT clock if needed, call func back when done. // Attempt to sync the Intel AMT clock if needed, call func back when done.
// Care should be take not to have many pending WSMAN called when performing clock sync. // Care should be take not to have many pending WSMAN called when performing clock sync.
function attemptSyncClock(dev, func) { function attemptSyncClock(dev, func) {
if (obj.amtDevices[dev.nodeid] == null) return false; // Device no longer exists, ignore this request. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
dev.clockSyncCompleted = func; dev.clockSyncCompleted = func;
dev.amtstack.AMT_TimeSynchronizationService_GetLowAccuracyTimeSynch(attemptSyncClockEx); dev.amtstack.AMT_TimeSynchronizationService_GetLowAccuracyTimeSynch(attemptSyncClockEx);
} }
@ -457,7 +516,7 @@ module.exports.CreateAmtManager = function(parent) {
// Intel AMT clock query response // Intel AMT clock query response
function attemptSyncClockEx(stack, name, response, status) { function attemptSyncClockEx(stack, name, response, status) {
const dev = stack.dev; const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
if (status != 200) { removeDevice(dev.nodeid); } if (status != 200) { removeDevice(dev.nodeid); }
// Compute how much drift between Intel AMT and our clock. // Compute how much drift between Intel AMT and our clock.
@ -475,7 +534,7 @@ module.exports.CreateAmtManager = function(parent) {
// Intel AMT clock set response // Intel AMT clock set response
function attemptSyncClockSet(stack, name, responses, status) { function attemptSyncClockSet(stack, name, responses, status) {
const dev = stack.dev; const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
if (status != 200) { removeDevice(dev.nodeid); } if (status != 200) { removeDevice(dev.nodeid); }
if (dev.clockSyncCompleted != null) { var f = dev.clockSyncCompleted; delete dev.clockSyncCompleted; f(); } if (dev.clockSyncCompleted != null) { var f = dev.clockSyncCompleted; delete dev.clockSyncCompleted; f(); }
} }
@ -494,7 +553,7 @@ module.exports.CreateAmtManager = function(parent) {
function attemptFetchNetworkResponse(stack, name, responses, status) { function attemptFetchNetworkResponse(stack, name, responses, status) {
const dev = stack.dev; const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
if (status != 200) return; if (status != 200) return;
//console.log(JSON.stringify(responses, null, 2)); //console.log(JSON.stringify(responses, null, 2));
@ -565,7 +624,7 @@ module.exports.CreateAmtManager = function(parent) {
function attemptFetchHardwareInventoryResponse(stack, name, responses, status) { function attemptFetchHardwareInventoryResponse(stack, name, responses, status) {
const dev = stack.dev; const dev = stack.dev;
if (obj.amtDevices[dev.nodeid] == null) return; // Device no longer exists, ignore this response. if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
if (status != 200) return; if (status != 200) return;
// Extract basic data // Extract basic data

3
amtscanner.js
View File

@ -179,6 +179,7 @@ module.exports.CreateAmtScanner = function (parent) {
// More than 2 minutes without a response, mark the node as unknown state // More than 2 minutes without a response, mark the node as unknown state
scaninfo.state = 0; scaninfo.state = 0;
obj.parent.ClearConnectivityState(scaninfo.nodeinfo.meshid, scaninfo.nodeinfo._id, 4); // Clear connectivity state obj.parent.ClearConnectivityState(scaninfo.nodeinfo.meshid, scaninfo.nodeinfo._id, 4); // Clear connectivity state
if (obj.parent.amtManager != null) { obj.parent.amtManager.stopAmtManagement(scaninfo.nodeinfo._id, 3, scaninfo.nodeinfo.host); }
} else if ((scaninfo.tcp == null) && ((scaninfo.state == 0) || isNaN(delta) || (delta > PeriodicScanTime))) { } else if ((scaninfo.tcp == null) && ((scaninfo.state == 0) || isNaN(delta) || (delta > PeriodicScanTime))) {
// More than 30 seconds without a response, try TCP detection // More than 30 seconds without a response, try TCP detection
obj.checkTcpPresence(host, (doc.intelamt.tls == 1) ? 16993 : 16992, scaninfo, function (tag, result, version) { obj.checkTcpPresence(host, (doc.intelamt.tls == 1) ? 16993 : 16992, scaninfo, function (tag, result, version) {
@ -189,6 +190,7 @@ module.exports.CreateAmtScanner = function (parent) {
tag.state = 1; tag.state = 1;
obj.parent.SetConnectivityState(tag.nodeinfo.meshid, tag.nodeinfo._id, tag.lastpong, 4, 7); // Report power state as "present" (7). obj.parent.SetConnectivityState(tag.nodeinfo.meshid, tag.nodeinfo._id, tag.lastpong, 4, 7); // Report power state as "present" (7).
if (version != null) { obj.changeAmtState(tag.nodeinfo._id, version, 2, tag.nodeinfo.intelamt.tls); } if (version != null) { obj.changeAmtState(tag.nodeinfo._id, version, 2, tag.nodeinfo.intelamt.tls); }
if (obj.parent.amtManager != null) { obj.parent.amtManager.startAmtManagement(tag.nodeinfo._id, 3, tag.nodeinfo.host); }
} }
}); });
} }
@ -285,6 +287,7 @@ module.exports.CreateAmtScanner = function (parent) {
scaninfo.nodeinfo.intelamt.state = provisioningState; scaninfo.nodeinfo.intelamt.state = provisioningState;
obj.parent.SetConnectivityState(scaninfo.nodeinfo.meshid, scaninfo.nodeinfo._id, scaninfo.lastpong, 4, 7); // Report power state as "present" (7). obj.parent.SetConnectivityState(scaninfo.nodeinfo.meshid, scaninfo.nodeinfo._id, scaninfo.lastpong, 4, 7); // Report power state as "present" (7).
obj.changeAmtState(scaninfo.nodeinfo._id, scaninfo.nodeinfo.intelamt.ver, provisioningState, scaninfo.nodeinfo.intelamt.tls); obj.changeAmtState(scaninfo.nodeinfo._id, scaninfo.nodeinfo.intelamt.ver, provisioningState, scaninfo.nodeinfo.intelamt.tls);
if (obj.parent.amtManager != null) { obj.parent.amtManager.startAmtManagement(scaninfo.nodeinfo._id, 3, scaninfo.nodeinfo.host); }
} }
} }
}; };

2
meshcentral.js
View File

@ -1334,7 +1334,7 @@ function CreateMeshCentralServer(config, args) {
} }
// Setup the Intel AMT manager // Setup the Intel AMT manager
if ((obj.args.amtmanager == true) || (typeof obj.args.amtmanager == 'object')) { if (obj.args.amtmanager == true) {
obj.amtManager = require('./amtmanager.js').CreateAmtManager(obj); obj.amtManager = require('./amtmanager.js').CreateAmtManager(obj);
} }

7
meshuser.js
View File

@ -886,12 +886,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
break; break;
} }
case 'amtmanager': { case 'amtmanager': {
if (parent.parent.amtManager == null) { r = 'Intel AMT Manager not active.'; break; } if (parent.parent.amtManager == null) { r = 'Intel AMT Manager not active.'; } else { r = parent.parent.amtManager.getStatusString(); }
for (var nodeid in parent.parent.amtManager.amtDevices) {
var dev = parent.parent.amtManager.amtDevices[nodeid];
r += (dev.conn + ', \"' + dev.name + '\"\r\n');
}
if (r == '') { r = 'Not current managing any devices.'; }
break; break;
} }
case 'certhashes': { case 'certhashes': {

10
mpsserver.js
View File

@ -151,7 +151,6 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
// Add this connection to the connections list // Add this connection to the connections list
if (connections == null) { obj.ciraConnections[socket.tag.nodeid] = [socket]; } else { obj.ciraConnections[socket.tag.nodeid].push(socket); } if (connections == null) { obj.ciraConnections[socket.tag.nodeid] = [socket]; } else { obj.ciraConnections[socket.tag.nodeid].push(socket); }
if ((socket.tag.connType != 0) && (socket.tag.connType != 1)) return; // If not a CIRA or Relay connection, we don't indicate a connection state change
// Update connectivity state // Update connectivity state
// Report the new state of a CIRA/Relay/LMS connection after a short delay. This is to wait for the connection to have the bounded ports setup before we advertise this new connection. // Report the new state of a CIRA/Relay/LMS connection after a short delay. This is to wait for the connection to have the bounded ports setup before we advertise this new connection.
@ -166,10 +165,10 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
} else if (setConnFunc.socket.tag.connType == 1) { } else if (setConnFunc.socket.tag.connType == 1) {
// Intel AMT Relay connection. This connection does not give any information about the remote device's power state. // Intel AMT Relay connection. This connection does not give any information about the remote device's power state.
obj.parent.SetConnectivityState(setConnFunc.socket.tag.meshid, setConnFunc.socket.tag.nodeid, setConnFunc.socket.tag.connectTime, 8, 0); // 0 = Unknown obj.parent.SetConnectivityState(setConnFunc.socket.tag.meshid, setConnFunc.socket.tag.nodeid, setConnFunc.socket.tag.connectTime, 8, 0); // 0 = Unknown
} else if (setConnFunc.socket.tag.connType == 2) {
// Intel AMT LMS connection. We don't notify of these connections except telling the Intel AMT manager about them.
// TODO: Notify AMT manager
} }
// Intel AMT LMS connection (connType == 2), we don't notify of these connections except telling the Intel AMT manager about them.
// If the AMT manager is present, start management of this device
if (obj.parent.amtManager != null) { obj.parent.amtManager.startAmtManagement(setConnFunc.socket.tag.nodeid, setConnFunc.socket.tag.connType, setConnFunc.socket); }
} }
} }
f.socket = socket; f.socket = socket;
@ -178,6 +177,9 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
// Remove a CIRA connection from the connection list // Remove a CIRA connection from the connection list
function removeCiraConnection(socket) { function removeCiraConnection(socket) {
// If the AMT manager is present, stop management of this device
if (obj.parent.amtManager != null) { obj.parent.amtManager.stopAmtManagement(socket.tag.nodeid, socket.tag.connType, socket); }
// Remove the connection from the list if present. // Remove the connection from the list if present.
const ciraArray = obj.ciraConnections[socket.tag.nodeid]; const ciraArray = obj.ciraConnections[socket.tag.nodeid];
if (ciraArray == null) return; if (ciraArray == null) return;