Fixed mobile app connections and removed AMT scanner limit.
Ylian Saint-Hilaire committed
Jul 30, 2018 at 14:21 UTC
a2698e4a57a906e64f5ec54b4f5b9dcb0d1bb6bd
4 files changed
+64
-12
amtscanner.js
+59
-7
@@ -108,15 +108,59 @@ module.exports.CreateAmtScanner = function (parent) {
108
return ((num >> 24) & 0xFF) + '.' + ((num >> 16) & 0xFF) + '.' + ((num >> 8) & 0xFF) + '.' + (num & 0xFF);
109
}
110
111
- // Look for all AMT computers that may be locally reachable and poll their presence
111
+ /*
112
+ // Sample we could use to optimize DNS resolving, may not be needed at all.
113
+ obj.BatchResolvePendingMax = 1;
114
+ obj.BatchResolvePendingCount = 0;
115
+ obj.BatchResolveResults = {};
116
+ obj.BatchResolve = function (hostname) {
117
+ var r = null;
118
+ hostname = hostname.toLowerCase();
119
+ if ((hostname == '127.0.0.1') || (hostname == '::1') || (hostname == 'localhost')) return null; // Don't scan localhost
120
+ if (obj.net.isIP(hostname) > 0) return hostname; // This is an IP address, already resolved.
121
+ if (obj.BatchResolveResults[hostname]) {
122
+ if ((obj.BatchResolveResults[hostname].f == 0) || (obj.BatchResolveResults[hostname].f == -1)) {
123
+ // Already resolving this one or an error occured during resolve, re-check every 30 minutes.
124
+ if (((Date.now() - obj.BatchResolveResults[hostname].t) < 1800000) || (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax)) { return null; }
125
+ } else {
126
+ // We are to try to re-resolve every 30 minutes
127
+ if (((Date.now() - obj.BatchResolveResults[hostname].t) < 1800000) || (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax)) { return obj.BatchResolveResults[hostname].a; }
128
+ r = obj.BatchResolveResults[hostname].a;
129
+ }
130
+ }
131
+ if (obj.BatchResolvePendingCount >= obj.BatchResolvePendingMax) return null; // Don't resolve more than 10 names at any given time.
132
+ console.log('Resolve: ' + hostname);
133
+ obj.BatchResolvePendingCount++;
134
+ obj.BatchResolveResults[hostname] = { f: 0, t: Date.now() }; // Mark are resolving
135
+ obj.dns.lookup(hostname, (err, address, family) => {
136
+ obj.BatchResolvePendingCount--;
137
+ if (err != null) {
138
+ console.log('Resolve error: ' + hostname);
139
+ obj.BatchResolveResults[hostname] = { f: -1 }; // Mark this as a resolve error
140
+ } else {
141
+ console.log('Resolved: %s = %j, family: IPv%s', hostname, address, family);
142
+ obj.BatchResolveResults[hostname] = { a: address, f: family, t: Date.now() };
143
+ }
144
+ });
145
+ return r;
146
+ }
147
+ */
148
+
149
+ obj.ResolveName = function (hostname, func) {
150
+ if ((hostname == '127.0.0.1') || (hostname == '::1') || (hostname == 'localhost')) { func(hostname, null); } // Don't scan localhost
151
+ if (obj.net.isIP(hostname) > 0) { func(hostname, hostname); return; } // This is an IP address, already resolved.
152
+ obj.dns.lookup(hostname, function (err, address, family) { if (err == null) { func(hostname, address); } else { func(hostname, null); } });
153
+ }
154
+
155
+ // Look for all Intel AMT computers that may be locally reachable and poll their presence
156
obj.performScan = function () {
157
if (obj.active == false) { return false; }
114
- 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.
158
+ 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.
159
for (var i in obj.scanTable) { obj.scanTable[i].present = false; }
160
if (err == null && docs.length > 0) {
161
for (var i in docs) {
162
var doc = docs[i], host = doc.host.toLowerCase();
119
- if ((host != '127.0.0.1') && (host != '::1') && (host != 'localhost')) { // Don't scan localhost
163
+ if ((host != '127.0.0.1') && (host != '::1') && (host.toLowerCase() != 'localhost')) {
164
var scaninfo = obj.scanTable[doc._id];
165
if (scaninfo == undefined) {
166
var tag = obj.nextTag++;
@@ -139,13 +183,13 @@ module.exports.CreateAmtScanner = function (parent) {
183
tag.state = 1;
184
obj.parent.SetConnectivityState(tag.nodeinfo.meshid, tag.nodeinfo._id, tag.lastpong, 4, 7); // Report power state as "present" (7).
185
if (version != null) { obj.changeAmtState(tag.nodeinfo._id, version, 2, tag.nodeinfo.intelamt.tls); }
142
- }
186
+ }
187
});
188
}
189
}
190
// Start scanning this node
191
scaninfo.lastping = Date.now();
148
- obj.checkAmtPresence(doc.host, scaninfo.tag);
192
+ obj.checkAmtPresence(host, scaninfo.tag);
193
}
194
}
195
}
@@ -161,7 +205,11 @@ module.exports.CreateAmtScanner = function (parent) {
205
}
206
207
// Check the presense of a specific Intel AMT computer using RMCP
164
- obj.checkAmtPresence = function (host, tag) {
208
+ obj.checkAmtPresence = function (host, tag) { obj.ResolveName(host, function (hostname, ip) { obj.checkAmtPresenceEx(ip, tag); }); }
209
+
210
+ // Check the presense of a specific Intel AMT computer using RMCP
211
+ obj.checkAmtPresenceEx = function (host, tag) {
212
+ if (host == null) return;
213
var serverid = Math.floor(tag / 255);
214
var servertag = (tag % 255);
215
var packet = obj.buildRmcpPing(servertag);
@@ -300,8 +348,12 @@ module.exports.CreateAmtScanner = function (parent) {
348
return false;
349
}
350
351
+ // Check the presense of a specific Intel AMT computer using RMCP
352
+ obj.checkTcpPresence = function (host, port, scaninfo, func) { obj.ResolveName(host, function (hostname, ip) { obj.checkTcpPresenceEx(ip, port, scaninfo, func); }); }
353
+
354
// Check that we can connect TCP to a given port
304
- obj.checkTcpPresence = function (host, port, scaninfo, func) {
355
+ obj.checkTcpPresenceEx = function (host, port, scaninfo, func) {
356
+ if (host == null) return;
357
//console.log('checkTcpPresence(' + host + ':' + port + ')');
358
try {
359
var client;
db.js
+1
-1
@@ -109,7 +109,7 @@ module.exports.CreateDB = function (parent) {
109
obj.dispose = function () { for (var x in obj) { if (obj[x].close) { obj[x].close(); } delete obj[x]; } }
110
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 }); }
111
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); } }
112
- obj.getLocalAmtNodes = function (limit, func) { obj.file.find({ type: 'node', host: { $exists: true, $ne: null }, intelamt: { $exists: true } }).limit(limit).exec(func); }
112
+ obj.getLocalAmtNodes = function (func) { obj.file.find({ type: 'node', host: { $exists: true, $ne: null }, intelamt: { $exists: true } }, func); }
113
obj.getAmtUuidNode = function (meshid, uuid, func) { obj.file.find({ type: 'node', meshid: meshid, 'intelamt.uuid': uuid }, func); }
114
115
// 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.
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.9-d",
3
+ "version": "0.1.9-e",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
public/scripts/agent-redir-ws-0.1.0.js
+3
-3
@@ -70,7 +70,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
70
}
71
}
72
73
- 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) { } } }
73
+ 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) { } } }
74
75
function performWebRtcSwitch() {
76
if ((obj.webSwitchOk == true) && (obj.webRtcActive == true)) {
@@ -162,7 +162,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
162
}
163
else if (typeof data !== 'string') return;
164
//console.log("xxOnSocketData", rstr2hex(data));
165
- if (args && args.redirtrace) { console.log("RedirRecv", typeof data, data.length, data); }
165
+ if ((typeof args != 'undefined') && args.redirtrace) { console.log("RedirRecv", typeof data, data.length, data); }
166
return obj.m.ProcessData(data);
167
}
168
@@ -174,7 +174,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
174
obj.send = function (x) {
175
//obj.debug("Agent Redir Send(" + obj.webRtcActive + ", " + x.length + "): " + rstr2hex(x));
176
//console.log("Agent Redir Send(" + obj.webRtcActive + ", " + x.length + "): " + ((typeof x == 'string')?x:rstr2hex(x)));
177
- if (args && args.redirtrace) { console.log('RedirSend', typeof x, x.length, x); }
177
+ if ((typeof args != 'undefined') && args.redirtrace) { console.log('RedirSend', typeof x, x.length, x); }
178
try {
179
if (obj.socket != null && obj.socket.readyState == WebSocket.OPEN) {
180
if (typeof x == 'string') {