@cryptotaxi247 / MeshCentral / commits / 0d2efd47

MeshCMD fixes.

Ylian Saint-Hilaire committed Jun 21, 2019 at 17:42 UTC 0d2efd47ea117c5e47a772fff17eaec8155af020

6 files changed +21 -27

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

+7 -10

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

112 if ((typeof args.remotenodeid) == 'string') { settings.remotenodeid = args.remotenodeid; }

113 if ((typeof args.username) == 'string') { settings.username = args.username; }

114 if ((typeof args.password) == 'string') { settings.password = args.password; }

115 - if ((typeof args.wss) == 'string') { settings.wss = args.wss; }

115 + if ((typeof args.url) == 'string') { settings.url = args.url; }

116 if ((typeof args.profile) == 'string') { settings.profile = args.profile; }

117 if ((typeof args.type) == 'string') { settings.type = args.type; }

118 if ((typeof args.user) == 'string') { settings.username = args.user; }

@@ -205,10 +205,10 @@ function run(argv) {

205 } else if (action == 'amtccm') {

206 console.log('AmtCCM will attempt to activate Intel AMT on this computer into client control mode (CCM). The command must be run on a computer with Intel AMT, must run as administrator and the Intel management driver must be installed. Intel AMT must be in "pre-provisioning" state for this command to work and a administrator password must be provided. Example usage:\r\n\r\n meshcmd amtccm --pass mypassword');

207 } else if (action == 'amtacm') {

208 - console.log('AmtACM will attempt to activate Intel AMT on this computer into admin control mode (ACM). The command must be run on a computer with Intel AMT, must run as administrator and the Intel management driver must be installed. Intel AMT must be in "pre-provisioning" state for this command to work and a administrator password and provisioning certificate must be provided via RCS. Example usage:\r\n\r\n meshcmd amtacm --wss servername:port');

208 + console.log('AmtACM will attempt to activate Intel AMT on this computer into admin control mode (ACM). The command must be run on a computer with Intel AMT, must run as administrator and the Intel management driver must be installed. Intel AMT must be in "pre-provisioning" state for this command to work. Example usage:\r\n\r\n meshcmd amtacm --url [url]');

209 console.log('\r\nPossible arguments:\r\n');

210 - console.log(' --wss [server:port] The address of the AMT remote configuration server.');

211 - console.log(' --profile [name] The name of the AMT profile stored on the AMT remote configuration server.');

210 + console.log(' --url wss://server/ The address of the Intel AMT activation server.');

211 + console.log(' --profile [name] Optional name of the Intel AMT profile stored on the activation server.');

212 } else if (action == 'amtdeactivate') {

213 console.log('AmtDeactivate will attempt to deactivate Intel AMT on this computer when in client control mode (CCM). The command must be run on a computer with Intel AMT, must run as administrator and the Intel management driver must be installed. Intel AMT must be activated in client control mode for this command to work. Example usage:\r\n\r\n meshcmd amtdeactivate');

214 } else if (action == 'amtacmdeactivate') {

@@ -498,11 +498,8 @@ function run(argv) {

498 activeToCCM();

499 } else if (settings.action == 'amtacm') {

500 // Start activation to ACM

501 - if ((settings.wss == null) || (typeof settings.wss != 'string') || (settings.wss == '')) { console.log('No server URL specified, use --wss [url].'); exit(1); return; }

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

501 + if ((settings.url == null) || (typeof settings.url != 'string') || (settings.url == '')) { console.log('No activation server URL specified, use --url [url].'); exit(1); return; }

502 if ((typeof settings.profile != 'string') || (settings.profile == '')) { settings.profile = null; }

504 - //settings.protocol = 'http:';

505 - settings.localport = 16992;

503 debug(1, "Settings: " + JSON.stringify(settings));

504 activeToACM();

505 } else if (settings.action == 'amtdeactivate') {

@@ -926,10 +923,10 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid) {

923 console.log('UUID: ' + uuid);

924 console.log('Realm: ' + digestRealm);

925 console.log('Nonce: ' + fwNonce);

929 - console.log('Connecting to ' + settings.wss);

926 + console.log('Connecting to ' + settings.url);

927

928 // Establish WebSocket connection to activation server

932 - var options = http.parseUri(settings.wss);

929 + var options = http.parseUri(settings.url);

930 options.checkServerIdentity = function (clientName, certs) { }; // TODO

931 options.rejectUnauthorized = false;

932 var connection = http.request(options);

agents/meshcmd.min.js