diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 1071a831a0..58b9a801dd 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -46,4 +46,6 @@ jobs: gh pr create --repo "$GITHUB_REPOSITORY" --base master --head "$BRANCH" \ --title "Sync from Fork" \ - --body "Automatic weekly sync from \`Ylianst/MeshCentral@master\`." + --body "Automatic weekly sync from \`Ylianst/MeshCentral@master\`. **This PR pulls unreviewed third-party upstream history and requires maintainer review and explicit approval before merging — do not enable auto-merge.**" + +
diff --git a/agents/meshcore_diagnostic.js b/agents/meshcore_diagnostic.js index 81d6cb0b09..5910b1990c 100644 --- a/agents/meshcore_diagnostic.js +++ b/agents/meshcore_diagnostic.js @@ -126,6 +126,29 @@ function ConfigureAgent(agent) } } +function validateDownloadedBinary(path) +{ + try + { + var stat = require('fs').statSync(path); + if (stat == null || stat.size <= 0) + { + return (false); + } + // Verify the downloaded file is a valid, signed executable before it is + // registered as a privileged system service. + if (require('MeshAgent').isSignatureValid != null) + { + return (require('MeshAgent').isSignatureValid(path) ? true : false); + } + return (true); + } + catch (e) + { + return (false); + } +} + function start() { sendServerLog('Diagnostic: Start'); @@ -139,6 +162,13 @@ function start() // SUCCESS try { + if (!validateDownloadedBinary('agent_temporary.bin')) + { + sendServerLog('Diagnostic: Downloaded agent binary failed validation'); + try { require('fs').unlinkSync('agent_temporary.bin'); } catch (e2) { } + giveup(); + return; + } var agent = require('service-manager').manager.installService( { name: process.platform == 'win32' ? 'Mesh Agent' : 'meshagent', @@ -148,8 +178,14 @@ function start() servicePath: 'agent_temporary.bin', startType: 'DEMAND_START' }); - require('fs').unlinkSync('agent_temporary.bin'); + if (agent == null) + { + try { require('fs').unlinkSync('agent_temporary.bin'); } catch (e3) { } + giveup(); + return; + } ConfigureAgent(agent); + require('fs').unlinkSync('agent_temporary.bin'); } catch(e) { @@ -185,6 +221,12 @@ function start() DownloadAgentBinary(s.appLocation()).then( function () { sendServerLog('Diagnostic: Downloaded Successfully'); + if (!validateDownloadedBinary(s.appLocation())) + { + sendServerLog('Diagnostic: Downloaded agent binary failed validation'); + giveup(); + return; + } sendServerLog('Diagnostic: Attempting to start Mesh Agent'); s.start(); sendServerLog('Diagnostic: ' + (s.isRunning() ? '(SUCCESS)' : '(FAILED)')); @@ -204,3 +246,4 @@ function start() } } }; + diff --git a/agents/modules_meshcmd/amt-apfclient.js b/agents/modules_meshcmd/amt-apfclient.js index f96eb1a36b..1183e1261b 100644 --- a/agents/modules_meshcmd/amt-apfclient.js +++ b/agents/modules_meshcmd/amt-apfclient.js @@ -144,7 +144,7 @@ function CreateAPFClient(parent, args) { obj.onSecureConnect = function onSecureConnect(resp, ws, head) { Debug("APF Secure WebSocket connected."); //console.log(JSON.stringify(resp)); - obj.forwardClient.tag = { accumulator: [] }; + obj.forwardClient.tag = { accumulator: '' }; obj.forwardClient.ws = ws; obj.forwardClient.ws.on('end', function () { Debug("APF: Connection is closing."); @@ -456,4 +456,4 @@ function CreateAPFClient(parent, args) { return obj; } -module.exports = CreateAPFClient; \ No newline at end of file +module.exports = CreateAPFClient; diff --git a/agents/modules_meshcmd/amt-mei.js b/agents/modules_meshcmd/amt-mei.js index fc48171977..254c2f01dc 100644 --- a/agents/modules_meshcmd/amt-mei.js +++ b/agents/modules_meshcmd/amt-mei.js @@ -161,7 +161,7 @@ function amt_heci() // Fill the left with zeros until the string is of a given length function zeroLeftPad(str, len) { - if ((len == null) && (typeof (len) != 'number')) { return null; } + if ((len == null) || (typeof (len) != 'number')) { return null; } if (str == null) str = ''; // If null, this is to generate zero leftpad string var zlp = ''; for (var i = 0; i < len - str.length; i++) { zlp += '0'; } @@ -496,4 +496,4 @@ AMT_STATUS_RNG_NOT_READY = 48, AMT_STATUS_CERTIFICATE_NOT_READY = 49, AMT_STATUS_INVALID_HANDLE = 2053 AMT_STATUS_NOT_FOUND = 2068, -*/ \ No newline at end of file +*/ diff --git a/agents/modules_meshcore/computer-identifiers.js b/agents/modules_meshcore/computer-identifiers.js index 5b2455a925..018e075a79 100644 --- a/agents/modules_meshcore/computer-identifiers.js +++ b/agents/modules_meshcore/computer-identifiers.js @@ -89,10 +89,10 @@ function linux_identifiers() } } catch (xx) { } } else { - throw('Unknown board'); + throw (new Error('Unknown board')); } } else { - throw ('this platform does not have DMI statistics'); + throw (new Error('this platform does not have DMI statistics')); } } else { var entries = require('fs').readdirSync('/sys/class/dmi/id'); @@ -900,3 +900,4 @@ module.exports.isVM = function isVM() // board_serial = BASEBOARD->SerialNumber = ioreg/serial-number | ioreg/IOPlatformSerialNumber // board_vendor = BASEBOARD->Manufacturer = ioreg/manufacturer // board_version = BASEBOARD->Version + diff --git a/agents/testsuite.js b/agents/testsuite.js index d268b29260..11e023634c 100644 --- a/agents/testsuite.js +++ b/agents/testsuite.js @@ -110,13 +110,6 @@ function parseUrl(url) { sha256.write('bob'); sha256.end(); } -{ - // FAIL!!!!!!!!! - var sha256x = require('SHA256Stream'); - sha256x.hashString = function (x) { if (x == '81B637D8FCD2C6DA6359E6963113A1170DE795E4B725B84D1E0B4CFD9EC58CE9') { console.log('Test 1 - OK: ' + x); } else { console.log('Test 1 - FAIL: ' + x); } }; - sha256x.write('bob'); - sha256x.end(); -} /* { @@ -154,4 +147,4 @@ function parseUrl(url) { } console.log('--- Tests Completed ---'); -process.exit(2); \ No newline at end of file +process.exit(2); diff --git a/amt/amt-wsman-comm.js b/amt/amt-wsman-comm.js index 25acdba012..6e6654b6a7 100644 --- a/amt/amt-wsman-comm.js +++ b/amt/amt-wsman-comm.js @@ -1,537 +1,541 @@ -/* -Copyright 2020-2021 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -@description Intel AMT WSMAN communication module for NodeJS -@author Ylian Saint-Hilaire -@version v0.3.0 -*/ - -/*jslint node: true */ -/*jshint node: true */ -/*jshint strict:false */ -/*jshint -W097 */ -/*jshint esversion: 6 */ -"use strict"; - -// Construct a WSMAN stack communication object -var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConnection) { - //console.log('CreateWsmanComm', host, port, user, pass, tls, tlsoptions); - - var obj = {}; - obj.PendingAjax = []; // List of pending AJAX calls. When one frees up, another will start. - obj.ActiveAjaxCount = 0; // Number of currently active AJAX calls - obj.MaxActiveAjaxCount = 1; // Maximum number of activate AJAX calls at the same time. - obj.FailAllError = 0; // Set this to non-zero to fail all AJAX calls with that error status, 999 causes responses to be silent. - obj.challengeParams = null; - obj.noncecounter = 1; - obj.authcounter = 0; - - obj.net = require('net'); - obj.tls = require('tls'); - obj.crypto = require('crypto'); - obj.constants = require('constants'); - obj.socket = null; - obj.socketState = 0; - obj.kerberosDone = 0; - obj.amtVersion = null; - - obj.Address = '/wsman'; - obj.cnonce = obj.crypto.randomBytes(16).toString('hex'); // Generate a random client nonce - - obj.host = host; - obj.port = port; - obj.user = user; - obj.pass = pass; - obj.xtls = tls; - obj.xtlsoptions = tlsoptions; - 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.xtlsCertificate = null; - obj.xtlsCheck = 0; // 0 = No TLS, 1 = CA Checked, 2 = Pinned, 3 = Untrusted - obj.xtlsSkipHostCheck = 0; - obj.xtlsMethod = 0; - obj.xtlsDataReceived = false; - obj.digestRealmMatch = null; - obj.digestRealm = null; - - // Private method - obj.Debug = function (msg) { console.log(msg); } - - // Used to add TLS to a steam - function SerialTunnel(options) { - var obj = new require('stream').Duplex(options); - obj.forwardwrite = null; - obj.updateBuffer = function (chunk) { try { this.push(chunk); } catch (ex) { } }; - obj._write = function (chunk, encoding, callback) { if (obj.forwardwrite != null) { obj.forwardwrite(chunk); } else { console.err("Failed to fwd _write."); } if (callback) callback(); }; // Pass data written to forward - obj._read = function (size) { }; // Push nothing, anything to read should be pushed from updateBuffer() - return obj; - } - - // Private method - // pri = priority, if set to 1, the call is high priority and put on top of the stack. - obj.PerformAjax = function (postdata, callback, tag, pri, url, action) { - if ((obj.ActiveAjaxCount == 0 || ((obj.ActiveAjaxCount < obj.MaxActiveAjaxCount) && (obj.challengeParams != null))) && obj.PendingAjax.length == 0) { - // There are no pending AJAX calls, perform the call now. - obj.PerformAjaxEx(postdata, callback, tag, url, action); - } else { - // If this is a high priority call, put this call in front of the array, otherwise put it in the back. - if (pri == 1) { obj.PendingAjax.unshift([postdata, callback, tag, url, action]); } else { obj.PendingAjax.push([postdata, callback, tag, url, action]); } - } - } - - // Private method - obj.PerformNextAjax = function () { - if (obj.ActiveAjaxCount >= obj.MaxActiveAjaxCount || obj.PendingAjax.length == 0) return; - var x = obj.PendingAjax.shift(); - obj.PerformAjaxEx(x[0], x[1], x[2], x[3], x[4]); - obj.PerformNextAjax(); - } - - // Private method - obj.PerformAjaxEx = function (postdata, callback, tag, url, action) { - if (obj.FailAllError != 0) { obj.gotNextMessagesError({ status: obj.FailAllError }, 'error', null, [postdata, callback, tag, url, action]); return; } - if (!postdata) postdata = ''; - //obj.Debug('SEND: ' + postdata); // DEBUG - - obj.ActiveAjaxCount++; - return obj.PerformAjaxExNodeJS(postdata, callback, tag, url, action); - } - - // NODE.js specific private method - obj.pendingAjaxCall = []; - - // NODE.js specific private method - obj.PerformAjaxExNodeJS = function (postdata, callback, tag, url, action) { obj.PerformAjaxExNodeJS2(postdata, callback, tag, url, action, 5); } - - // NODE.js specific private method - obj.PerformAjaxExNodeJS2 = function (postdata, callback, tag, url, action, retry) { - if ((retry <= 0) || (obj.FailAllError != 0)) { - // Too many retry, fail here. - obj.ActiveAjaxCount--; - if (obj.FailAllError != 999) obj.gotNextMessages(null, 'error', { status: ((obj.FailAllError == 0) ? 408 : obj.FailAllError) }, [postdata, callback, tag, url, action]); // 408 is timeout error - obj.PerformNextAjax(); - return; - } - obj.pendingAjaxCall.push([postdata, callback, tag, url, action, retry]); - if (obj.socketState == 0) { obj.xxConnectHttpSocket(); } - else if (obj.socketState == 2) { obj.sendRequest(postdata, url, action); } - } - - // NODE.js specific private method - obj.sendRequest = function (postdata, url, action) { - url = url ? url : '/wsman'; - action = action ? action : 'POST'; - var h = action + ' ' + url + ' HTTP/1.1\r\n'; - if (obj.challengeParams != null) { - obj.digestRealm = obj.challengeParams['realm']; - if (obj.digestRealmMatch && (obj.digestRealm != obj.digestRealmMatch)) { - obj.FailAllError = 997; // Cause all new responses to be silent. 997 = Digest Realm check error - obj.CancelAllQueries(997); - return; - } - } - if ((obj.user == '*') && (kerberos != null)) { - // Kerberos Auth - if (obj.kerberosDone == 0) { - var ticketName = 'HTTP' + ((obj.tls == 1) ? 'S' : '') + '/' + ((obj.pass == '') ? (obj.host + ':' + obj.port) : obj.pass); - // Ask for the new Kerberos ticket - //console.log('kerberos.getTicket', ticketName); - var ticketReturn = kerberos.getTicket(ticketName); - if (ticketReturn.returnCode == 0 || ticketReturn.returnCode == 0x90312) { - h += 'Authorization: Negotiate ' + ticketReturn.ticket + '\r\n'; - if (process.platform.indexOf('win') >= 0) { - // Clear kerberos tickets on both 32 and 64bit Windows platforms - try { require('child_process').exec('%windir%\\system32\\klist purge', function (error, stdout, stderr) { if (error) { require('child_process').exec('%windir%\\sysnative\\klist purge', function (error, stdout, stderr) { if (error) { console.error('Unable to purge kerberos tickets'); } }); } }); } catch (e) { console.log(e); } - } - } else { - console.log('Unexpected Kerberos error code: ' + ticketReturn.returnCode); - } - obj.kerberosDone = 1; - } - } else if (obj.challengeParams != null) { - var response = hex_md5(hex_md5(obj.user + ':' + obj.challengeParams['realm'] + ':' + obj.pass) + ':' + obj.challengeParams['nonce'] + ':' + nonceHex(obj.noncecounter) + ':' + obj.cnonce + ':' + obj.challengeParams['qop'] + ':' + hex_md5(action + ':' + url + ((obj.challengeParams['qop'] == 'auth-int') ? (':' + hex_md5(postdata)) : ''))); - h += 'Authorization: ' + obj.renderDigest({ 'username': obj.user, 'realm': obj.challengeParams['realm'], 'nonce': obj.challengeParams['nonce'], 'uri': url, 'qop': obj.challengeParams['qop'], 'response': response, 'nc': nonceHex(obj.noncecounter++), 'cnonce': obj.cnonce }) + '\r\n'; - } - h += 'Host: ' + obj.host + ':' + obj.port + '\r\nContent-Length: ' + postdata.length + '\r\n\r\n' + postdata; // Use Content-Length - //h += 'Host: ' + obj.host + ':' + obj.port + '\r\nTransfer-Encoding: chunked\r\n\r\n' + postdata.length.toString(16).toUpperCase() + '\r\n' + postdata + '\r\n0\r\n\r\n'; // Use Chunked-Encoding - obj.xxSend(h); - //console.log('SEND: ' + h); // Display send packet - } - - // Parse the HTTP digest header and return a list of key & values. - obj.parseDigest = function (header) { return correctedQuoteSplit(header.substring(7)).reduce(function (obj, s) { var parts = s.trim().split('='); obj[parts[0]] = parts[1].replace(new RegExp('\"', 'g'), ''); return obj; }, {}) } - - // Split a string on quotes but do not do it when in quotes - function correctedQuoteSplit(str) { return str.split(',').reduce(function (a, c) { if (a.ic) { a.st[a.st.length - 1] += ',' + c } else { a.st.push(c) } if (c.split('"').length % 2 == 0) { a.ic = !a.ic } return a; }, { st: [], ic: false }).st } - function nonceHex(v) { var s = ('00000000' + v.toString(16)); return s.substring(s.length - 8); } - - // NODE.js specific private method - obj.renderDigest = function (params) { - var paramsnames = []; - for (var i in params) { paramsnames.push(i); } - return 'Digest ' + paramsnames.reduce(function (s1, ii) { return s1 + ',' + (((ii == 'nc') || (ii == 'qop')) ? (ii + '=' + params[ii]) : (ii + '="' + params[ii] + '"')); }, '').substring(1); - } - - // NODE.js specific private method - obj.xxConnectHttpSocket = function () { - //obj.Debug("xxConnectHttpSocket"); - obj.socketParseState = 0; - obj.socketAccumulator = ''; - obj.socketHeader = null; - obj.socketData = ''; - obj.socketState = 1; - obj.kerberosDone = 0; - - if (obj.mpsConnection != null) { - if (obj.xtls != 1) { - // Setup a new channel using the CIRA/Relay/LMS connection - obj.socket = obj.mpsConnection.SetupChannel(obj.port); - if (obj.socket == null) { obj.xxOnSocketClosed(); return; } - - // Connect without TLS - obj.socket.onData = function (ccon, data) { obj.xxOnSocketData(data); } - obj.socket.onStateChange = function (ccon, state) { - if (state == 0) { - // Channel closed - obj.socketParseState = 0; - obj.socketAccumulator = ''; - obj.socketHeader = null; - obj.socketData = ''; - obj.socketState = 0; - obj.xxOnSocketClosed(); - } else if (state == 2) { - // Channel open success - obj.xxOnSocketConnected(); - } - } - } else { - // Setup a new channel using the CIRA/Relay/LMS connection - obj.cirasocket = obj.mpsConnection.SetupChannel(obj.port); - if (obj.cirasocket == null) { obj.xxOnSocketClosed(); return; } - - // Connect with TLS - var ser = new SerialTunnel(); - - // let's chain up the TLSSocket <-> SerialTunnel <-> CIRA APF (chnl) - // Anything that needs to be forwarded by SerialTunnel will be encapsulated by chnl write - ser.forwardwrite = function (msg) { try { obj.cirasocket.write(msg); } catch (ex) { } }; // TLS ---> CIRA - - // When APF tunnel return something, update SerialTunnel buffer - obj.cirasocket.onData = function (ciraconn, data) { if (data.length > 0) { try { ser.updateBuffer(Buffer.from(data, 'binary')); } catch (e) { } } }; // CIRA ---> TLS - - // Handle CIRA tunnel state change - obj.cirasocket.onStateChange = function (ciraconn, state) { - if (state == 0) { obj.xxOnSocketClosed(); } - if (state == 2) { - // TLSSocket to encapsulate TLS communication, which then tunneled via SerialTunnel an then wrapped through CIRA APF - var options = { socket: ser, ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE | obj.constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, rejectUnauthorized: false }; - if (obj.xtlsMethod == 1) { - options.secureProtocol = 'TLSv1_method'; - } else { - options.minVersion = 'TLSv1'; - } - if (obj.xtlsoptions) { - if (obj.xtlsoptions.ca) { options.ca = obj.xtlsoptions.ca; } - if (obj.xtlsoptions.cert) { options.cert = obj.xtlsoptions.cert; } - if (obj.xtlsoptions.key) { options.key = obj.xtlsoptions.key; } - } - - obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); - obj.socket.setEncoding('binary'); - obj.socket.setTimeout(60000); // Set socket idle timeout - obj.socket.on('error', function (ex) { obj.xtlsMethod = 1 - obj.xtlsMethod; }); - obj.socket.on('close', obj.xxOnSocketClosed); - obj.socket.on('timeout', obj.destroy); - - // Decrypted tunnel from TLS communcation to be forwarded to websocket - obj.socket.on('data', function (data) { try { obj.xxOnSocketData(data.toString('binary')); } catch (e) { } }); // AMT/TLS ---> WS - - // If TLS is on, forward it through TLSSocket - obj.forwardclient = obj.socket; - obj.forwardclient.xtls = 1; - } - }; - } - } else { - // Direct connection - if (obj.xtls != 1) { - // Direct connect without TLS - obj.socket = new obj.net.Socket(); - obj.socket.setEncoding('binary'); - obj.socket.setTimeout(60000); // Set socket idle timeout - obj.socket.on('data', obj.xxOnSocketData); - obj.socket.on('close', obj.xxOnSocketClosed); - obj.socket.on('timeout', obj.destroy); - obj.socket.on('error', obj.xxOnSocketClosed); - obj.socket.connect(obj.port, obj.host, obj.xxOnSocketConnected); - } else { - // Direct connect with TLS - var options = { ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE | obj.constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, rejectUnauthorized: false }; - if (obj.xtlsMethod == 1) { - options.secureProtocol = 'TLSv1_method'; - } else { - options.minVersion = 'TLSv1'; - } - if (obj.xtlsoptions) { - if (obj.xtlsoptions.ca) { options.ca = obj.xtlsoptions.ca; } - if (obj.xtlsoptions.cert) { options.cert = obj.xtlsoptions.cert; } - if (obj.xtlsoptions.key) { options.key = obj.xtlsoptions.key; } - } - obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); - obj.socket.setEncoding('binary'); - obj.socket.setTimeout(28000); // Set socket idle timeout of 28 seconds - obj.socket.on('data', obj.xxOnSocketData); - obj.socket.on('close', obj.xxOnSocketClosed); - obj.socket.on('timeout', obj.destroy); - obj.socket.on('error', function (ex) { if (ex.message && ex.message.indexOf('sslv3 alert bad record mac') >= 0) { obj.xtlsMethod = 1 - obj.xtlsMethod; } }); - } - obj.socket.setNoDelay(true); // Disable nagle. We will encode each WSMAN request as a single send block and want to send it at once. This may help Intel AMT handle pipelining? - } - } - - // Get the certificate of Intel AMT - obj.getPeerCertificate = function () { if (obj.xtls == 1) { return obj.socket.getPeerCertificate(); } return null; } - obj.getPeerCertificateFingerprint = function () { if (obj.xtls == 1) { return obj.socket.getPeerCertificate().fingerprint.split(':').join('').toLowerCase(); } return null; } - - // Check if the certificate matched the certificate hash. - function checkCertHash(cert, hash) { - // Check not required - if (hash == 0) return true; - - // SHA1 compare - if (cert.fingerprint.split(':').join('').toLowerCase() == hash) return true; - - // SHA256 compare - if ((hash.length == 64) && (obj.crypto.createHash('sha256').update(cert.raw).digest('hex') == hash)) { return true; } - - // SHA384 compare - if ((hash.length == 96) && (obj.crypto.createHash('sha384').update(cert.raw).digest('hex') == hash)) { return true; } - - return false; - } - - // NODE.js specific private method - obj.xxOnSocketConnected = function () { - if (obj.socket == null) return; - // check TLS certificate for webrelay and direct only - if (obj.xtls == 1) { - obj.xtlsCertificate = obj.socket.getPeerCertificate(); - - // Setup the forge certificate check - var camatch = 0; - if ((obj.xtlsoptions != null) && (obj.xtlsoptions.ca != null)) { - var forgeCert = forge.pki.certificateFromAsn1(forge.asn1.fromDer(atob(obj.xtlsCertificate.raw.toString('base64')))); - var caStore = forge.pki.createCaStore(obj.xtlsoptions.ca); - // Got thru all certificates in the store and look for a match. - for (var i in caStore.certs) { - if (camatch == 0) { - var c = caStore.certs[i], verified = false; - try { verified = c.verify(forgeCert); } catch (e) { } - if (verified == true) { camatch = c; } - } - } - // We found a match, check that the CommonName matches the hostname - if ((obj.xtlsSkipHostCheck == 0) && (camatch != 0)) { - amtcertname = forgeCert.subject.getField('CN').value; - if (amtcertname.toLowerCase() != obj.host.toLowerCase()) { camatch = 0; } - } - } - if ((camatch == 0) && (checkCertHash(obj.xtlsCertificate, obj.xtlsFingerprint) == false)) { - obj.FailAllError = 998; // Cause all new responses to be silent. 998 = TLS Certificate check error - obj.CancelAllQueries(998); - return; - } - if ((obj.xtlsFingerprint == 0) && (camatch == 0)) { obj.xtlsCheck = 3; } else { obj.xtlsCheck = (camatch == 0) ? 2 : 1; } - } else { obj.xtlsCheck = 0; } - obj.socketState = 2; - obj.socketParseState = 0; - for (i in obj.pendingAjaxCall) { obj.sendRequest(obj.pendingAjaxCall[i][0], obj.pendingAjaxCall[i][3], obj.pendingAjaxCall[i][4]); } - } - - // NODE.js specific private method - obj.xxOnSocketData = function (data) { - //console.log('RECV: ' + data); - obj.xtlsDataReceived = true; - if (typeof data === 'object') { - // This is an ArrayBuffer, convert it to a string array (used in IE) - var binary = "", bytes = new Uint8Array(data), length = bytes.byteLength; - for (var i = 0; i < length; i++) { binary += String.fromCharCode(bytes[i]); } - data = binary; - } - else if (typeof data !== 'string') return; - - obj.socketAccumulator += data; - while (true) { - //console.log('ACC(' + obj.socketAccumulator + '): ' + obj.socketAccumulator); - if (obj.socketParseState == 0) { - var headersize = obj.socketAccumulator.indexOf('\r\n\r\n'); - if (headersize < 0) return; - //obj.Debug("Header: "+obj.socketAccumulator.substring(0, headersize)); // Display received HTTP header - obj.socketHeader = obj.socketAccumulator.substring(0, headersize).split('\r\n'); - if (obj.amtVersion == null) { for (var i in obj.socketHeader) { if (obj.socketHeader[i].indexOf('Server: Intel(R) Active Management Technology ') == 0) { obj.amtVersion = obj.socketHeader[i].substring(46); } } } - obj.socketAccumulator = obj.socketAccumulator.substring(headersize + 4); - obj.socketParseState = 1; - obj.socketData = ''; - obj.socketXHeader = { Directive: obj.socketHeader[0].split(' ') }; - for (i in obj.socketHeader) { - if (i != 0) { - var x2 = obj.socketHeader[i].indexOf(':'); - obj.socketXHeader[obj.socketHeader[i].substring(0, x2).toLowerCase()] = obj.socketHeader[i].substring(x2 + 2); - } - } - } - if (obj.socketParseState == 1) { - var csize = -1; - if ((obj.socketXHeader['connection'] != undefined) && (obj.socketXHeader['connection'].toLowerCase() == 'close') && ((obj.socketXHeader["transfer-encoding"] == undefined) || (obj.socketXHeader["transfer-encoding"].toLowerCase() != 'chunked'))) { - // The body ends with a close, in this case, we will only process the header - csize = 0; - } else if (obj.socketXHeader['content-length'] != undefined) { - // The body length is specified by the content-length - csize = parseInt(obj.socketXHeader['content-length']); - if (obj.socketAccumulator.length < csize) return; - var data = obj.socketAccumulator.substring(0, csize); - obj.socketAccumulator = obj.socketAccumulator.substring(csize); - obj.socketData = data; - csize = 0; - } else { - // The body is chunked - var clen = obj.socketAccumulator.indexOf('\r\n'); - if (clen < 0) return; // Chunk length not found, exit now and get more data. - // Chunk length if found, lets see if we can get the data. - csize = parseInt(obj.socketAccumulator.substring(0, clen), 16); - if (obj.socketAccumulator.length < clen + 2 + csize + 2) return; - // We got a chunk with all of the data, handle the chunck now. - var data = obj.socketAccumulator.substring(clen + 2, clen + 2 + csize); - obj.socketAccumulator = obj.socketAccumulator.substring(clen + 2 + csize + 2); - try { obj.socketData += data; } catch (ex) { console.log(ex, typeof data, data.length); } - } - if (csize == 0) { - //obj.Debug("xxOnSocketData DONE: (" + obj.socketData.length + "): " + obj.socketData); - obj.xxProcessHttpResponse(obj.socketXHeader, obj.socketData); - obj.socketParseState = 0; - obj.socketHeader = null; - } - } - } - } - - // NODE.js specific private method - obj.xxProcessHttpResponse = function (header, data) { - //obj.Debug("xxProcessHttpResponse: " + header.Directive[1]); - - var s = parseInt(header.Directive[1]); - if (isNaN(s)) s = 500; - 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 - if (obj.challengeParams['qop'] != null) { - var qopList = obj.challengeParams['qop'].split(','); - for (var i in qopList) { qopList[i] = qopList[i].trim(); } - if (qopList.indexOf('auth-int') >= 0) { obj.challengeParams['qop'] = 'auth-int'; } else { obj.challengeParams['qop'] = 'auth'; } - } - if (obj.mpsConnection == null) { obj.socket.end(); } else { obj.socket.close(); } - } else { - var r = obj.pendingAjaxCall.shift(); - if ((r == null) || (r.length < 1)) { /*console.log("pendingAjaxCall error, " + r);*/ return; } // Get a response without any pending requests. - //if (s != 200) { obj.Debug("Error, status=" + s + "\r\n\r\nreq=" + r[0] + "\r\n\r\nresp=" + data); } // Debug: Display the request & response if something did not work. - obj.authcounter = 0; - obj.ActiveAjaxCount--; - obj.gotNextMessages(data, 'success', { status: s }, r); - obj.PerformNextAjax(); - } - } - - // NODE.js specific private method - obj.xxOnSocketClosed = function () { - //obj.Debug("xxOnSocketClosed"); - obj.socketState = 0; - if (obj.socket != null) { - if (obj.socket.removeAllListeners) { - // Do not remove the error handler since it may still get triggered. - obj.socket.removeAllListeners('data'); - obj.socket.removeAllListeners('close'); - obj.socket.removeAllListeners('timeout'); - } - try { - if (obj.mpsConnection == null) { - obj.socket.destroy(); - } else { - if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } - } - } catch (ex) { } - obj.socket = null; - obj.cirasocket = null; - } - if (obj.pendingAjaxCall.length > 0) { - var r = obj.pendingAjaxCall.shift(), retry = r[5]; - setTimeout(function () { obj.PerformAjaxExNodeJS2(r[0], r[1], r[2], r[3], r[4], --retry) }, 500); // Wait half a second and try again - } - } - - obj.destroy = function () { - if (obj.socket != null) { - if (obj.socket.removeAllListeners) { - // Do not remove the error handler since it may still get triggered. - obj.socket.removeAllListeners('data'); - obj.socket.removeAllListeners('close'); - obj.socket.removeAllListeners('timeout'); - } - try { - if (obj.mpsConnection == null) { - obj.socket.destroy(); - } else { - if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } - } - } catch (ex) { } - delete obj.socket; - delete obj.cirasocket; - obj.socketState = 0; - } - } - - // NODE.js specific private method - obj.xxSend = function (x) { - //console.log('xxSend', x); - if (obj.socketState == 2) { obj.socket.write(Buffer.from(x, 'binary')); } - } - - // Cancel all pending queries with given status - obj.CancelAllQueries = function (s) { - obj.FailAllError = s; - while (obj.PendingAjax.length > 0) { var x = obj.PendingAjax.shift(); x[1](null, s, x[2]); } - obj.destroy(); - } - - // Private method - obj.gotNextMessages = function (data, status, request, callArgs) { - if (obj.FailAllError == 999) return; - if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; } - if (request.status != 200) { try { callArgs[1](null, request.status, callArgs[2]); } catch (ex) { console.error(ex); } return; } - try { callArgs[1](data, 200, callArgs[2]); } catch (ex) { console.error(ex); } - } - - // Private method - obj.gotNextMessagesError = function (request, status, errorThrown, callArgs) { - if (obj.FailAllError == 999) return; - if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; } - try { callArgs[1](obj, null, { Header: { HttpError: request.status } }, request.status, callArgs[2]); } catch (ex) { console.error(ex); } - } - - // MD5 digest hash - function hex_md5(str) { return obj.crypto.createHash('md5').update(str).digest('hex'); } - - return obj; -} - -module.exports = CreateWsmanComm; \ No newline at end of file +/* +Copyright 2020-2021 Intel Corporation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +@description Intel AMT WSMAN communication module for NodeJS +@author Ylian Saint-Hilaire +@version v0.3.0 +*/ + +/*jslint node: true */ +/*jshint node: true */ +/*jshint strict:false */ +/*jshint -W097 */ +/*jshint esversion: 6 */ +"use strict"; + +// Construct a WSMAN stack communication object +var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConnection) { + //console.log('CreateWsmanComm', host, port, user, pass, tls, tlsoptions); + + var obj = {}; + obj.PendingAjax = []; // List of pending AJAX calls. When one frees up, another will start. + obj.ActiveAjaxCount = 0; // Number of currently active AJAX calls + obj.MaxActiveAjaxCount = 1; // Maximum number of activate AJAX calls at the same time. + obj.FailAllError = 0; // Set this to non-zero to fail all AJAX calls with that error status, 999 causes responses to be silent. + obj.challengeParams = null; + obj.noncecounter = 1; + obj.authcounter = 0; + + obj.net = require('net'); + obj.tls = require('tls'); + obj.crypto = require('crypto'); + obj.constants = require('constants'); + obj.socket = null; + obj.socketState = 0; + obj.kerberosDone = 0; + obj.amtVersion = null; + + obj.Address = '/wsman'; + obj.cnonce = obj.crypto.randomBytes(16).toString('hex'); // Generate a random client nonce + + obj.host = host; + obj.port = port; + obj.user = user; + obj.pass = pass; + obj.xtls = tls; + obj.xtlsoptions = tlsoptions; + 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.xtlsCertificate = null; + obj.xtlsCheck = 0; // 0 = No TLS, 1 = CA Checked, 2 = Pinned, 3 = Untrusted + obj.xtlsSkipHostCheck = 0; + obj.xtlsMethod = 0; + obj.xtlsDataReceived = false; + obj.digestRealmMatch = null; + obj.digestRealm = null; + + // Private method + obj.Debug = function (msg) { console.log(msg); } + + // Used to add TLS to a steam + function SerialTunnel(options) { + var obj = new require('stream').Duplex(options); + obj.forwardwrite = null; + obj.updateBuffer = function (chunk) { try { this.push(chunk); } catch (ex) { } }; + obj._write = function (chunk, encoding, callback) { if (obj.forwardwrite != null) { obj.forwardwrite(chunk); } else { console.err("Failed to fwd _write."); } if (callback) callback(); }; // Pass data written to forward + obj._read = function (size) { }; // Push nothing, anything to read should be pushed from updateBuffer() + return obj; + } + + // Private method + // pri = priority, if set to 1, the call is high priority and put on top of the stack. + obj.PerformAjax = function (postdata, callback, tag, pri, url, action) { + if ((obj.ActiveAjaxCount == 0 || ((obj.ActiveAjaxCount < obj.MaxActiveAjaxCount) && (obj.challengeParams != null))) && obj.PendingAjax.length == 0) { + // There are no pending AJAX calls, perform the call now. + obj.PerformAjaxEx(postdata, callback, tag, url, action); + } else { + // If this is a high priority call, put this call in front of the array, otherwise put it in the back. + if (pri == 1) { obj.PendingAjax.unshift([postdata, callback, tag, url, action]); } else { obj.PendingAjax.push([postdata, callback, tag, url, action]); } + } + } + + // Private method + obj.PerformNextAjax = function () { + if (obj.ActiveAjaxCount >= obj.MaxActiveAjaxCount || obj.PendingAjax.length == 0) return; + var x = obj.PendingAjax.shift(); + obj.PerformAjaxEx(x[0], x[1], x[2], x[3], x[4]); + obj.PerformNextAjax(); + } + + // Private method + obj.PerformAjaxEx = function (postdata, callback, tag, url, action) { + if (obj.FailAllError != 0) { obj.gotNextMessagesError({ status: obj.FailAllError }, 'error', null, [postdata, callback, tag, url, action]); return; } + if (!postdata) postdata = ''; + //obj.Debug('SEND: ' + postdata); // DEBUG + + obj.ActiveAjaxCount++; + return obj.PerformAjaxExNodeJS(postdata, callback, tag, url, action); + } + + // NODE.js specific private method + obj.pendingAjaxCall = []; + + // NODE.js specific private method + obj.PerformAjaxExNodeJS = function (postdata, callback, tag, url, action) { obj.PerformAjaxExNodeJS2(postdata, callback, tag, url, action, 5); } + + // NODE.js specific private method + obj.PerformAjaxExNodeJS2 = function (postdata, callback, tag, url, action, retry) { + if ((retry <= 0) || (obj.FailAllError != 0)) { + // Too many retry, fail here. + obj.ActiveAjaxCount--; + if (obj.FailAllError != 999) obj.gotNextMessages(null, 'error', { status: ((obj.FailAllError == 0) ? 408 : obj.FailAllError) }, [postdata, callback, tag, url, action]); // 408 is timeout error + obj.PerformNextAjax(); + return; + } + obj.pendingAjaxCall.push([postdata, callback, tag, url, action, retry]); + if (obj.socketState == 0) { obj.xxConnectHttpSocket(); } + else if (obj.socketState == 2) { obj.sendRequest(postdata, url, action); } + } + + // NODE.js specific private method + obj.sendRequest = function (postdata, url, action) { + url = url ? url : '/wsman'; + action = action ? action : 'POST'; + var h = action + ' ' + url + ' HTTP/1.1\r\n'; + if (obj.challengeParams != null) { + obj.digestRealm = obj.challengeParams['realm']; + if (obj.digestRealmMatch && (obj.digestRealm != obj.digestRealmMatch)) { + obj.FailAllError = 997; // Cause all new responses to be silent. 997 = Digest Realm check error + obj.CancelAllQueries(997); + return; + } + } + if ((obj.user == '*') && (kerberos != null)) { + // Kerberos Auth + if (obj.kerberosDone == 0) { + var ticketName = 'HTTP' + ((obj.tls == 1) ? 'S' : '') + '/' + ((obj.pass == '') ? (obj.host + ':' + obj.port) : obj.pass); + // Ask for the new Kerberos ticket + //console.log('kerberos.getTicket', ticketName); + var ticketReturn = kerberos.getTicket(ticketName); + if (ticketReturn.returnCode == 0 || ticketReturn.returnCode == 0x90312) { + h += 'Authorization: Negotiate ' + ticketReturn.ticket + '\r\n'; + if (process.platform.indexOf('win') >= 0) { + // Clear kerberos tickets on both 32 and 64bit Windows platforms + try { require('child_process').exec('%windir%\\system32\\klist purge', function (error, stdout, stderr) { if (error) { require('child_process').exec('%windir%\\sysnative\\klist purge', function (error, stdout, stderr) { if (error) { console.error('Unable to purge kerberos tickets'); } }); } }); } catch (e) { console.log(e); } + } + } else { + console.log('Unexpected Kerberos error code: ' + ticketReturn.returnCode); + } + obj.kerberosDone = 1; + } + } else if (obj.challengeParams != null) { + var response = hex_md5(hex_md5(obj.user + ':' + obj.challengeParams['realm'] + ':' + obj.pass) + ':' + obj.challengeParams['nonce'] + ':' + nonceHex(obj.noncecounter) + ':' + obj.cnonce + ':' + obj.challengeParams['qop'] + ':' + hex_md5(action + ':' + url + ((obj.challengeParams['qop'] == 'auth-int') ? (':' + hex_md5(postdata)) : ''))); + h += 'Authorization: ' + obj.renderDigest({ 'username': obj.user, 'realm': obj.challengeParams['realm'], 'nonce': obj.challengeParams['nonce'], 'uri': url, 'qop': obj.challengeParams['qop'], 'response': response, 'nc': nonceHex(obj.noncecounter++), 'cnonce': obj.cnonce }) + '\r\n'; + } + h += 'Host: ' + obj.host + ':' + obj.port + '\r\nContent-Length: ' + postdata.length + '\r\n\r\n' + postdata; // Use Content-Length + //h += 'Host: ' + obj.host + ':' + obj.port + '\r\nTransfer-Encoding: chunked\r\n\r\n' + postdata.length.toString(16).toUpperCase() + '\r\n' + postdata + '\r\n0\r\n\r\n'; // Use Chunked-Encoding + obj.xxSend(h); + //console.log('SEND: ' + h); // Display send packet + } + + // Parse the HTTP digest header and return a list of key & values. + obj.parseDigest = function (header) { return correctedQuoteSplit(header.substring(7)).reduce(function (obj, s) { var parts = s.trim().split('='); obj[parts[0]] = parts[1].replace(new RegExp('\"', 'g'), ''); return obj; }, {}) } + + // Split a string on quotes but do not do it when in quotes + function correctedQuoteSplit(str) { return str.split(',').reduce(function (a, c) { if (a.ic) { a.st[a.st.length - 1] += ',' + c } else { a.st.push(c) } if (c.split('"').length % 2 == 0) { a.ic = !a.ic } return a; }, { st: [], ic: false }).st } + function nonceHex(v) { var s = ('00000000' + v.toString(16)); return s.substring(s.length - 8); } + + // NODE.js specific private method + obj.renderDigest = function (params) { + var paramsnames = []; + for (var i in params) { paramsnames.push(i); } + return 'Digest ' + paramsnames.reduce(function (s1, ii) { return s1 + ',' + (((ii == 'nc') || (ii == 'qop')) ? (ii + '=' + params[ii]) : (ii + '="' + params[ii] + '"')); }, '').substring(1); + } + + // NODE.js specific private method + obj.xxConnectHttpSocket = function () { + //obj.Debug("xxConnectHttpSocket"); + obj.socketParseState = 0; + obj.socketAccumulator = ''; + obj.socketHeader = null; + obj.socketData = ''; + obj.socketState = 1; + obj.kerberosDone = 0; + + if (obj.mpsConnection != null) { + if (obj.xtls != 1) { + // Setup a new channel using the CIRA/Relay/LMS connection + obj.socket = obj.mpsConnection.SetupChannel(obj.port); + if (obj.socket == null) { obj.xxOnSocketClosed(); return; } + + // Connect without TLS + obj.socket.onData = function (ccon, data) { obj.xxOnSocketData(data); } + obj.socket.onStateChange = function (ccon, state) { + if (state == 0) { + // Channel closed + obj.socketParseState = 0; + obj.socketAccumulator = ''; + obj.socketHeader = null; + obj.socketData = ''; + obj.socketState = 0; + obj.xxOnSocketClosed(); + } else if (state == 2) { + // Channel open success + obj.xxOnSocketConnected(); + } + } + } else { + // Setup a new channel using the CIRA/Relay/LMS connection + obj.cirasocket = obj.mpsConnection.SetupChannel(obj.port); + if (obj.cirasocket == null) { obj.xxOnSocketClosed(); return; } + + // Connect with TLS + var ser = new SerialTunnel(); + + // let's chain up the TLSSocket <-> SerialTunnel <-> CIRA APF (chnl) + // Anything that needs to be forwarded by SerialTunnel will be encapsulated by chnl write + ser.forwardwrite = function (msg) { try { obj.cirasocket.write(msg); } catch (ex) { } }; // TLS ---> CIRA + + // When APF tunnel return something, update SerialTunnel buffer + obj.cirasocket.onData = function (ciraconn, data) { if (data.length > 0) { try { ser.updateBuffer(Buffer.from(data, 'binary')); } catch (e) { } } }; // CIRA ---> TLS + + // Handle CIRA tunnel state change + obj.cirasocket.onStateChange = function (ciraconn, state) { + if (state == 0) { obj.xxOnSocketClosed(); } + if (state == 2) { + // TLSSocket to encapsulate TLS communication, which then tunneled via SerialTunnel an then wrapped through CIRA APF + var options = { socket: ser, ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE | obj.constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, rejectUnauthorized: false }; + if (obj.xtlsMethod == 1) { + options.secureProtocol = 'TLSv1_method'; + } else { + options.minVersion = 'TLSv1'; + } + if (obj.xtlsoptions) { + if (obj.xtlsoptions.ca) { options.ca = obj.xtlsoptions.ca; } + if (obj.xtlsoptions.cert) { options.cert = obj.xtlsoptions.cert; } + if (obj.xtlsoptions.key) { options.key = obj.xtlsoptions.key; } + } + + obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); + obj.socket.setEncoding('binary'); + obj.socket.setTimeout(60000); // Set socket idle timeout + obj.socket.on('error', function (ex) { + console.error('CIRA TLS socket error: ' + (ex && ex.message ? ex.message : ex)); + obj.xtlsMethod = 1 - obj.xtlsMethod; + obj.xxOnSocketClosed(); + }); + obj.socket.on('close', obj.xxOnSocketClosed); + obj.socket.on('timeout', obj.destroy); + + // Decrypted tunnel from TLS communcation to be forwarded to websocket + obj.socket.on('data', function (data) { try { obj.xxOnSocketData(data.toString('binary')); } catch (e) { } }); // AMT/TLS ---> WS + + // If TLS is on, forward it through TLSSocket + obj.forwardclient = obj.socket; + obj.forwardclient.xtls = 1; + } + }; + } + } else { + // Direct connection + if (obj.xtls != 1) { + // Direct connect without TLS + obj.socket = new obj.net.Socket(); + obj.socket.setEncoding('binary'); + obj.socket.setTimeout(60000); // Set socket idle timeout + obj.socket.on('data', obj.xxOnSocketData); + obj.socket.on('close', obj.xxOnSocketClosed); + obj.socket.on('timeout', obj.destroy); + obj.socket.on('error', obj.xxOnSocketClosed); + obj.socket.connect(obj.port, obj.host, obj.xxOnSocketConnected); + } else { + // Direct connect with TLS + var options = { ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE | obj.constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, rejectUnauthorized: false }; + if (obj.xtlsMethod == 1) { + options.secureProtocol = 'TLSv1_method'; + } else { + options.minVersion = 'TLSv1'; + } + if (obj.xtlsoptions) { + if (obj.xtlsoptions.ca) { options.ca = obj.xtlsoptions.ca; } + if (obj.xtlsoptions.cert) { options.cert = obj.xtlsoptions.cert; } + if (obj.xtlsoptions.key) { options.key = obj.xtlsoptions.key; } + } + obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); + obj.socket.setEncoding('binary'); + obj.socket.setTimeout(28000); // Set socket idle timeout of 28 seconds + obj.socket.on('data', obj.xxOnSocketData); + obj.socket.on('close', obj.xxOnSocketClosed); + obj.socket.on('timeout', obj.destroy); + obj.socket.on('error', function (ex) { if (ex.message && ex.message.indexOf('sslv3 alert bad record mac') >= 0) { obj.xtlsMethod = 1 - obj.xtlsMethod; } }); + } + obj.socket.setNoDelay(true); // Disable nagle. We will encode each WSMAN request as a single send block and want to send it at once. This may help Intel AMT handle pipelining? + } + } + + // Get the certificate of Intel AMT + obj.getPeerCertificate = function () { if (obj.xtls == 1) { return obj.socket.getPeerCertificate(); } return null; } + obj.getPeerCertificateFingerprint = function () { if (obj.xtls == 1) { return obj.socket.getPeerCertificate().fingerprint.split(':').join('').toLowerCase(); } return null; } + + // Check if the certificate matched the certificate hash. + function checkCertHash(cert, hash) { + // Check not required + if (hash == 0) return true; + + // SHA1 compare + if (cert.fingerprint.split(':').join('').toLowerCase() == hash) return true; + + // SHA256 compare + if ((hash.length == 64) && (obj.crypto.createHash('sha256').update(cert.raw).digest('hex') == hash)) { return true; } + + // SHA384 compare + if ((hash.length == 96) && (obj.crypto.createHash('sha384').update(cert.raw).digest('hex') == hash)) { return true; } + + return false; + } + + // NODE.js specific private method + obj.xxOnSocketConnected = function () { + if (obj.socket == null) return; + // check TLS certificate for webrelay and direct only + if (obj.xtls == 1) { + obj.xtlsCertificate = obj.socket.getPeerCertificate(); + + // Setup the forge certificate check + var camatch = 0; + if ((obj.xtlsoptions != null) && (obj.xtlsoptions.ca != null)) { + var forgeCert = forge.pki.certificateFromAsn1(forge.asn1.fromDer(atob(obj.xtlsCertificate.raw.toString('base64')))); + var caStore = forge.pki.createCaStore(obj.xtlsoptions.ca); + // Got thru all certificates in the store and look for a match. + for (var i in caStore.certs) { + if (camatch == 0) { + var c = caStore.certs[i], verified = false; + try { verified = c.verify(forgeCert); } catch (e) { } + if (verified == true) { camatch = c; } + } + } + // We found a match, check that the CommonName matches the hostname + if ((obj.xtlsSkipHostCheck == 0) && (camatch != 0)) { + amtcertname = forgeCert.subject.getField('CN').value; + if (amtcertname.toLowerCase() != obj.host.toLowerCase()) { camatch = 0; } + } + } + if ((camatch == 0) && (checkCertHash(obj.xtlsCertificate, obj.xtlsFingerprint) == false)) { + obj.FailAllError = 998; // Cause all new responses to be silent. 998 = TLS Certificate check error + obj.CancelAllQueries(998); + return; + } + if ((obj.xtlsFingerprint == 0) && (camatch == 0)) { obj.xtlsCheck = 3; } else { obj.xtlsCheck = (camatch == 0) ? 2 : 1; } + } else { obj.xtlsCheck = 0; } + obj.socketState = 2; + obj.socketParseState = 0; + for (i in obj.pendingAjaxCall) { obj.sendRequest(obj.pendingAjaxCall[i][0], obj.pendingAjaxCall[i][3], obj.pendingAjaxCall[i][4]); } + } + + // NODE.js specific private method + obj.xxOnSocketData = function (data) { + //console.log('RECV: ' + data); + obj.xtlsDataReceived = true; + if (typeof data === 'object') { + // This is an ArrayBuffer, convert it to a string array (used in IE) + var binary = "", bytes = new Uint8Array(data), length = bytes.byteLength; + for (var i = 0; i < length; i++) { binary += String.fromCharCode(bytes[i]); } + data = binary; + } + else if (typeof data !== 'string') return; + + obj.socketAccumulator += data; + while (true) { + //console.log('ACC(' + obj.socketAccumulator + '): ' + obj.socketAccumulator); + if (obj.socketParseState == 0) { + var headersize = obj.socketAccumulator.indexOf('\r\n\r\n'); + if (headersize < 0) return; + //obj.Debug("Header: "+obj.socketAccumulator.substring(0, headersize)); // Display received HTTP header + obj.socketHeader = obj.socketAccumulator.substring(0, headersize).split('\r\n'); + if (obj.amtVersion == null) { for (var i in obj.socketHeader) { if (obj.socketHeader[i].indexOf('Server: Intel(R) Active Management Technology ') == 0) { obj.amtVersion = obj.socketHeader[i].substring(46); } } } + obj.socketAccumulator = obj.socketAccumulator.substring(headersize + 4); + obj.socketParseState = 1; + obj.socketData = ''; + obj.socketXHeader = { Directive: obj.socketHeader[0].split(' ') }; + for (i in obj.socketHeader) { + if (i != 0) { + var x2 = obj.socketHeader[i].indexOf(':'); + obj.socketXHeader[obj.socketHeader[i].substring(0, x2).toLowerCase()] = obj.socketHeader[i].substring(x2 + 2); + } + } + } + if (obj.socketParseState == 1) { + var csize = -1; + if ((obj.socketXHeader['connection'] != undefined) && (obj.socketXHeader['connection'].toLowerCase() == 'close') && ((obj.socketXHeader["transfer-encoding"] == undefined) || (obj.socketXHeader["transfer-encoding"].toLowerCase() != 'chunked'))) { + // The body ends with a close, in this case, we will only process the header + csize = 0; + } else if (obj.socketXHeader['content-length'] != undefined) { + // The body length is specified by the content-length + csize = parseInt(obj.socketXHeader['content-length']); + if (obj.socketAccumulator.length < csize) return; + var data = obj.socketAccumulator.substring(0, csize); + obj.socketAccumulator = obj.socketAccumulator.substring(csize); + obj.socketData = data; + csize = 0; + } else { + // The body is chunked + var clen = obj.socketAccumulator.indexOf('\r\n'); + if (clen < 0) return; // Chunk length not found, exit now and get more data. + // Chunk length if found, lets see if we can get the data. + csize = parseInt(obj.socketAccumulator.substring(0, clen), 16); + if (obj.socketAccumulator.length < clen + 2 + csize + 2) return; + // We got a chunk with all of the data, handle the chunck now. + var data = obj.socketAccumulator.substring(clen + 2, clen + 2 + csize); + obj.socketAccumulator = obj.socketAccumulator.substring(clen + 2 + csize + 2); + try { obj.socketData += data; } catch (ex) { console.log(ex, typeof data, data.length); } + } + if (csize == 0) { + //obj.Debug("xxOnSocketData DONE: (" + obj.socketData.length + "): " + obj.socketData); + obj.xxProcessHttpResponse(obj.socketXHeader, obj.socketData); + obj.socketParseState = 0; + obj.socketHeader = null; + } + } + } + } + + // NODE.js specific private method + obj.xxProcessHttpResponse = function (header, data) { + //obj.Debug("xxProcessHttpResponse: " + header.Directive[1]); + + var s = parseInt(header.Directive[1]); + if (isNaN(s)) s = 500; + 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 + if (obj.challengeParams['qop'] != null) { + var qopList = obj.challengeParams['qop'].split(','); + for (var i in qopList) { qopList[i] = qopList[i].trim(); } + if (qopList.indexOf('auth-int') >= 0) { obj.challengeParams['qop'] = 'auth-int'; } else { obj.challengeParams['qop'] = 'auth'; } + } + if (obj.mpsConnection == null) { obj.socket.end(); } else { obj.socket.close(); } + } else { + var r = obj.pendingAjaxCall.shift(); + if ((r == null) || (r.length < 1)) { /*console.log("pendingAjaxCall error, " + r);*/ return; } // Get a response without any pending requests. + //if (s != 200) { obj.Debug("Error, status=" + s + "\r\n\r\nreq=" + r[0] + "\r\n\r\nresp=" + data); } // Debug: Display the request & response if something did not work. + obj.authcounter = 0; + obj.ActiveAjaxCount--; + obj.gotNextMessages(data, 'success', { status: s }, r); + obj.PerformNextAjax(); + } + } + + // NODE.js specific private method + obj.xxOnSocketClosed = function () { + //obj.Debug("xxOnSocketClosed"); + obj.socketState = 0; + if (obj.socket != null) { + if (obj.socket.removeAllListeners) { + // Do not remove the error handler since it may still get triggered. + obj.socket.removeAllListeners('data'); + obj.socket.removeAllListeners('close'); + obj.socket.removeAllListeners('timeout'); + } + try { + if (obj.mpsConnection == null) { + obj.socket.destroy(); + } else { + if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } + } + } catch (ex) { } + obj.socket = null; + obj.cirasocket = null; + } + if (obj.pendingAjaxCall.length > 0) { + var r = obj.pendingAjaxCall.shift(), retry = r[5]; + setTimeout(function () { obj.PerformAjaxExNodeJS2(r[0], r[1], r[2], r[3], r[4], --retry) }, 500); // Wait half a second and try again + } + } + + obj.destroy = function () { + if (obj.socket != null) { + if (obj.socket.removeAllListeners) { + // Do not remove the error handler since it may still get triggered. + obj.socket.removeAllListeners('data'); + obj.socket.removeAllListeners('close'); + obj.socket.removeAllListeners('timeout'); + } + try { + if (obj.mpsConnection == null) { + obj.socket.destroy(); + } else { + if (obj.cirasocket != null) { obj.cirasocket.close(); } else { obj.socket.close(); } + } + } catch (ex) { } + delete obj.socket; + delete obj.cirasocket; + obj.socketState = 0; + } + } + + // NODE.js specific private method + obj.xxSend = function (x) { + //console.log('xxSend', x); + if (obj.socketState == 2) { obj.socket.write(Buffer.from(x, 'binary')); } + } + + // Cancel all pending queries with given status + obj.CancelAllQueries = function (s) { + obj.FailAllError = s; + while (obj.PendingAjax.length > 0) { var x = obj.PendingAjax.shift(); x[1](null, s, x[2]); } + obj.destroy(); + } + + // Private method + obj.gotNextMessages = function (data, status, request, callArgs) { + if (obj.FailAllError == 999) return; + if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; } + if (request.status != 200) { try { callArgs[1](null, request.status, callArgs[2]); } catch (ex) { console.error(ex); } return; } + try { callArgs[1](data, 200, callArgs[2]); } catch (ex) { console.error(ex); } + } + + // Private method + obj.gotNextMessagesError = function (request, status, errorThrown, callArgs) { + if (obj.FailAllError == 999) return; + if (obj.FailAllError != 0) { try { callArgs[1](null, obj.FailAllError, callArgs[2]); } catch (ex) { console.error(ex); } return; } + try { callArgs[1](obj, null, { Header: { HttpError: request.status } }, request.status, callArgs[2]); } catch (ex) { console.error(ex); } + } + + // MD5 digest hash + function hex_md5(str) { return obj.crypto.createHash('md5').update(str).digest('hex'); } + + return obj; +} + +module.exports = CreateWsmanComm; diff --git a/amtscript.js b/amtscript.js index 0d07f79cbc..3a210da083 100644 --- a/amtscript.js +++ b/amtscript.js @@ -118,18 +118,55 @@ module.exports.CreateAmtScriptEngine = function () { obj.step = function () { if (obj.state != 1) return; if (obj.ip < obj.script.length) { + // Validate there is enough room for the fixed-size header before reading it + if ((obj.ip + 6) > obj.script.length) { + obj.state = 9; + console.error("Script Error, truncated command header at ip=" + obj.ip); + obj.stop(); + if (obj.onStep) obj.onStep(obj); + return obj; + } var cmdid = ReadShort(obj.script, obj.ip); var cmdlen = ReadShort(obj.script, obj.ip + 2); var argcount = ReadShort(obj.script, obj.ip + 4); var argptr = obj.ip + 6; var args = []; + // Validate cmdlen and argcount are sane before using them to index/slice the buffer. + // cmdlen must be at least the 6-byte header size and must not push ip past the end + // of the buffer, and must make forward progress to avoid an infinite loop. + if (cmdlen < 6 || (obj.ip + cmdlen) > obj.script.length) { + obj.state = 9; + console.error("Script Error, invalid command length at ip=" + obj.ip); + obj.stop(); + if (obj.onStep) obj.onStep(obj); + return obj; + } + if (argcount < 0 || argcount > 10) { + obj.state = 9; + console.error("Script Error, invalid argument count at ip=" + obj.ip); + obj.stop(); + if (obj.onStep) obj.onStep(obj); + return obj; + } + // Clear all temp variables (This is optional) for (var i in obj.variables) { if (i.startsWith('__')) { delete obj.variables[i]; } } // Loop on each argument, moving forward by the argument length each time + var argsValid = true; for (var i = 0; i < argcount; i++) { + // Ensure the 2-byte arglen field itself is within the bounds of this command + if ((argptr + 2) > (obj.ip + cmdlen) || (argptr + 2) > obj.script.length) { + argsValid = false; + break; + } var arglen = ReadShort(obj.script, argptr); + // Ensure the argument's declared length stays within the command and the buffer + if (arglen < 1 || (argptr + 2 + arglen) > (obj.ip + cmdlen) || (argptr + 2 + arglen) > obj.script.length) { + argsValid = false; + break; + } var argval = obj.script.substring(argptr + 2, argptr + 2 + arglen); var argtyp = argval.charCodeAt(0); argval = argval.substring(1); @@ -146,6 +183,14 @@ module.exports.CreateAmtScriptEngine = function () { argptr += (2 + arglen); } + if (!argsValid) { + obj.state = 9; + console.error("Script Error, invalid argument encoding at ip=" + obj.ip); + obj.stop(); + if (obj.onStep) obj.onStep(obj); + return obj; + } + // Move instruction pointer forward by command size obj.ip += cmdlen; @@ -475,4 +520,4 @@ module.exports.CreateAmtScriptEngine = function () { }; return o; -}; \ No newline at end of file +}; diff --git a/charts/meshcentral/templates/configmap.yaml b/charts/meshcentral/templates/configmap.yaml index 270007434d..01d5a62470 100644 --- a/charts/meshcentral/templates/configmap.yaml +++ b/charts/meshcentral/templates/configmap.yaml @@ -3,8 +3,8 @@ kind: ConfigMap metadata: name: {{ .Chart.Name }}-default data: - OPENFRAME_MODE: "true" - OPENFRAME_GATEWAY_URL: "localhost" + OPENFRAME_MODE: {{ .Values.openframe.mode | default "true" | quote }} + OPENFRAME_GATEWAY_URL: {{ .Values.openframe.gatewayUrl | quote }} MESH_PROTOCOL: "ws" MESH_DEVICE_GROUP: "OpenFrame" @@ -26,3 +26,4 @@ data: MC_MONGO_REPLICA_SET: {{ .Values.mongodb.replicaSetValue | quote }} MC_MONGO_URI_OPTIONS: {{ .Values.mongodb.uriOptionsValue | quote }} {{- end }} + diff --git a/letsencrypt.js b/letsencrypt.js index f52f9094c7..6f83e42b83 100644 --- a/letsencrypt.js +++ b/letsencrypt.js @@ -226,8 +226,8 @@ module.exports.CreateLetsEncrypt = function (parent) { // Save certificate and private key to PEM files var certFile = obj.path.join(obj.certPath, (obj.runAsProduction ? 'production.crt' : 'staging.crt')); var keyFile = obj.path.join(obj.certPath, (obj.runAsProduction ? 'production.key' : 'staging.key')); - obj.fs.writeFileSync(certFile, cert); - obj.fs.writeFileSync(keyFile, obj.tempPrivateKey); + obj.fs.writeFileSync(certFile, cert, { mode: 0o600 }); + obj.fs.writeFileSync(keyFile, obj.tempPrivateKey, { mode: 0o600 }); delete obj.tempPrivateKey; // Cause a server restart @@ -267,4 +267,4 @@ module.exports.CreateLetsEncrypt = function (parent) { } return obj; -} \ No newline at end of file +} diff --git a/meshsms.js b/meshsms.js index 441e7c4d3c..30cb1cda05 100644 --- a/meshsms.js +++ b/meshsms.js @@ -150,7 +150,7 @@ module.exports.CreateMeshSMS = function (parent) { sms = require('url').parse(sms); if (sms.protocol == 'https:') { // HTTPS GET request - const options = { hostname: sms.hostname, port: sms.port ? sms.port : 443, path: sms.path, method: 'GET', rejectUnauthorized: false }; + const options = { hostname: sms.hostname, port: sms.port ? sms.port : 443, path: sms.path, method: 'GET', rejectUnauthorized: (parent.config.sms.allowunauthorizedcert === true) ? false : true }; const request = require('https').request(options, function (res) { parent.debug('email', 'SMS result: ' + res.statusCode); if (func != null) { func(res.statusCode == 200, (res.statusCode == 200) ? null : res.statusCode, null); } res.on('data', function (d) { }); }); request.on('error', function (err) { parent.debug('email', 'SMS error: ' + err); if (func != null) { func(false, err, null); } }); request.end(); @@ -254,3 +254,4 @@ module.exports.CreateMeshSMS = function (parent) { return obj; }; + diff --git a/public/js/ui-components.js b/public/js/ui-components.js index 7bc6c88fc7..fb40c9bbfc 100644 --- a/public/js/ui-components.js +++ b/public/js/ui-components.js @@ -199,6 +199,16 @@ class IconUploadComponent { }; } + escapeHtml(value) { + if (typeof value !== 'string') { return ''; } + return value + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + getPreviewSrc(value) { if ((typeof value !== 'string') || (value.length === 0)) { return ''; } if (typeof this.options.normalizePreviewUrl !== 'function') { return value; } @@ -210,30 +220,30 @@ class IconUploadComponent { const initialPreviewSrc = hasIcon ? this.getPreviewSrc(this.options.currentValue) : ''; const html = ` -
+
- -
-
+
Preview: - Icon preview + Icon preview
+ id="iconFile_${this.escapeHtml(this.iconKey)}" + onchange="window.iconUploadComponents['${this.escapeHtml(this.iconKey)}'].handleFileUpload(this)" />
`; @@ -393,3 +403,4 @@ if (typeof module !== 'undefined' && module.exports) { createIconUploadComponent }; } + diff --git a/public/mstsc/keyboard.js b/public/mstsc/keyboard.js index 531a9d7c41..906173d081 100644 --- a/public/mstsc/keyboard.js +++ b/public/mstsc/keyboard.js @@ -213,7 +213,6 @@ 164 : "BracketRight", 13 : "Enter", 20 : "CapsLock", - 20 : "CapsLock", 81 : "KeyA", 83 : "KeyS", 68 : "KeyD", @@ -238,12 +237,10 @@ 59 : "Comma", 58 : "Period", 161 : "Slash", - 16 : "ShiftRight", 17 : "ControlLeft", 91 : "OSLeft", 18 : "AltLeft", 32 : "Space", - 17 : "ControlLeft", 18 : "AltRight", 91 : "OSRight", 93 : "ContextMenu", @@ -253,7 +250,6 @@ 40 : "ArrowDown", 39 : "ArrowRight", 144 : "NumLock", - 144 : "NumLock", 111 : "NumpadDivide", 106 : "NumpadMultiply", 109 : "NumpadSubtract", @@ -268,11 +264,7 @@ 98 : "Numpad2", 99 : "Numpad3", 96 : "Numpad0", - 110 : "NumpadDecimal", - 13 : "NumpadEnter", - 17 : "ControlLeft", - 67 : "KeyC", - 17 : "ControlLeft" + 110 : "NumpadDecimal" }; var UnicodeToCodeChrome_FR = { @@ -318,7 +310,6 @@ 186 : "BracketRight", 13 : "Enter", 20 : "CapsLock", - 20 : "CapsLock", 81 : "KeyA", 83 : "KeyS", 68 : "KeyD", @@ -343,12 +334,10 @@ 190 : "Comma", 191 : "Period", 223 : "Slash", - 16 : "ShiftRight", 17 : "ControlLeft", 91 : "OSLeft", 18 : "AltLeft", 32 : "Space", - 17 : "ControlLeft", 18 : "AltRight", 91 : "OSRight", 93 : "ContextMenu", @@ -358,7 +347,6 @@ 40 : "ArrowDown", 39 : "ArrowRight", 144 : "NumLock", - 144 : "NumLock", 111 : "NumpadDivide", 106 : "NumpadMultiply", 109 : "NumpadSubtract", @@ -373,11 +361,7 @@ 98 : "Numpad2", 99 : "Numpad3", 96 : "Numpad0", - 110 : "NumpadDecimal", - 13 : "NumpadEnter", - 17 : "ControlLeft", - 67 : "KeyC", - 17 : "ControlLeft" + 110 : "NumpadDecimal" }; var UnicodeToCode_EN = { @@ -447,7 +431,6 @@ 188 : "Comma", 190 : "Period", 191 : "Slash", - 16 : "ShiftRight", 17 : "ControlLeft", 18 : "AltLeft", 91 : "OSLeft", @@ -461,7 +444,6 @@ 40 : "ArrowDown", 39 : "ArrowRight", 144 : "NumLock", - 144 : "NumLock", 111 : "NumpadDivide", 106 : "NumpadMultiply", 109 : "NumpadSubtract", @@ -507,4 +489,4 @@ Mstsc.scancode = scancode; -})(); \ No newline at end of file +})(); diff --git a/public/scripts/amt-wsman-ws-0.2.0.js b/public/scripts/amt-wsman-ws-0.2.0.js index b428c38813..6018d47967 100644 --- a/public/scripts/amt-wsman-ws-0.2.0.js +++ b/public/scripts/amt-wsman-ws-0.2.0.js @@ -22,7 +22,16 @@ var CreateWsmanComm = function (host, port, user, pass, tls) { obj.pass = pass; obj.tls = tls; obj.tlsv1only = 1; - obj.cnonce = Math.random().toString(36).substring(7); // Generate a random client nonce + obj.cnonce = (function () { // Generate a cryptographically secure random client nonce + if (typeof crypto !== 'undefined' && crypto.getRandomValues) { + var arr = new Uint8Array(16); + crypto.getRandomValues(arr); + var s = ''; + for (var i = 0; i < arr.length; ++i) { s += ('0' + arr[i].toString(16)).slice(-2); } + return s; + } + return Math.random().toString(36).substring(7); + })(); // Private method //obj.Debug = function (msg) { console.log(msg); } @@ -258,3 +267,4 @@ var CreateWsmanComm = function (host, port, user, pass, tls) { return obj; } + diff --git a/rdp/core/type.js b/rdp/core/type.js index 3303b3eb3b..316c97796d 100644 --- a/rdp/core/type.js +++ b/rdp/core/type.js @@ -304,12 +304,14 @@ inherits(SingleType, Type); */ SingleType.prototype.writeValue = function(s) { var safeValue = this.value; - if (typeof safeValue === 'number') { // FIX: Sanitize coordinates to prevent crashes - safeValue = Math.round(safeValue); // Round to nearest integer (fixes -1.01 issues) - if (safeValue < 0) safeValue = 0; // Clamp to 0 if negative + if (typeof safeValue === 'number') { + var rounded = Math.round(safeValue); // nbBytes is 1 (UInt8), 2 (UInt16), or 4 (UInt32) var max = Math.pow(2, this.nbBytes * 8) - 1; - if (safeValue > max) safeValue = max; // Clamp to max value allowed by the buffer size (prevents overflow crashes) + if (rounded < 0 || rounded > max || rounded !== safeValue) { + throw new error.FatalError('NODE_RDP_CORE_TYPE_VALUE_OUT_OF_RANGE, VALUE:' + safeValue + ', NBBYTES:' + this.nbBytes); + } + safeValue = rounded; } this.writeBufferCallback.call(s.buffer, safeValue, s.offset); s.offset += this._size_(); @@ -493,4 +495,4 @@ module.exports = { BinaryString : BinaryString, CallableValue : CallableValue, Factory : Factory -}; \ No newline at end of file +}; diff --git a/rdp/protocol/t125/mcs.js b/rdp/protocol/t125/mcs.js index 5248595795..9574d40076 100644 --- a/rdp/protocol/t125/mcs.js +++ b/rdp/protocol/t125/mcs.js @@ -484,8 +484,8 @@ Server.prototype.recvConnectInitial = function (s) { break; case gcc.MessageType.CS_NET: this.clientNetworkData = clientSettings[i]; - for (var i = 0; i < this.clientNetworkData.obj.channelCount.value; i++) { - this.serverNetworkData.obj.channelIdArray.obj.push(new type.UInt16Le( i + 1 + Channel.MCS_GLOBAL_CHANNEL)); + for (var j = 0; j < this.clientNetworkData.obj.channelCount.value; j++) { + this.serverNetworkData.obj.channelIdArray.obj.push(new type.UInt16Le( j + 1 + Channel.MCS_GLOBAL_CHANNEL)); } break; default: @@ -517,3 +517,4 @@ module.exports = { Client : Client, Server : Server }; +