From 964857d57484b8a1ebd8161311683a01110c9f32 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Thu, 22 Oct 2020 21:46:32 -0700
Subject: [PATCH] AMT Manager defaults to TLS on all connection types.

---
 agents/MeshCmd-signed.exe            | Bin 4377952 -> 4377928 bytes
 agents/MeshCmd64-signed.exe          | Bin 3993952 -> 3993928 bytes
 agents/modules_meshcmd/apfclient.js  |   3 ++-
 agents/modules_meshcore/apfclient.js |   3 ++-
 amt/amt-wsman-comm.js                |   2 +-
 amtmanager.js                        |   9 ++++-----
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index e45a92c6eacf614abc2bbdce7ff7266c8fea4b65..976b8b65bc8996a0ab93a8da9aa5c941633d4dc2 100644
GIT binary patch
delta 1311
zcmX}ke>l?#9Ki8?M_Ad|Eo~#e%Mdji+D6HEY<GSouKCrY&NW<gN|Mm9v*pLN(8H*B
z=BkY&)A_Y7Ql8L-@zCNT>j$pVbEKl5yU*Pp_kNz&zi(}IF?s+fPax>r=<<`uPDCM8
zAz~HsFEr2t`d|$(0EWN_V8B|i4j2P0zyT9r3h>}7KmhB38Q1`bfCR|E99V#jz!F#i
zYhVLxfgP|1o4{t^04Tr_I00v{1-JlLuoY|rRN&U3LTEvQV)QT#&^yq>?h-$&uVdua
zj5L>UryM7*z)BtBK@^YRJ%A_J4j6z5SilQ-gB@Te@BzDkZ^sCpJ@X4vQmJfX=TW~=
z>>DlmsEO>ZY^Ml}46>Fj%=gPC_EM9wuUeg-!Vhj(A{{Q~Ka%?MtrM1|>F+xZw6j<6
zROX(hwm5m**sD!}xYVb$*?HyFU;0xt%{4P=n7#rrv;1C}^45dXDa0PdU(XuDOe;?h
zu!REj!5h63kJw}m$D*sJVR8vIv&mRbo5ozwz3U%R({nr>hMJ!*c3lXUCB!tgQUY1+
zvq29g=`-a!E)wfL&2a+BFS--UC)gE#HwMgA`_{xqoVCL}ex`BU!b5qONH=0O)D9F<
z7Ag>g+xB~yRz&+L;m(|dul#oUMv6MbSrESJxw}jA9dVIkc?^}OTqVS01Tl=gOjhGh
z{>jYwWNREYyC!tcp{@Q7c8q&m|JKFL@dal}K8}6}<(84mL&xhAh)QOK$r-bnBbSl;
z`SZnPY`^yQ&NS~_rh?2Hi^8>fPv<tpj*~<dHeMgv=)-=GSxyqwd`rl9tcah64)L#C
z_Xm4fK&QIX8E({Qs*eH2S;Q5sU=fVI8%>|;Jy51zu{=9?)r(Fjk?+dHxk&2AX(OWn
z%X-%}8BJ5z<IDFGvkF6^`fXm?2R&y|vHuScWDQC`AC00_PnKqeHrV#=+I!2Vm|V3e
zpFSmyn98A2*XibG?qWH!I6?80l{9LtRi;Pvg6|7_ntKz+@$sb+UfAaw{JMse{bdu<
z-o)&N=iL2soLKz1SBBwlDH3)4=n?CE^@ptV<WBbS&lD{z&KE|Jt3jtxpYMZNwJddK
zWU{O3TE~U@eAYyW_Wh8Mr};YT!m?Xp;b)c9*11V0kUF|6tYX^I1uUaJ<5SZ=#K&<g
zEe2|n%!Bi^Jq5p^EgiBOMOYKGCU~aru4!cS?jl<FS<|uO13yQncRiF92;}0^>=sgO
z)b=L_u*dqa{L&xaJzRRds?>^UvD2qqwg+9`Hau!r$NOH2>s`3q5!YMgdid>|+gZmv
z)xtX}j*~WN$&SZv7R<LS8m|8$yIAJp>>nZ2ao_lPU%?cclePHnLS@)NL*%{?s~3@a
zoRR#xD~IXJ9bC2Eq3$U<*+AByMi$=RY8^XzkM#M8|F028gEe*fHC3gZEmJ4x0p{0Z
zG6#jp0qMcIX!*7IVM}CBX%wkya`Vc$^Mnc0*VlrB60AQo@$qVV=bR+nv?BKAP(S1L
z?dB`9HlD;o*7_0SiteI)cQu{}Un0jzpXO3Hu_YChOP%D@PlPCWzMCl5fX$J(X*1T6
ixa9}qWk_m<;3mN=x#lwF#7i^YtD6LrMYIm}U;h9U>q^Q1

delta 1328
zcmX}keK->c9Ki8yVPrE?BzYMtn;5fsi^8^}^mvJ<J;fq<>8#eqn3t}aJBQ1ZdSokk
z%^X*fJbCHuyser@&vRne@)mJkjxKMjqq^VSANPHp&%a+~u>>^+8q$%d+m?l=k>1Gm
ztoz8^`^bNxzy_cNw1Eyl16`m8HUfQs0a#!FaKI4Yff3jQHUnc|0=58CuoakrZNMB@
z083y62*4WH03z59b^u#I0%TwZb^?3g04Tr_H~}hfZn=-71@`9Z_R#>nMYqo-pG7=L
zK4SBYAdS!C@=p?C1$=&dYzkMvC&UYd0--12h>d-CZVBEMxB++I0d@gT;01PrJ-{3I
z0AIjpDZw+>s*p9Zt4+-Bsm7^WeDCDmrnoXOJ~{7<ilh4lNs4JfM^KIY@=0H*%;Q<e
zrAMELfgAT^#58K6>RSSunHoIR(f!cN^oj9>jn25pS*N-&2Nzn-<!B|z_^|m6gF8zM
zhqJE=spA>jeYn*H!Ig{ovP2~_OYFF|TPwV}!9vo1UamBs{!3{6z;cLQkzpD4@s0SZ
zLRWO=W_%N6LKDjNt-pOZY+KI*(o*b*dY{#<p)^UE_R2CfqH{W0zIQ?Km~M9LvQrh|
zdjfW+G+u<kTMLcuaEI4Z?Ro4p(cZDi8y73QGTTQ~U4HpS{IOHre;)5n5x;JC4Reqv
z<DYG{^BO1`aBbhuh)iaWCOoQ2oTPJ-(Z)a9?4Mx`EMtVtp<%-p{H`ZtUNiOW$`X&a
z@rfV))|i}VWlH{F3r@@Yc0azU3Nl1j>ZhE(Hvj&n_&fD^Yc$G?Ph8cVu}z5^RIbj7
z44wqUk)mB<4!j`E$wN>Sl>e-3shhbZc6RolySmUKs6IM+J9GBsXs}2<EoYh*l~`+Q
zKGMVB)+X;-kSOsZ^Ypx9rqa)dsM0g_23Y}}QRIE`{+$|!!_VEs*{QeAQnCLJkVtKW
z)(<EI17T4gj2ozEwk@$6c&g((K}ifQS1CJ0gA|^>=_kdBCo1vtZmH}c#@;Tn^ag#d
zENXOmKBh>2@PO6vww}0Y+-k!^@4%lfP^MT$zqVmE@uHkcXqCM>-b8*NN=Hi0{zYjY
z6Rf^v?M^IQJ(O_uTk2{@Jkc#-%iOD{xa$Y&NJE!i4F|nX_gW!bSEZxt28u<7Usi&-
zTcuM9bzv{7Y)ULiQgJw~tysaDL)mB#=V;arG$)*GLXPc>wG@4^WG|d884A=iHk7$=
z{K{D`S|bxeSlsITbE6-wbkVSN9+{3-yv%hI5=)O`y~vn}M33LSm-Dq~w$X4c`Lo-i
z>|N2``E^B}``fUW#GEL!*ZjxM1RQ=c`tGq2yNa(&@mCL4_^IN}xRG|pf~k9hD++R`
zMGzr`=vUAo3@DIzqV^DfV<X;JCE~oe7qR*gGxl;>GqE62UnLW4C~aF@PR$hPXbkHe
zj)eHfrHnOp_A%0urdFzQqv!H?5ly77T3T<YQ@1>c*MNJD=qC*=FR_LFH5t*5@V%al
zO~=dhr-myJW?d^yQuWyie^+(2u6tm*T*jm|>MPn5Icm*IorRsp)V@ZNip>I3dF2S|
z(d@kPwUSAzTP=bK#s%!#{3UYri!wSQ;M}<I%(=yBHM>dwN1M&r;q8M4u89Bo2VRCw
ATL1t6

diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index 6921d0f5632f562e120f7f1acebacf0369536fe6..5fc70904a07ebeaf190776489d7271c924b6d34f 100644
GIT binary patch
delta 1287
zcmX}sYgEz)9L90}1R5%smXtSA6U-Du#6V=BwRJO<BpYcK%}ZvrWohQ6NGvf;^HR_>
zU8cher?RF4trod6%FObpxiDuQU9H3{FHI7%{k9i-&iTB3UVev1rjZAr=@^23P*awH
zgdz1g9f-68`4<{202qJ;X22XQ1UO&;EP)lk0|KxHi+~NV1&hHFU<Zg`DOd*Vfdg;^
zPQV$Ez;fUMT!9-{0o(x@P=E(m2|U3n;HBz7yt(hC=qYbNRiUS7=hoqaR|;uqN4y1|
z$2|i><e$ktOQqfZK7bB<0R#8}Ch!NV0SmA}0N{W?RkuI)MGbOR-lXGZ(+N+^;<OV+
z4-sq6$$b7|y%FojCI2z8KDWvF$NoD9$ePFnZFNct+x>&$E4N2u&8j^E+*upCbVd5s
zH7U;H#cZO$KRdQUn)bBmd8Jiz;Vp)KZg0j3pQ}9>$<U=JVn|QwyZQhRdEPiTN4(yG
zB}*?hgspB}Qz{7$dc+e&)aGeY&Lq}ZUNEKZv+G=U+gJD|c2F54->J)EurwuCTnRV0
z)G}&}IyLfRyB9%-XcI^>{;uF0cEOA(k$M!L?6>Xc@SV>m`~Th%nULQl?Kbc&d-Bp(
zYqvbUYd!SM0KG`{=HlAcp+=5TEUurdI9R@EqxqrZwpXw7#|8;TW$O=2F22Q6W}~l=
zmea~PiP@)WI3%}URU*AF(T+wMkDEugtr~43dh~DI9&gTOH{H!TKeP=uIp?L>JAfFE
zrHCUAgk9yeu=XeXLfg%)wkV329P{dIaFToxlCF_CYJ~f_121;HJ6?}=nvh#gaHqw7
zbfzEM*Ds3BGsCUQ-IzOzM{pQl28J%!5~qH0JAa?cs1UCjD36hosJ5x0>ZIvj*~7w7
zY~%|^@AEc4oz`z2rEdt<)f(ye{|^uZi^53ID0{SvdaZRr_AW)*tk5I(<IJJbRDZtf
z*4AOnHdKkI!!D{wT(?a6>^VW+M9CU45wF}tSDx+uPVn=$jlH*{aV@Vp73<T+USEiy
zXMCKv)fqcqi|WWy%aS=4tr?k9wxs?nXU1i9+R!G0HTDo&p>ZM_-<M&Tb!V)ig2Hz{
zIY;F$dn+ODZg!Y!e5npOQ`R2Twg1z|j)|9)FFD34hW%i?*gDo#s~whhhNTDiR61^7
zQke1z8%r4!H9PeT_O|OzB-I28hc5;ci;q0R@sR1A;>in(7RnAb6x{osg37sMWoR$5
ze-~Hct?0YICv4j6eMrEfYuCHTeJeuUFub+2*98Jc(|slJ{uYO8f8A&!Ck=fbXZoIt
z-=Qi&3Fi-vh}}XbgUgkhNmaEmlA2G2?li4K->G|<@ut~|=EO2X1k=o%zvgCdrnrF_
z_q%9kyy$IJZfT@BJ~KJ%>rV+b)q3*jG*NVecPOv^FegM?nMs~`8g6<VsHk=+ZccB{
zVD)ho5E*TO{!+fj`EdK_`SGrzqcvi!T`xas7@uIpS-^|7w4%Bv>!b}j!(9L2m6ta(
z#(Y>l8X&EjX;BF98)lNG2&IS1*@~jNSC6H45*sK}(F(EPH%TEMCs{HZMt`(UX|NBD
dyR5WeW&RmziqQ8w%-Gmgea*tcq(l9;e*n^~Nx}dC

delta 1304
zcmX}keLT~70KjoSZ8q}I3_W?=JlohXPuuOv!=##CaXnn|BFkK7ZLy&nZn2occ{)v3
zUQT(q2`!bmbz*wD$x3G>Ax=@}#fVsJz3#quf86KwdjI?ReQFt+1f-`SL&kU&ABu*0
zg-S@Ig#Kj+Yye;Y954b901_|;On{AmDPRVe0~Ww000meAXut}v25f-Mz!qRDunpJ_
z*aCKdJ>UR10!{!1zyi*I3*ZX40q%eY;0builn{=xC_*mb0K5#j<XsYmO?8jMgmbdk
ztP|{1M+S$@PG;~<aM+H?>FJ#G5XU%-*Vm%UBp-kP5CLDn5AX*_KmZU31OdT72tbxy
zCQ)=(p=NQ-2qlk@+e)C9O<L?PO5nd8Pr|;Dm~Bbdr_?v{oy-@+(tgs1!<6$37WWKI
za6Q>sJZK?{dPUKq2*;B&QVaa$1QeQ3kYSpyo*Tij%U96--g|_LwCSmU?8lVfUf0~^
zeKX@Vf8FQVMe(UQicpZXgIHQ2yUADX*UT(7-c&f;l1y%m7tQR{W32pI^e-MH1-8j_
z>@|tf*WbvLDL!*7>tKl%=AbUFvtr_S66{D`xlK<xxBgSFxppP=dC~g5qW-iAlw599
zq}ue;aJkd@razlvk(Zu^VZBtHCi9;wJ@ex>YXUJ9v#Z}X3ET<?!iGh`sJpb3@%*3{
z-tDz*xl*a>W&2P^cB|TYAjhgY&ut|(pavP4`~Jm@Yj+Uh?+Vs|)AFnMI-l3o)_Cc?
z3i_jvXDvk6v+U?92QK3r?LtSh@{6(5HB~%~s@NT^c>XZ!C@sFMcp`G@WLp3&+<4IC
zP0JV+^YPnCL%pAPd7iQ?AQFT8NdBZFgfESZJqvdgYRw>H7||C-2obXE@@;rL^88wo
zq|6Qey0;{}#Wc6!BhKbrlgG<|VHQd+)GzFdiwtuo>jv8iX8#W$2yOt&H#9irYSCc9
zl0fLt{qpYj^t2#fPRyaD?uaChsJ1r&516;+>IJs7qt`yIrP^l}tl~eibob8;aZ4RF
zjibncZO^c@N3wU_rLENljq_D28OpWDsAeBri*{8Vqaa6G`tGt{P*H0x22CE>P#@1Y
zMOT+mBerQW5pP*hRF*TV`R4uI+S(*izs*Ag>fns=2J6QHQJR6`mtd48R~~A2;6~h8
zK|y{*PpR_5r@ryG9kM*TKfW5v&Zc{{UeHx`#Gvuq@|S9S-;TvNfyh&F<=Q4;f%O!E
zgM`5`>mJZf^7eA+?9-lCi77va#h2`5I?IpC#R~gim`gJKWJe}>^l46x{Ij6UjsHV}
zV{EhWmEmmZM9L9eF%eD;XD$?9ojxp>4x#a@l$k4X%_Rj_w`l+C*64nC;$iZMh8)R2
zD5TMlnqzN_mX$Qj#uz;rGAYp(R*&>8n&+wySv_I;cQGQC?KnpF)_Kd5Ecdk0F{By%
zR(B%bGBdm;F<M`lFgoDhtIn9f79O4M!bSVcO&RQ|->XY_Uel?(J&Pc?Fq<5X-q}nW
znX5zRe7Bl5h}c-L<8F`hT<tZj7`;Ru8n+BQ=GEn0XKTHFJFUE3EBvdg>xt^r-X0V4
s48wyzt`zwq=uUkMrQE6WonHelV)%{}%@sF<o$DM@+25hg*c$xTKMk^5?f?J)

diff --git a/agents/modules_meshcmd/apfclient.js b/agents/modules_meshcmd/apfclient.js
index 15b6bc14..250d2563 100644
--- a/agents/modules_meshcmd/apfclient.js
+++ b/agents/modules_meshcmd/apfclient.js
@@ -324,7 +324,8 @@ function CreateAPFClient(parent, args) {
                     });
 
                     chan.on('error', function (e) {
-                        Debug("Downlink connection error: " + e);
+                        //Debug("Downlink connection error: " + e);
+                        SendChannelOpenFailure(socket.ws, p_res);
                     });
 
                     chan.on('end', function () {
diff --git a/agents/modules_meshcore/apfclient.js b/agents/modules_meshcore/apfclient.js
index 8996f0c5..aa073c9f 100644
--- a/agents/modules_meshcore/apfclient.js
+++ b/agents/modules_meshcore/apfclient.js
@@ -324,7 +324,8 @@ function CreateAPFClient(parent, args) {
                     });
 
                     chan.on('error', function (e) {
-                        Debug("Downlink connection error: " + e);
+                        //Debug("Downlink connection error: " + e);
+                        SendChannelOpenFailure(socket.ws, p_res);
                     });
 
                     chan.on('end', function () {
diff --git a/amt/amt-wsman-comm.js b/amt/amt-wsman-comm.js
index 79c540a2..c405f438 100644
--- a/amt/amt-wsman-comm.js
+++ b/amt/amt-wsman-comm.js
@@ -426,7 +426,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConn
             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; }
+            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--;
diff --git a/amtmanager.js b/amtmanager.js
index 6f333704..5a89e36f 100644
--- a/amtmanager.js
+++ b/amtmanager.js
@@ -418,8 +418,8 @@ module.exports.CreateAmtManager = function (parent) {
                 dev.amtstack.dev = dev;
                 dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse);
                 break;
-            case 1:
-            case 2:
+            case 1: // CIRA-Relay
+            case 2: // CIRA-LMS
                 // Handle the case where the Intel AMT relay or LMS is connected (connType 1 or 2)
                 // Check to see if CIRA is connected on this server.
                 var ciraconn = dev.mpsConnection;
@@ -433,7 +433,6 @@ module.exports.CreateAmtManager = function (parent) {
 
                 // Connect now
                 var comm;
-                dev.tlsfail = true; // DEBUG!!!!!!!
                 if (dev.tlsfail !== true) {
                     parent.debug('amt', 'Relay-Connect', "TLS", dev.name, user, pass);
                     comm = CreateWsmanComm(dev.nodeid, 16993, user, pass, 1, null, ciraconn); // Perform TLS
@@ -447,7 +446,7 @@ module.exports.CreateAmtManager = function (parent) {
                 dev.amtstack.dev = dev;
                 dev.amtstack.BatchEnum(null, ['*AMT_GeneralSettings', '*IPS_HostBasedSetupService'], attemptLocalConnectResponse);
                 break;
-            case 3:
+            case 3: // Local LAN
                 // Handle the case where the Intel AMT local scanner found the device (connType 3)
                 parent.debug('amt', "Attempt Initial Local Contact", dev.name, dev.connType, dev.host);
                 if (typeof dev.host != 'string') { removeAmtDevice(dev); return; } // Local connection not valid
@@ -555,7 +554,7 @@ module.exports.CreateAmtManager = function (parent) {
             });
         } else {
             // We got a bad response
-            if ((dev.conntype == 1) && (dev.tlsfail !== true) && (status == 408)) {
+            if ((dev.conntype != 0) && (dev.tlsfail !== true) && (status == 408)) { // If not using CIRA and we get a 408 error while using TLS, try non-TLS.
                 // TLS error on a local connection, try again without TLS
                 dev.tlsfail = true; attemptInitialContact(dev); return;
             } else if (status == 401) {