@cryptotaxi247 / MeshCentral / commits / 2750b6e3

Fixed ScanAmt in agent and added AmtScan to MeshCmd

Ylian Saint-Hilaire committed Oct 1, 2019 at 16:53 UTC 2750b6e39f60671bbb1336a7079c6fad33040ad3

9 files changed +73 -10

MeshCentralServer.njsproj

@@ -137,6 +137,7 @@

137 <Compile Include="webauthn.js" />

138 <Compile Include="webserver.js" />

139 <Compile Include="winservice.js" />

140 + <Content Include="agents\codesign.cer" />

141 <Content Include="agents\compressModules.bat" />

142 <Content Include="agents\MeshAgentOSXPackager.zip" />

143 <Content Include="agents\meshagent_arm" />

agents/MeshCmd-signed.exe

Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ

agents/MeshCmd64-signed.exe

Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ

agents/meshcmd.js

+31 -2

@@ -114,7 +114,7 @@ function run(argv) {

114 //console.log('addedModules = ' + JSON.stringify(addedModules));

115 var actionpath = 'meshaction.txt';

116 if (args.actionfile != null) { actionpath = args.actionfile; }

117 - var actions = ['HELP', 'ROUTE', 'MICROLMS', 'AMTPOWER', 'AMTFEATURES', 'AMTNETWORK', 'AMTLOADWEBAPP', 'AMTLOADSMALLWEBAPP', 'AMTLOADLARGEWEBAPP', 'AMTCLEARWEBAPP', 'AMTSTORAGESTATE', 'AMTINFO', 'AMTINFODEBUG', 'AMTVERSIONS', 'AMTHASHES', 'AMTSAVESTATE', 'AMTSCRIPT', 'AMTUUID', 'AMTCCM', 'AMTACM', 'AMTDEACTIVATE', 'AMTACMDEACTIVATE', 'SMBIOS', 'RAWSMBIOS', 'MESHCOMMANDER', 'AMTAUDITLOG', 'AMTEVENTLOG', 'AMTPRESENCE'];

117 + var actions = ['HELP', 'ROUTE', 'MICROLMS', 'AMTSCAN', 'AMTPOWER', 'AMTFEATURES', 'AMTNETWORK', 'AMTLOADWEBAPP', 'AMTLOADSMALLWEBAPP', 'AMTLOADLARGEWEBAPP', 'AMTCLEARWEBAPP', 'AMTSTORAGESTATE', 'AMTINFO', 'AMTINFODEBUG', 'AMTVERSIONS', 'AMTHASHES', 'AMTSAVESTATE', 'AMTSCRIPT', 'AMTUUID', 'AMTCCM', 'AMTACM', 'AMTDEACTIVATE', 'AMTACMDEACTIVATE', 'SMBIOS', 'RAWSMBIOS', 'MESHCOMMANDER', 'AMTAUDITLOG', 'AMTEVENTLOG', 'AMTPRESENCE'];

118

119 // Load the action file

120 var actionfile = null;

@@ -151,6 +151,7 @@ function run(argv) {

151 if ((typeof args.floppy) == 'string') { settings.floppy = args.floppy; }

152 if ((typeof args.cdrom) == 'string') { settings.cdrom = args.cdrom; }

153 if ((typeof args.tag) == 'string') { settings.tag = args.tag; }

154 + if ((typeof args.scan) == 'string') { settings.scan = args.scan; }

155 if ((typeof args.timeout) == 'string') { settings.timeout = parseInt(args.timeout); }

156 if (args.debug === true) { settings.debuglevel = 1; }

157 if (args.debug) { try { waitForDebugger(); } catch (e) { } }

@@ -194,6 +195,7 @@ function run(argv) {

195 console.log(' AmtIDER - Mount local disk image to remote computer.');

196 console.log(' AmtFeatures - Intel AMT features & user consent.');

197 console.log(' AmtNetwork - Intel AMT network interface settings.');

198 + console.log(' AmtScan - Search local network for Intel AMT devices.');

199 console.log('\r\nHelp on a specific action using:\r\n');

200 console.log(' meshcmd help [action]');

201 exit(1); return;

@@ -373,6 +375,10 @@ function run(argv) {

375 console.log(' --floppy [file] Specifies .img file to be mounted as a flppy disk.');

376 console.log(' --cdrom [file] Specifies .img file to be mounted as a CDROM disk.');

377 console.log(' --timeout [seconds] Optional, disconnect after number of seconds without disk read.');

378 + } else if (action == 'amtscan') {

379 + console.log('AmtSCAN will look for Intel AMT device on the network. Example usage:\r\n\r\n meshcmd amtscan --scan 192.168.1.0/24');

380 + console.log('\r\Required arguments:\r\n');

381 + console.log(' --scan [ip range] The IP address range to perform the scan on.');

382 } else {

383 actions.shift();

384 console.log('Invalid action, usage:\r\n\r\n meshcmd help [action]\r\n\r\nValid actions are: ' + actions.join(', ') + '.');

@@ -629,6 +635,29 @@ function run(argv) {

635 startMeshCommander();

636 //} else if (settings.action == 'amtdisable') { // Disable AMT Network Interface

637 // amtDisable();

638 + } else if (settings.action == 'amtscan') {

639 + // Scan the network for Intel AMT devices

640 + if ((settings.scan == null) || (typeof settings.scan != 'string') || (settings.scan == '')) { console.log('No or invalid \"scan\" specified, use --scan [ip range].'); exit(1); return; }

641 + console.log('Scanning: ' + settings.scan + '...');

642 + var AMTScannerModule = require('amt-scanner');

643 + var amtscanner = new AMTScannerModule(), r = '';

644 + amtscanner.scan(settings.scan, 2000, function (data) {

645 + if (data.length > 0) {

646 + r = '', pstates = ['NotActivated', 'InActivation', 'Activated'];

647 + for (var i in data) {

648 + var x = data[i];

649 + if (r != '') { r += '\r\n'; }

650 + r += x.address + ' - Intel AMT v' + x.majorVersion + '.' + x.minorVersion;

651 + if (x.provisioningState < 3) { r += (', ' + pstates[x.provisioningState]); }

652 + if (x.provisioningState == 2) { r += (', ' + x.openPorts.join(', ')); }

653 + r += '.';

654 + }

655 + } else {

656 + r = 'No Intel AMT found.';

657 + }

658 + console.log(r);

659 + exit(1);

660 + });

661 } else if (settings.action == 'amtauditlog') { // Read the Intel AMT audit log

662 if (settings.hostname != null) {

663 if ((settings.password == null) || (typeof settings.password != 'string') || (settings.password == '')) { console.log('No or invalid \"password\" specified, use --password [password].'); exit(1); return; }

@@ -1146,7 +1175,7 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) {

1175 var connection = http.request(options);

1176 connection.on('upgrade', function (response, socket) {

1177 settings.xxsocket = socket;

1149 - console.log('Connected, requesting activation...');

1178 + if (settings.action == 'amtdiscover') { console.log('Connected, performing discovery...'); } else { console.log('Connected, requesting activation...'); }

1179 socket.on('end', function () { console.log('Connection closed'); exit(0); });

1180 socket.on('error', function () { console.log('Connection error'); exit(100); });

1181 socket.on('data', function (data) {

agents/meshcmd.min.js

+31 -2

@@ -114,7 +114,7 @@ function run(argv) {

114 //console.log('addedModules = ' + JSON.stringify(addedModules));

115 var actionpath = 'meshaction.txt';

116 if (args.actionfile != null) { actionpath = args.actionfile; }

118

119 // Load the action file

120 var actionfile = null;

@@ -151,6 +151,7 @@ function run(argv) {

151 if ((typeof args.floppy) == 'string') { settings.floppy = args.floppy; }

152 if ((typeof args.cdrom) == 'string') { settings.cdrom = args.cdrom; }

153 if ((typeof args.tag) == 'string') { settings.tag = args.tag; }

154 + if ((typeof args.scan) == 'string') { settings.scan = args.scan; }

155 if ((typeof args.timeout) == 'string') { settings.timeout = parseInt(args.timeout); }

156 if (args.debug === true) { settings.debuglevel = 1; }

157 if (args.debug) { try { waitForDebugger(); } catch (e) { } }

@@ -194,6 +195,7 @@ function run(argv) {

195 console.log(' AmtIDER - Mount local disk image to remote computer.');

196 console.log(' AmtFeatures - Intel AMT features & user consent.');

197 console.log(' AmtNetwork - Intel AMT network interface settings.');

198 + console.log(' AmtScan - Search local network for Intel AMT devices.');

199 console.log('\r\nHelp on a specific action using:\r\n');

200 console.log(' meshcmd help [action]');

201 exit(1); return;

@@ -373,6 +375,10 @@ function run(argv) {

375 console.log(' --floppy [file] Specifies .img file to be mounted as a flppy disk.');

376 console.log(' --cdrom [file] Specifies .img file to be mounted as a CDROM disk.');

377 console.log(' --timeout [seconds] Optional, disconnect after number of seconds without disk read.');

378 + } else if (action == 'amtscan') {

379 + console.log('AmtSCAN will look for Intel AMT device on the network. Example usage:\r\n\r\n meshcmd amtscan --scan 192.168.1.0/24');

380 + console.log('\r\Required arguments:\r\n');

381 + console.log(' --scan [ip range] The IP address range to perform the scan on.');

382 } else {

383 actions.shift();

384 console.log('Invalid action, usage:\r\n\r\n meshcmd help [action]\r\n\r\nValid actions are: ' + actions.join(', ') + '.');

@@ -629,6 +635,29 @@ function run(argv) {

635 startMeshCommander();

636 //} else if (settings.action == 'amtdisable') { // Disable AMT Network Interface

637 // amtDisable();

638 + } else if (settings.action == 'amtscan') {

639 + // Scan the network for Intel AMT devices

640 + if ((settings.scan == null) || (typeof settings.scan != 'string') || (settings.scan == '')) { console.log('No or invalid \"scan\" specified, use --scan [ip range].'); exit(1); return; }

641 + console.log('Scanning: ' + settings.scan + '...');

642 + var AMTScannerModule = require('amt-scanner');

643 + var amtscanner = new AMTScannerModule(), r = '';

644 + amtscanner.scan(settings.scan, 2000, function (data) {

645 + if (data.length > 0) {

646 + r = '', pstates = ['NotActivated', 'InActivation', 'Activated'];

647 + for (var i in data) {

648 + var x = data[i];

649 + if (r != '') { r += '\r\n'; }

650 + r += x.address + ' - Intel AMT v' + x.majorVersion + '.' + x.minorVersion;

651 + if (x.provisioningState < 3) { r += (', ' + pstates[x.provisioningState]); }

652 + if (x.provisioningState == 2) { r += (', ' + x.openPorts.join(', ')); }

653 + r += '.';

654 + }

655 + } else {

656 + r = 'No Intel AMT found.';

657 + }

658 + console.log(r);

659 + exit(1);

660 + });

661 } else if (settings.action == 'amtauditlog') { // Read the Intel AMT audit log

662 if (settings.hostname != null) {

@@ -1146,7 +1175,7 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) {

1175 var connection = http.request(options);

1176 connection.on('upgrade', function (response, socket) {

1177 settings.xxsocket = socket;

1149 - console.log('Connected, requesting activation...');

1178 + if (settings.action == 'amtdiscover') { console.log('Connected, performing discovery...'); } else { console.log('Connected, requesting activation...'); }

1179 socket.on('end', function () { console.log('Connection closed'); exit(0); });

1180 socket.on('error', function () { console.log('Connection error'); exit(100); });

1181 socket.on('data', function (data) {

agents/modules_meshcmd/amt-scanner.js

+7 -3

@@ -64,7 +64,7 @@ function AMTScanner() {

64 if (masknum <= 16 || masknum > 32) return null;

65 masknum = 32 - masknum;

66 for (var i = 0; i < masknum; i++) { mask = (mask << 1); mask++; }

67 - return { min: ip & (0xFFFFFFFF - mask), max: (ip & (0xFFFFFFFF - mask)) + mask };

67 + return { min: (ip & (0xFFFFFFFF - mask))+1, max: (ip & (0xFFFFFFFF - mask)) + mask -1 };//remove network and broadcast address to avoid irrecoverable socket error

68 }

69 x = this.parseIpv4Addr(range);

70 if (x == null) return null;

@@ -83,7 +83,7 @@ function AMTScanner() {

83 return ((num >> 24) & 0xFF) + '.' + ((num >> 16) & 0xFF) + '.' + ((num >> 8) & 0xFF) + '.' + (num & 0xFF);

84 }

86 - this.scan = function (rangestr, timeout) {

86 + this.scan = function (rangestr, timeout, callback) {

87 var iprange = this.parseIPv4Range(rangestr);

88 var rmcp = this.buildRmcpPing(0);

89 var server = this.dgram.createSocket({ type: 'udp4' });

@@ -91,11 +91,15 @@ function AMTScanner() {

91 server.scanResults = [];

92 server.on('error', function (err) { console.log('Error:' + err); });

93 server.on('message', function (msg, rinfo) { if (rinfo.size > 4) { this.parent.parseRmcpPacket(this, msg, rinfo, function (s, res) { s.scanResults.push(res); }) }; });

94 - server.on('listening', function () { for (var i = iprange.min; i <= iprange.max; i++) { server.send(rmcp, 623, server.parent.IPv4NumToStr(i)); } });

94 + server.on('listening', function () { for (var i = iprange.min; i <= iprange.max; i++) {

95 + server.send(rmcp, 623, server.parent.IPv4NumToStr(i)); } });

96 server.bind({ address: '0.0.0.0', port: 0, exclusive: true });

97 var tmout = setTimeout(function cb() {

98 //console.log("Server closed");

99 server.close();

100 + if (callback) {

101 + callback(server.scanResults);

102 + }

103 server.parent.emit('found', server.scanResults);

104 delete server;

105 }, timeout);

agents/modules_meshcmd_min/amt-scanner.min.js

+1 -1

@@ -1 +1 @@

1 -function AMTScanner(){var a=require("events").inherits(this);a.createEvent("found");this.dgram=require("dgram");this.buildRmcpPing=function(c){var b=Buffer.from("06000006000011BE80000000","hex");b[9]=c;return b};this.parseRmcpPacket=function(h,b,g,d){if(b==null||b.length<20){return}var f={};if(((b[12]==0)||(b[13]!=0)||(b[14]!=1)||(b[15]!=87))&&(b[21]&32)){f.servertag=b[9];f.minorVersion=b[18]&15;f.majorVersion=(b[18]>>4)&15;f.provisioningState=b[19]&3;var e=(b[16]*256)+b[17];var c=((b[19]&4)!=0)?true:false;f.openPorts=[e];f.address=g.address;if(c==true){f.openPorts=[16992,16993]}if(d!==undefined){d(h,f)}}};this.parseIPv4Range=function(f){if(f==undefined||f==null){return null}var g=f.split("-");if(g.length==2){return{min:this.parseIpv4Addr(g[0]),max:this.parseIpv4Addr(g[1])}}g=f.split("/");if(g.length==2){var c=this.parseIpv4Addr(g[0]),e=parseInt(g[1]),d=0;if(e<=16||e>32){return null}e=32-e;for(var b=0;b<e;b++){d=(d<<1);d++}return{min:c&(4294967295-d),max:(c&(4294967295-d))+d}}g=this.parseIpv4Addr(f);if(g==null){return null}return{min:g,max:g}};this.parseIpv4Addr=function(b){var c=b.split(".");if(c.length==4){return(parseInt(c[0])<<24)+(parseInt(c[1])<<16)+(parseInt(c[2])<<8)+(parseInt(c[3])<<0)}return null};this.IPv4NumToStr=function(b){return((b>>24)&255)+"."+((b>>16)&255)+"."+((b>>8)&255)+"."+(b&255)};this.scan=function(d,g){var c=this.parseIPv4Range(d);var e=this.buildRmcpPing(0);var f=this.dgram.createSocket({type:"udp4"});f.parent=this;f.scanResults=[];f.on("error",function(i){console.log("Error:"+i)});f.on("message",function(i,j){if(j.size>4){this.parent.parseRmcpPacket(this,i,j,function(l,k){l.scanResults.push(k)})}});f.on("listening",function(){for(var j=c.min;j<=c.max;j++){f.send(e,623,f.parent.IPv4NumToStr(j))}});f.bind({address:"0.0.0.0",port:0,exclusive:true});var h=setTimeout(function b(){f.close();f.parent.emit("found",f.scanResults);delete f},g)}}module.exports=AMTScanner;

\ No newline at end of file

1 +function AMTScanner(){var a=require("events").inherits(this);a.createEvent("found");this.dgram=require("dgram");this.buildRmcpPing=function(c){var b=Buffer.from("06000006000011BE80000000","hex");b[9]=c;return b};this.parseRmcpPacket=function(h,b,g,d){if(b==null||b.length<20){return}var f={};if(((b[12]==0)||(b[13]!=0)||(b[14]!=1)||(b[15]!=87))&&(b[21]&32)){f.servertag=b[9];f.minorVersion=b[18]&15;f.majorVersion=(b[18]>>4)&15;f.provisioningState=b[19]&3;var e=(b[16]*256)+b[17];var c=((b[19]&4)!=0)?true:false;f.openPorts=[e];f.address=g.address;if(c==true){f.openPorts=[16992,16993]}if(d!==undefined){d(h,f)}}};this.parseIPv4Range=function(f){if(f==undefined||f==null){return null}var g=f.split("-");if(g.length==2){return{min:this.parseIpv4Addr(g[0]),max:this.parseIpv4Addr(g[1])}}g=f.split("/");if(g.length==2){var c=this.parseIpv4Addr(g[0]),e=parseInt(g[1]),d=0;if(e<=16||e>32){return null}e=32-e;for(var b=0;b<e;b++){d=(d<<1);d++}return{min:(c&(4294967295-d))+1,max:(c&(4294967295-d))+d-1}}g=this.parseIpv4Addr(f);if(g==null){return null}return{min:g,max:g}};this.parseIpv4Addr=function(b){var c=b.split(".");if(c.length==4){return(parseInt(c[0])<<24)+(parseInt(c[1])<<16)+(parseInt(c[2])<<8)+(parseInt(c[3])<<0)}return null};this.IPv4NumToStr=function(b){return((b>>24)&255)+"."+((b>>16)&255)+"."+((b>>8)&255)+"."+(b&255)};this.scan=function(e,h,b){var d=this.parseIPv4Range(e);var f=this.buildRmcpPing(0);var g=this.dgram.createSocket({type:"udp4"});g.parent=this;g.scanResults=[];g.on("error",function(j){console.log("Error:"+j)});g.on("message",function(j,k){if(k.size>4){this.parent.parseRmcpPacket(this,j,k,function(m,l){m.scanResults.push(l)})}});g.on("listening",function(){for(var j=d.min;j<=d.max;j++){g.send(f,623,g.parent.IPv4NumToStr(j))}});g.bind({address:"0.0.0.0",port:0,exclusive:true});var i=setTimeout(function c(){g.close();if(b){b(g.scanResults)}g.parent.emit("found",g.scanResults);delete g},h)}}module.exports=AMTScanner;

\ No newline at end of file

agents/modules_meshcore_min/amt-scanner.min.js

+1 -1

@@ -1 +1 @@

\ No newline at end of file

package.json

+1 -1

@@ -1,6 +1,6 @@

1 {

2 "name": "meshcentral",

3 - "version": "0.4.1-o",

3 + "version": "0.4.1-p",

4 "keywords": [

5 "Remote Management",

6 "Intel AMT",