Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-22 21:31:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mobile app connections and removed AMT scanner limit.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2018-07-30 14:21:03 -07:00
parent 367a386984
commit a2698e4a57
4 changed files with 64 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
amtscanner.js
View File

@ -108,15 +108,59 @@ module.exports.CreateAmtScanner = function (parent) {
return ((num >> 24) & 0xFF) + '.' + ((num >> 16) & 0xFF) + '.' + ((num >> 8) & 0xFF) + '.' + (num & 0xFF);
}
// Look for all AMT computers that may be locally reachable and poll their presence
/*
// Sample we could use to optimize DNS resolving, may not be needed at all.
obj.BatchResolvePendingMax = 1;
obj.BatchResolvePendingCount = 0;
obj.BatchResolveResults = {};
obj.BatchResolve = function (hostname) {
var r = null;
hostname = hostname.toLowerCase();
if ((hostname == '127.0.0.1') || (hostname == '::1') || (hostname == 'localhost')) return null; // Don't scan localhost
if (obj.net.isIP(hostname) > 0) return hostname; // This is an IP address, already resolved.
if (obj.BatchResolveResults[hostname]) {
if ((obj.BatchResolveResults[hostname].f == 0) || (obj.BatchResolveResults[hostname].f == -1)) {
// Already resolving this one or an error occured during resolve, re-check every 30 minutes.
if (((Date.now() - obj.BatchResolveResults[hostname].t) < 1800000) || (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax)) { return null; }
} else {
// We are to try to re-resolve every 30 minutes
if (((Date.now() - obj.BatchResolveResults[hostname].t) < 1800000) || (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax)) { return obj.BatchResolveResults[hostname].a; }
r = obj.BatchResolveResults[hostname].a;
}
}
if (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax) return null; // Don't resolve more than 10 names at any given time.
console.log('Resolve: ' + hostname);
obj.BatchResolvePendingCount++;
obj.BatchResolveResults[hostname] = { f: 0, t: Date.now() }; // Mark are resolving
obj.dns.lookup(hostname, (err, address, family) => {
obj.BatchResolvePendingCount--;
if (err != null) {
console.log('Resolve error: ' + hostname);
obj.BatchResolveResults[hostname] = { f: -1 }; // Mark this as a resolve error
} else {
console.log('Resolved: %s = %j, family: IPv%s', hostname, address, family);
obj.BatchResolveResults[hostname] = { a: address, f: family, t: Date.now() };
}
});
return r;
}
*/
obj.ResolveName = function (hostname, func) {
if ((hostname == '127.0.0.1') || (hostname == '::1') || (hostname == 'localhost')) { func(hostname, null); } // Don't scan localhost
if (obj.net.isIP(hostname) > 0) { func(hostname, hostname); return; } // This is an IP address, already resolved.
obj.dns.lookup(hostname, function (err, address, family) { if (err == null) { func(hostname, address); } else { func(hostname, null); } });
}
// Look for all Intel AMT computers that may be locally reachable and poll their presence
obj.performScan = function () {
if (obj.active == false) { return false; }
obj.parent.db.getLocalAmtNodes(10, function (err, docs) { // TODO: handler more than 10 computer scan at the same time. DNS resolved may need to be a seperate module.
obj.parent.db.getLocalAmtNodes(function (err, docs) { // TODO: handler more than 10 computer scan at the same time. DNS resolved may need to be a seperate module.
for (var i in obj.scanTable) { obj.scanTable[i].present = false; }
if (err == null && docs.length > 0) {
for (var i in docs) {
var doc = docs[i], host = doc.host.toLowerCase();
if ((host != '127.0.0.1') && (host != '::1') && (host != 'localhost')) { // Don't scan localhost
if ((host != '127.0.0.1') && (host != '::1') && (host.toLowerCase() != 'localhost')) {
var scaninfo = obj.scanTable[doc._id];
if (scaninfo == undefined) {
var tag = obj.nextTag++;
@ -139,13 +183,13 @@ module.exports.CreateAmtScanner = function (parent) {
tag.state = 1;
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); }
}
}
});
}
}
// Start scanning this node
scaninfo.lastping = Date.now();
obj.checkAmtPresence(doc.host, scaninfo.tag);
obj.checkAmtPresence(host, scaninfo.tag);
}
}
}
@ -161,7 +205,11 @@ module.exports.CreateAmtScanner = function (parent) {
}
// Check the presense of a specific Intel AMT computer using RMCP
obj.checkAmtPresence = function (host, tag) {
obj.checkAmtPresence = function (host, tag) { obj.ResolveName(host, function (hostname, ip) { obj.checkAmtPresenceEx(ip, tag); }); }
// Check the presense of a specific Intel AMT computer using RMCP
obj.checkAmtPresenceEx = function (host, tag) {
if (host == null) return;
var serverid = Math.floor(tag / 255);
var servertag = (tag % 255);
var packet = obj.buildRmcpPing(servertag);
@ -300,8 +348,12 @@ module.exports.CreateAmtScanner = function (parent) {
return false;
}
// Check the presense of a specific Intel AMT computer using RMCP
obj.checkTcpPresence = function (host, port, scaninfo, func) { obj.ResolveName(host, function (hostname, ip) { obj.checkTcpPresenceEx(ip, port, scaninfo, func); }); }
// Check that we can connect TCP to a given port
obj.checkTcpPresence = function (host, port, scaninfo, func) {
obj.checkTcpPresenceEx = function (host, port, scaninfo, func) {
if (host == null) return;
//console.log('checkTcpPresence(' + host + ':' + port + ')');
try {
var client;

2
db.js
View File

@ -109,7 +109,7 @@ module.exports.CreateDB = function (parent) {
obj.dispose = function () { for (var x in obj) { if (obj[x].close) { obj[x].close(); } delete obj[x]; } }
obj.clearOldEntries = function (type, days, domain) { var cutoff = Date.now() - (1000 * 60 * 60 * 24 * days); obj.file.remove({ type: type, time: { $lt: cutoff } }, { multi: true }); }
obj.getPowerTimeline = function (nodeid, func) { if (obj.databaseType == 1) { obj.file.find({ type: 'power', node: { $in: ['*', nodeid] } }).sort({ time: 1 }).exec(func); } else { obj.file.find({ type: 'power', node: { $in: ['*', nodeid] } }).sort({ time: 1 }, func); } }
obj.getLocalAmtNodes = function (limit, func) { obj.file.find({ type: 'node', host: { $exists: true, $ne: null }, intelamt: { $exists: true } }).limit(limit).exec(func); }
obj.getLocalAmtNodes = function (func) { obj.file.find({ type: 'node', host: { $exists: true, $ne: null }, intelamt: { $exists: true } }, func); }
obj.getAmtUuidNode = function (meshid, uuid, func) { obj.file.find({ type: 'node', meshid: meshid, 'intelamt.uuid': uuid }, func); }
// This is used to rate limit a number of operation per day. Returns a startValue each new days, but you can substract it and save the value in the db.

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "0.1.9-d",
"version": "0.1.9-e",
"keywords": [
"Remote Management",
"Intel AMT",

6
public/scripts/agent-redir-ws-0.1.0.js
View File

@ -70,7 +70,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
}
}
obj.sendCtrlMsg = function (x) { if (obj.ctrlMsgAllowed == true) { if (args && args.redirtrace) { console.log('RedirSend', typeof x, x); } try { obj.socket.send(x); } catch (ex) { } } }
obj.sendCtrlMsg = function (x) { if (obj.ctrlMsgAllowed == true) { if ((typeof args != 'undefined') && args.redirtrace) { console.log('RedirSend', typeof x, x); } try { obj.socket.send(x); } catch (ex) { } } }
function performWebRtcSwitch() {
if ((obj.webSwitchOk == true) && (obj.webRtcActive == true)) {
@ -162,7 +162,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
}
else if (typeof data !== 'string') return;
//console.log("xxOnSocketData", rstr2hex(data));
if (args && args.redirtrace) { console.log("RedirRecv", typeof data, data.length, data); }
if ((typeof args != 'undefined') && args.redirtrace) { console.log("RedirRecv", typeof data, data.length, data); }
return obj.m.ProcessData(data);
}
@ -174,7 +174,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
obj.send = function (x) {
//obj.debug("Agent Redir Send(" + obj.webRtcActive + ", " + x.length + "): " + rstr2hex(x));
//console.log("Agent Redir Send(" + obj.webRtcActive + ", " + x.length + "): " + ((typeof x == 'string')?x:rstr2hex(x)));
if (args && args.redirtrace) { console.log('RedirSend', typeof x, x.length, x); }
if ((typeof args != 'undefined') && args.redirtrace) { console.log('RedirSend', typeof x, x.length, x); }
try {
if (obj.socket != null && obj.socket.readyState == WebSocket.OPEN) {
if (typeof x == 'string') {