From 066b15f80c93a528612dd51f82b3d2e88b691170 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Thu, 20 May 2021 15:18:21 -0700
Subject: [PATCH] Fix for broken MeshCMD link.

---
 agents/MeshCmd-signed.exe   | Bin 4432912 -> 4432912 bytes
 agents/MeshCmd64-signed.exe | Bin 4047376 -> 4047376 bytes
 exeHandler.js               |   4 ++--
 webserver.js                |   5 ++++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index d156934bf13df4685d4a4f58ec2efcf9f47a0833..85acbc5e6f2124a0e9ef56f31ba7b1bc811c23d2 100644
GIT binary patch
delta 819
zcmWl|3osJ^00v-Vv#gP*rOYF2l*fimu~xG4>Z0q;RN~adQPHjSxFW`gN?sK*PP$aw
zC7f&vEs`F0C6QO>RcR%8B$6fi`|iG+7g^dlSS=!Grzujzgmf|Ce{Ix3B9c%S$+!&l
zkb=vRiu!1PE6@;Eq7fS7DqM{;T!SXK7T2LE($Ngf(E=@TJzAkP+8_g&Xp45Z0XL#O
zI-nyuAq&~)j4tSk9OR-KZo<vzjvmOvEy%~MxD7pVJ9;U^1c7I%9@mBK;=*?0vI`n+
z3WSnC`YR19Uht{r=wQ#{Oq$zbShE&yuQ#!XKA*yGNYIo<Tp2YSBA*c{?(a-$93gG;
z*S<9;)jHe22_%&~32D!o(B<YSW!yxInC|QWwN;y8P4vO!Lo?A-nNs9F*D)jPY#o{F
z{vt^}k;xmTDi@|Hc|nTxbv<<(4p^Tvle9g%`$pwj!7dB&davVuG2JJiGqpT7s_1JK
z=O^9dp>J?Jjj_aPpCnNo)YFqql<eX~W^>6(>n0tQQC!Pbe%+naCFP-jzKGiAauQu_
z>Q2sQp7#@+ym7DV_QZIux^L`Hsq|fAeYuZZ8Q}N4f=PZXV`vO(Bd_?spw;(ER+lN5
z%*Da<*@0d1aFNWWS!ldJ`KoXD>l%BVKcvy$gO)}wE9tYWc?vE0Z`2+=_T<hw>ad_O
z%pk@;Xtq#gu3+pc9Bt+6eb9WXNV{GrE3b{6l2#Y+^F!GwyP0=vd9zX8Pn#l#<yB+y
zF2`d(cutqT5>EBUor$CCO06U#EdqU7=tq^jQgq<Ex`-mvH~vzxkeRybsmy>%HaD3b
zU;A6U$L@kKsdY;AIQaN459iFj%kc%D5}eJ3jtI(FQ;xz`BJF*~;r>{$X%OSu>3vH(
zMjwr+61y@Td%tzI(84L+)jq@r9U4F90w<1oqT=I>E8(-<r0Ln-jAG(jFQN1w*P38?

delta 819
zcmWl|3osJ^00!VQw!9ij8#T=uGH+}0h~|-$#|n9Lp)EtYD;hGF?2se6ZsJ;<O6#cZ
zDv86ExVqY`=+c8(IjVI%NY_<bsinW~?vrXx5Tw{yXhP6@sur2licJ0|pedRm5lOfN
z&Cvoa(F(0`DU#6!ZP5;w;c~Rc6-YrUI-n!2#8pT`CtQtmbVdfQK_<GOE4txYbVn9?
zpeK5vH~OG2`k_CvaUF6n0M}z624OIU;06rEFx-e-495tJ>=T(pg<r7Xtn>2^;;`9l
zS-(6gMM7$=>sKoDEXh_ojcSx$E^VD}k7DX-o~M@k?%<ShRfgu7@4w|4AAQeF1@@LE
zOlnIc?p}h-qWkS52N*(9Rn+def_4Epwx=ne`E4yDE^PRXnlw;HKL2D+>}EdOdwT2=
z&4G4l+s)j$<UnIc)sdgihkcp{s(9jMq0B!L9hGUFM?Vxy(Nw$MQK#1$x3s*w=OML<
z9C|XCu<xRcY%u>sl~MVAL>52ZJNC?a*9B!hA=*`6lDHvOd_C+X>nxA2h{;jxlYTu)
z<(fU+)88~Ad`)lF6{)nhE4Mye6r{bdQa1;1zsLwl#OhgbjpN|ypa-2Ib>f?8S-r$5
zDQ1*18-A+qVE(RnVMK-I`tL4>?aZdfX=iMl2NG^m<|A!$hqT?iy3%}at>HU0T@Y6v
zS|C48En9U>pHv*Ju0PW?)>gV+Y0c-&Io{fNo+Z0#YDg63WmDWb<p(OWb<wYW%yb6(
zO)R7@O~|}EB=_7r`C(|XL$%;yUnrRul*QMOy=jDB)x@4g{-!JAHz?-Y`h*o(E+LnX
zjW))FoQ(C9q#WLF<S`cI?<b12(_Q@ZxQ=f`j^?v_`>Vgnd#4zCu0E34-qB4)7{ra1
zx3p<KPWq?D27X(cT|iL|i)F7LOKRX<qp?%7$f*{^i{XhZuL6T2qs6k@tR%9<`yU{Q
BSa1LU

diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index 08bb8198e5b9eb023781d7dd4023cf6b563dbe5c..9b32d363f45439c575250e3b42d3f63eff0ce30a 100644
GIT binary patch
delta 795
zcmWl|3osJ^7y#hSTMT(MuRO|Q2%A@I6LpSBLla3k*K*Ff#=NsMMs3|`cFe81C5_~e
zD6hDhoV*<+nq@sMXYxEWj~v(EclYs&w~>6<T!2*hi7H|vIc((rDo_=wL3OABHK7*N
zhKHaI)P*Rh2lb%=JPZw?5j2J-&=eklXlMq_p#`*rR`4jahBnX^+QDP+IJAcj&=ER8
z40MJr&=sD5ZqOZiKrF;TPv`}`p%3(hC!rtohj>WnU?Yhh@3g&f9ypwbkGH3=TSC0R
zDr&N5tnDpAGu0T)h~%mf(<lcCDNtWa(Xu4Sn<3N4>VpA}*|(`BsA|k?${t;%q)?Ao
zofdYcv1xwp*EBn`W}uIg!%NJ~q&^}44rOm@a3Ur)%1Kiw*=(LWW3f(#3QyU%hux;v
zx-z=rmecK9Lxhy<@wQY-e^%r*RttjXbd?|oESPT0mxo)n5k6ZXPNj~Xi@IU@HEVc2
zRy9+?T3<3;?QJK?Wd%{)VtqXq1x6qj?j;2eZ7oc?2fbQ$P*O%i)<?%nmx52HzTIL(
zb_?Rvb4wAs&CWZbi+lRsEg6@GF@_Ow?a5bWYPsp(%Y0Ww<aNH;^%&NzznmoV02Flu
z>p6gy>W1AvxT&m@*|8ED9`GppBi7a5<h01Nx%UqlnS+X$StrU4-|N}RSVwygss4jf
zW;2CD`>&OXnb9>(+X;8FRh-4mV})EyK+ix1*P>MNr9l|qdEPd5*3I~!zVjvaQC&}G
z<qxIN)>*L-vG7#N+Qhrz-Ma!QqDxgT`m4~3E0wyBrQHO&f0n@;DUG-MaWi^@Pu*P;
z?^kRQ<%=bT<2@Nj5p&b{k4XiuW+<4#9O`R~Z^+M}Ca!(*k3C8Y648ruc-#O1Pto2Q
pC$aRz`@G)J86BFW5kk!;$as0YUNLgoq9FXarn2m=TDe~<{T~s9V3_~_

delta 795
zcmWl|X-pCT7ywZ57E#DEPqa`-QUT8lv?=JKQxlpJZVd~s+|<mukqCHI!c0<HH2-LZ
zIhRKs^UAF>?V`*BO`PV@NK^C9a`yGMS5~ltD1(jp2z}>Fi5O8VM*Oc24WJ=3g2vDU
znnE*(gys+hEubYtLkv6wt)Mlufws^N+QY-p0Xjk_=nP$;E5t%K=njv-qYwu@peMvb
z0z3x2AQ2vi-p~j7LJ}lH3iN~iFaQR^AQ%i!zz}#6QrpD{8mZUJ-;YEN_NP$%6<sfB
zETMHt%HkC?eTvp$T3Zl8$7BXJw2d!y22LpZ5WTj}dPdK@`{%l&vTX)XiQ&f0$Tjgq
zB$}hHVSJ&mm!<2qBiCvs`D{TCsf+g{Eh__0NQ$mTG2|}@=lPP+so33x6vqp?Y(?Q_
z<62P*UWMzp+QvVi@hbJ5>i#z74hWym4ryd9@roEpRh-*p4%RjFU2b$-JHGWSF=8#$
zay5g_w~{o}iF(SAGyOH`Tg9<)e2ZDNk1w}tz0-t8phl!5&X?jDZH2N%7E^ANA1%=R
zN>j1y!f33;&HHc4t5dn(!h>$s=&EJ~D@aAu#n{EK^?9$By=>|G#9Ko19tP_zv#ER;
zRY^zAOY@|6U2kwXTBPYi%xANX<d1sf`1d(N*;9J$J+~5^4kbdW;>Q(vGk2tqk-mS%
zr^6_6yr`t#NUwW2UA>e>caleoZJb5qbtRE%ztb9P(wuYs2lElt1v5IOy#0Nj61c#_
zRA_KX%r-G9m@3rZRkGjttxC>7#@<FQcE~z?+QdvD+C`wP2eY<MzuqEabKLveQ=10Q
z#mI(*7;M(`&pFCLfF|;R-|D5r94*^3-9<aHmtas@=)sUA%olAW+n>Q{)V*WdeFhGb
ooBQ=v4Qz*sPjv41(y3YH>IYKKO7=*VK-;0yd5sw^49jEw0h()5<p2Nx

diff --git a/exeHandler.js b/exeHandler.js
index cd4cf0e7..42e14bcc 100644
--- a/exeHandler.js
+++ b/exeHandler.js
@@ -49,7 +49,7 @@ module.exports.streamExeWithJavaScript = function (options) {
     if ((options.platform == 'win32') && (!options.peinfo)) { options.peinfo = module.exports.parseWindowsExecutable(options.sourceFileName); }
 
     // If unsigned Windows or Linux, we merge at the end with the GUID and no padding.
-    if ((options.platform == 'win32' && options.peinfo.CertificateTableAddress == 0) || options.platform != 'win32') {
+    if (((options.platform == 'win32') && (options.peinfo.CertificateTableAddress == 0)) || (options.platform != 'win32')) {
         // This is not a signed binary, so we can just send over the EXE then the MSH
         options.destinationStream.sourceStream = require('fs').createReadStream(options.sourceFileName, { flags: 'r' });
         options.destinationStream.sourceStream.options = options;
@@ -64,7 +64,7 @@ module.exports.streamExeWithJavaScript = function (options) {
         // Pipe the entire source binary without ending the stream.
         options.destinationStream.sourceStream.pipe(options.destinationStream, { end: false });
     } else {
-        throw ('js content not specified');
+        throw ('streamExeWithJavaScript(): Cannot stream JavaScript with signed executable.');
     }
 };
 
diff --git a/webserver.js b/webserver.js
index 8a653b6e..5078bb16 100644
--- a/webserver.js
+++ b/webserver.js
@@ -4684,12 +4684,14 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                     res.sendFile(meshCmd64Path); return;
                 }
             }
+
             // No signed agents, we are going to merge a new MeshCmd.
-            if ((agentid < 10000) && (obj.parent.meshAgentBinaries[agentid + 10000] != null)) { agentid += 10000; } // Avoid merging javascript to a signed mesh agent.
+            if (((agentid == 3) || (agentid == 4)) && (obj.parent.meshAgentBinaries[agentid + 10000] != null)) { agentid += 10000; } // Avoid merging javascript to a signed mesh agent.
             var argentInfo = obj.parent.meshAgentBinaries[agentid];
             if ((argentInfo == null) || (obj.parent.defaultMeshCmd == null)) { try { res.sendStatus(404); } catch (ex) { } return; }
             setContentDispositionHeader(res, 'application/octet-stream', 'meshcmd' + ((req.query.meshcmd <= 4) ? '.exe' : ''), null, 'meshcmd');
             res.statusCode = 200;
+
             if (argentInfo.signedMeshCmdPath != null) {
                 // If we have a pre-signed MeshCmd, send that.
                 res.sendFile(argentInfo.signedMeshCmdPath);
@@ -4697,6 +4699,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                 // Merge JavaScript to a unsigned agent and send that.
                 obj.parent.exeHandler.streamExeWithJavaScript({ platform: argentInfo.platform, sourceFileName: argentInfo.path, destinationStream: res, js: Buffer.from(obj.parent.defaultMeshCmd, 'utf8'), peinfo: argentInfo.pe });
             }
+            return;
         } else if (req.query.meshaction != null) {
             if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { try { res.sendStatus(404); } catch (ex) { } return; } // Check 3FA URL key
             var user = obj.users[req.session.userid];