From be104d819c7b39561f1edce2d8cc3fe0ac8843f8 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 3 Nov 2021 10:58:22 -0700 Subject: [PATCH] Updated MeshCMD to fix #3234 --- agents/MeshCmd-signed.exe | Bin 4236136 -> 4236232 bytes agents/MeshCmd64-signed.exe | Bin 3850600 -> 3850696 bytes agents/meshcmd.js | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 3e2195ca759f0148cd11a15ac9d23d5829f0420d..a37c0d645e9372c4400c1875487440ed17b791dd 100644 GIT binary patch delta 1323 zcmX}ke>l?#9KdnkZKh?DAEnHXm@z*}8#eQ6qp6F2_}RI2<(`V9tF0)kXyGtDvp8w< zC^RaM5yGar{J4tBQ{0o9yEElS;!dSll&$V__s6}T=k@PV}J()U;V%s^Q|1$Fr1EiY!NLt2G$x|VSt0iDkP2;zxp$w= zWL=3jBepPUpZit6iGw6&RK-Lut#>iHQ)yLB=8h^2Ncq|sTQiPiTY=@T+b2WXHu{q`n11dl&dMkZnFe2r6H-LmE;*4>E13kM2?D=W0qvp%#+ zr#&@=KWHouB*?;E()IHuyWJoEG&Ug$yjFNfDKHH>lIk3H@YJ=@t&`j@rFoRl4AaE( z)a{zLkG;N2GvRl=o4@#X@`Cguzj?M4%U@qE^XwF~j5nEKm-G}PCi^|60-14^MEf5eKhUST(25+uiLdTL~ zNL_fY-Ol&d)4$(v%CL3iC zvZ7WSfOh}V#G`SLPMf0p52^=8Z5I{^x#_xlcROoH!>oMa{_w1`wvyxHK{;eX$h@ee zcEWbq<&rRB^l;dUwrXN$V3E7QfOOMTr0Fy(t^TFk?Ok-i$?mvnPWjCOqrss)gZ0gF z9*29>Q+``AH)374i#Njh>>*~WU`@KVu zSgbzR?_4f4&NEEGh|b($ytp2x&vhB02V-WZo*I(MFoeZ^_cyCQkDPT)k2-_;qZGeU z&{nK7bPUFKv8gS(AHBkJ9ubch>G$3(+sU-c6l_A}?*66c)#zMcgPy*n@A-z{Rz3Oj z^u?;V@WwRMZog;>nuB>`p&Z|*L5C<`-_CeG_EskhkHSthGM5_;Rz%b=KZPu@PSr(B z@>^%a))Z>64t*V1zleeNZKIQlrS>OZ54`shlxHZ|rTvXTMmy9vGIoDvOeR%5mWn%+ z=+`w}Z+Ik1eE%xuC7m!AxkDyTM%pi3>XASHyztD=ya-b|*?!nEitypVYX!PcA{8~5 zB`1Vl_K(%vMB!&>5p~=7Cyr@x->mb$vS}2R?sR}-ZBA(rnimI9 zZV$`F3iXI{pSYJXmLgDi_~-G-Z!;t<*e6%6c4)HlocH)H2)w+Xq^8x=4gTvN5w1$V delta 1289 zcmX}keLT|%9KiAYmgHeZD_JbdL-SBH%u`}ZI$qUr7t(399=MFTz0MlvQe&Bwho;9_ zCu1Es!_`$r)Fo~ndXQ3EGI~&1lZPlX)!p~*kNdn{?|(m?9enhNl8?Taji7fBPV$iu zgnYOa5w;@#LW6n02+Rk@U;!`zroarC0}QYLSYQdPz(Rlni@;)F4VC~KfCo!~EwBRw zungD(B3KR_fFp1M&R_)~0T)FP}VyN7dTUZFYp8Y zAOHk{H6RGA1;HRhvA~&HdPvbEqp}eN`&X*f2!a=97t(UbWs5dG+){vlILY1`ff{_a z@EYCTr=)oKpm|sGwdiQ?{CzfhNye(z`calOH#duusPHPH9a~5y5^AdPT%A6pN|dGk zX~>}Ic(q5>6!(Guo6YRxPN(xxF+KBCM=*I8Jbm6ZY*ybEkC)L7^Bja>XTAFZuFlpV zFQoX=T3%D~rGpO+jo&L0a2%Md@Ysa6;o?gOqIRd4oj8$;! z+zn|kZ_^rMGnvJr_--jReL%TZ@};Yt-mkOcm7e14`!ZcmULI{eTdWndJPitIrg&Ru z^rM-@esRp=f-wIy4Vs(W5^Atw+Gy^wbqt0`s(aRLHOf7ZOmC*e;C&=F}WeN z$fGNzHjb8^GfXS6Cus!0yLw*FZcm6~ujw9d7J(%s+P`zS|gF1gfG VofNmlZdZBkOWDT}{u$JN{R2KLQRx5x diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index d12e8e122364de25e4ee026a058fec2d5ca8acca..df0cf8394f156471d65a40e8e710e27a3c1b447b 100644 GIT binary patch delta 1299 zcmX}keLT|%9KdnE8EtH62xTnun5WIyaGshTNTi3ud1{Pybf;F<12TEGJEe!S9%xbS zRivaejnne1*VUzBmh!klq7;*dUfs9*<36v~``^!a<|NXYHHp;ZBPeIl837W66lKYg zJUQ|m3aA1!Py^~<1;79-&;XhM2k<}(XagOv5)gnc&;$Bl6)*sXzzD1cYk)Bz0ux{g zNMJ2617u(hEPy4j0@lC=tOK^d4%mz3h=Z+99>R10j(`HFzzNWRGjIWPzyPjdgy|+q z7oKQxBa5r0Zn21dTzo8#V@6WKeGLV%ttX3v~%Fbh!b`b^LuYeg0m;3D0qcpf7NEg{1Mz8 z?Su2xr~-*2V~8_o>UISHceEFuUC*B5bw(0o0Q52gA|&PezWN zl8|H6{^^Yqb|~{yjoCKhwc6&23774-BClqwg)49G^1eTQo)2Ba%=swPV>UAN19m0l zCZKw=g@h*eIX;!)!k{{ZQ@qu&>vH{a=kW*@O?5(3t`Luw^aUE&aCWO(+oXr0qNOp6 zk#k>n^9iYK9`9*i=_8E_yre9IU`|_1#fV-}@c$1GL`?;qiBd7vZRMvHv}0L`?jGA3 z38o?v10BTZlx``wOJr_cr7PGpFvaf{*lPxEz5PUMvC!d{B~)g5sZCAGcz|BY#25oh zewT`A2t|h`j#1BcVf*VY<52YVpZ)YxOg>&X{iB_hWncadafd`%(codB)z#N2yAw)u z4d+fC`}>1lKDUBfa&^1CCH;v>;y-NcjzLe7(!b2=!IQ&-YyXl8J23xneMGsFAm|-z!`q6~?mX(o} zbCYICOvXh&MK?CcQzlu3wqbqyHymiw(x|1;HmiD-+n>L#D|j6C>Gif;16JT6ZJ*EI zd^P9^!+DFnS;{K!>8@tynQZdxo{mb+od@3j#*7XuIZ8Sd+h7Z q{%hfmp5N+8sXo!qFESxgwxL#S5 zmTHRYRllJJEaJm3Hv0SU|p z3&29)1QvnCz!|szSKtQ7z#S|B9)JQoffuSqyeTWiIF2`13aEeve1I?T19ZRuOt1{a zaabpE(3W;qGJ+=GX4zP|s-6KY?le2dHr6;kG~XrMlq$Wj|n~sRYjm$_z;${)k&%@=M9N45a?Z)++}dzVz0* zi5(ZW8Z_yv_TFIYL{vXI)0ZWnt}r(BC|X^lw?s^h zXg)^Nr}($b#(-6gK{1T9t@9{64)w3M7?*87(iM-=j!iO%h@Kkw|O zTK+#k5G=;%paI6Drx1VBeYR_MpY37I-Ba&pufGc8g!>JvdSb2#l%EewoxN%)(oS(o z0|m;?*o3}>+R;r`(pG_eypF6NkIcyx6^k#&TU&VNK94DMlcYWx?eeLNOlM%(y)PB( zd2JD)ywV{Cfm9#AY9l>6=NZ%Gu6$Adrm_{;O2)S-3AOb*3ML+*Vr+nh5hjz?Juof} zL5Q~gdF!1+LMl9*DjY1|l0>uEOUZY}bj7ky`5#qZWZgjHwNH%j>mV7(=M6$_%n?a`o=zz{P(D%L27z**vFBI2lkyq(*!E0jNYuChc z75kBm9V0@Ualgs)S53E5pLdegH&j!b=8)Ih8&y5za%4DK~uCX`z{XfFE)F zma@>d#eAT=G3jGw?Dh|()$_Q22gyD5R+jZ_MY{`9tR4ht8y}~WOC^cTRHvkMPF#;> z&MVJny3nH0pcMY`&}xe#Y41C~$i73ftog?)Mz MF}$UA6!TyI0#H3X$p8QV diff --git a/agents/meshcmd.js b/agents/meshcmd.js index 2fae4b10..fca177c3 100644 --- a/agents/meshcmd.js +++ b/agents/meshcmd.js @@ -2039,12 +2039,13 @@ function startRouter() { options.headers = { 'host': options.host, 'x-meshauth': Buffer.from(settings.username, 'binary').toString('base64') + ',' + Buffer.from(settings.password, 'binary').toString('base64') }; } } - } else { options.headers = { 'x-meshauth': '*' }; } // Request inner authentication + } else { options.headers = { 'host': options.host, 'x-meshauth': '*' }; } // Request inner authentication if (settings.loginkey) { xurlargs.push('key=' + settings.loginkey); } if (xurlargs.length > 0) { options.path += '?' + xurlargs.join('&'); } } catch (e) { console.log("Unable to parse \"serverUrl\"."); process.exit(1); return; } debug(1, "Connecting to " + options.host + "."); + debug(1, "Connection options: " + JSON.stringify(options) + "."); options.checkServerIdentity = onVerifyServer; options.rejectUnauthorized = false; settings.websocket = http.request(options);