From 72c14d9d5fa620abd41965fc183c5ed0792abc87 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Sun, 22 Apr 2018 10:47:53 -0700
Subject: [PATCH] Fixed ACM/CCM display on web page and MeshCmd/MeshCore for
 AMT v5

---
 agents/MeshCmd-signed.exe   | Bin 3324856 -> 3325232 bytes
 agents/MeshCmd64-signed.exe | Bin 3317176 -> 3317552 bytes
 agents/meshcmd.js           |  20 ++++++++++++++------
 agents/meshcore.js          |   4 ++--
 package.json                |   2 +-
 views/default.handlebars    |   8 ++++++--
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 7b686331c53198ebccf587e2ec707864d0021af1..633a98204027d8668e897ca792f09e385a2b715b 100644
GIT binary patch
delta 1244
zcmY+=2{7DO90zcJmUXO~701S6*Y%ICUB_a#MAX%EB@(H+o4C7JXDMP8u`#L=QO|v~
z$q+|K)Sr!nN+cVlO+v#YQ>ATWvuTW46XNLfg=s2p<}>r&`@Y|M^L_(s<4Dg2l!eF!
z)?dg*TxFMQ3WbP3h`b>S$w4?s9#VktkRqf6DMKm{0aAt3AazIs(uA}iZAb^wg@}+I
zv=7pU3?M_u2qHoIA!CS)2@#VI7X^se1Tw`Cu^F0%@W7{Bb3@E0grdnpl6Mw@j4BG2
zQAO3fiDZHZuDKC#ecv39T@EnsBO;jsxPwJ-Ev_gcb^`Tu3&;|(!qn5P`$qwfOH&3)
zjwk_4I-(jNn@3Xv!%nC&_#}yDy&D)ZQN2BZ4-+-nQ^w`dNV^rwOjH+iygB^;rQ^(Z
zE`>)9>`5t3@1$ic8WrO?p$iD0B-6COND2)HjyR(_I1Vo=8ki*0bgR^jac}n(RU&yw
z>8ZSg#Q$P&(2YUZDFJ>g_@@jPR1Bo4G$LrWqV3-)HfEu0pmm5r1R5y}b#Rmp-+(g%
zK|BkE4nQ{0dk_t>h3Hs3i?JOl+xrWMt7bHi<ApT|<(0?WmdbP7Tn*8zHp?96_0;bC
zA<>-U;`wB2j9SA8G3M*M7;^OfqhRXytx|5-OuB@B*i35p^R&I+S8`wY$3A4*swya1
z7yA^isUip>FM}&UWRM>wf2ua~{$`pnmv46^>V{>IrD$R}j8&)?8%l0t_kCcCKan=x
zaG63sak6qVuxNFQLzFxViEFfsSfYzXDq5j;DhHVT;S1->3i*#85cO^Ky8XicRG<Aj
zq#$O4^jz6r)a!f-xt-DBZh$?ENcrcOl0ti8-L3Emhix)dn0-1<u=2ViDsir}r{%17
zjC(TM>M6-SRx6<4PCALQpiv!YvE_<U?&()ZwSS8ko*%ofxB6JI*5wS@J*anhV1je_
z)Sz8wZFy<L0|y5W|HAdL1Ui)>Wf#T1!hb}F#+O{T@;C9o2=P*TKelI+5z;ZQnKc~r
zR}fxqT^NbaTakckgN&Pe2Ayf|KxYQqn!Rn25{^#9>C~HE-HeaAWK)`3XE$2v^{Vt-
zPS4&x%J24(f0Wr0`lu_IDs!PaAHBO3pzN7vKRpnvmNe@7q<QtFXrVT6PIQl8<>vHa
z-1J&{*3eR5)Au^hi;ny{_VM~l{>f%ZV(ye#**?2aYF*pcEy88r0Z{vyR}jfvS2U2Y
z{H=}4>&DHJ<C{9OwU2)Eh^+VYYK(QpeXhXc9PgSk6l(OX#uug?j9Nj<o^oex)@;&R
zCr!HvUajq2H-@X!xY`$6E!x>l)gvCVcX`qhN5bfL;)_r6+L-;EiWUUtJ0qrlxyehr
zojXt7DvGL@3<jr1Is+w~LyPBB3Tm!OH@u^ZaV@GTR28qH(ZS7InVo01pGmB*^YxT3
O#VF0(4?82XJN^ao5c&oH

delta 1109
zcmYk&eNfYN90zcIV>~}?GKPTLV890aaEvuJU|1)lGQb2PGGPfZBHF=-hXmwY4RG8t
zxyi#%Kt|F9Xk;6~{e&qQk_w)kh@J!lBpwe2;xr{ds*mpM`rf_nd-wi+KHopyy7gh?
z{OT~GD@F*V?lq;z>xANy<$Z{%4|#zA%mEQt083y6tbq-%1$Mw5H~>fB1W14kwg6{9
z0WN?FT)|f02Hb%M*am2T4j8}_??b#|=2TV-UVw>PEqMDCAbB`9#V1gN<YREtRfp?+
z@Wb`Kj{OAQju(js-j>8NP>~X>g~X=S>sXemN*N2Ul(COl6S$@k6{nC5{D42sDGX>F
zz(@kr8k-WJBrHULQn8!zAWu^kAw*qGnM{a!z0AyW(laoB0m{UNglM2?%r5lRDr7EL
zbSP}S{IlrQ1Ku2pS`sjMIO>LZM4<LqqzGNWycj4&wHSedK(HNfKoH=9V0<xx_cWED
zOT%Uwc+H->uLRz;Z8W;Jx@Iz`lJ1X0<(5%mhcZM4BQtD}G5QhS+{jB|D2Q*)w1*|d
zYCM`aSCiRVt@YmX4}w~(7>a#~f&dPog6m*u6L2*8=&A#PAQomsC1U35%b}E1%d$F;
z({(;Sd1o0z??_7p|2(zZ)CQ#wuXoiQ+Bu+m9-;Yw6+Mts`)-e$L9`K-rEpQ>_rEAM
ztW&lXog%Kq<#Y4+>3YS7lf40g#VY+!>CmV9ryHtf|8B{e-(GN5Ui%kQEZ)JX>olXC
z=w50Xr*Zf<hRGhp-sS1C&64UP=&81>on_aAgS6{^)_knduW4%|jnwXM?tIsEvc_3U
zR*S|HuJPXwJ4gLKd8=HWKQ%^D(-)JwdzQkpy$;;?q;qX}Oq~)kl}Jjs^0{*0(dCXm
zQUsEy{h5PTf33T%jC;dqBVTRqPo_Pr`8vMHsPXQ;oiW)ZEtjT>vN6=a>sN4jJpOCE
z-~(Lm|0=Q}22+WYw?wUx<fV{U)v{_bSA2OY?-$9+|9iAB^?26XJ~OHZnNaYJ$m!Eh
z9%;L5<s)fghlC%WY`oJ%E+DkYM%ZUGzvZ~MGAs7XRCx-d^S<$Kqhk8}n0}8$VL)il
zFY+Yk^5&dLKd)5LXRReHU6Y|!y^*erxt_=kxo|1Ch5h>>&B4^{rA>NIjFW8ubx0?y
z_?Eved&W>F6}G3Dx9-|9p?H|PLBH!z&im?;pCrk=Eah2TmD%Ib%9}k6I&3sOc3;1H
z^m4pZpE}nUV?0jG&QWsD_&bZ$pM9w=FYJ~29V5qfJZ^qqL7cRj=$O#|Fe4mD<~S~g
ppIE-v_g?p{@q4RLyDnbvt!Q5<zGc)NoMs)Fm9d=0R;tZR=U<q&&HexY

diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index 0743fac325310013f141b4a0596813616382d52b..46096208815734e1d6e44853bf1fb442c8ff4621 100644
GIT binary patch
delta 1214
zcmY+=3rtg27zc1}Desm?TMD$)+5%O$jN4uX2UI2st_<nqF$Fae!h7-<uq9ZCfQ)wl
zfsHeVqUg$KA&h4_WkNx5tWZD+mGRod4K|5{6#>yXc9hKFNq))6`JeAQIp6nPDx{?w
zDntl_w5no6OjypyokR*Ikyi+iE<}X%AbrRHGK7pEW5@&|L1f4jGK0(^3y1<yAsS=}
z(IG3y8nS^H5EHV6SkMlL4eeA+A{?iI0z}1uxR4!WuRv4|c?k#(!UK4=z>Cc@P{`eQ
z9dzVu0X%_rLAxPGMR<Ty%pgb(z>I;BHA(_%Yt$S_0x?t2!$6He=uymRD`487R@(xR
z4a(V8b|w&GZB;DWpq8NV)#d-2s%+kB3a>bCOYIqNrKK#)L6OWrA0og$2%`XHFh&F)
zGEo{aAUP@;aDp()>S6}*&AFjTWOCA{smTe6|Ha?{2PeHQ0b&;X(`UBmA7CW}ql2p^
z*pAo5Y!)g66nmTw%!6?=aFhz)fICJ(JPU=Kp?4q`2!r^LKoQTvU!Eegj)OP}etGA!
z<HHg4*4DFEPQR-pFBcYt9E`o{W`B<+o{`<@<TCCn95V2e?5vOs6K&Ck+nSi@&Wo5U
zzc+KkLMo)^KfBGVIdp^WvWrjFH*(4s<*$<w1kuwWo=0>(H|Ug}dvPt*F>_M4YxAT^
z=Fp0z<TZC~{E|&+N^7}X>5o%l82;~zE|i(S_^EoPik;Ed$>Ln{ksmYF)qL|vA`V=v
zOO*W>_w(`FSzi48mgyqn%8hJs@xxEbJAN15^!8bM9#)$gIZt9&d?&+rU!xrv8J&_c
z>EU)lLshRKkr~$JGdMjpI}#;}k7cfWMdKFs?y11Y3#Zec{xc9Em8dUGpS|vzFf4K=
zfHr<<RP9jTYGVDwfm2`j$sRT5tS<$v@}|17%aylW^VDmG&6?|bMjk846Gf=9wRGG=
zELYBZ4aie)DrJ+Lm)2CKtvFw@I*nVs)VK4=EtZNvdkx;5g$wrWbrrau;M=_!kr7cq
zC(`~L)oJkK`j#0z^<3!Lyat3r?v~r<sJAsoenQDy^<fG(z#$<#sApjBs<+%>sJmgH
zJEgaOsoyop3-QpXBeb=R)HwsL(Ed<dWPVxEq|2ye#nblJ1ZI~14~yPCR*|uFq2~lS
zvL~7yNm}=PoG*p^@z%Q^vvCks5j=Jx*G*E+a~~~{jy=hlh`plK>Rq(b^xqFmYnga{
zB=Z4HQ{!lH<gaXLV}<EjC3*b4%t%i?Up5+Tw?d!v0ELb98)n1m`tp8+ad)<EeaTne
zE<bjG(?+`at)JSJd1pW8gXLSb7eh&7BUAH#6MidI#I42%D(64iEjj46FceFTe!${Q
fJnrLqns_faseH@|gz9cKHGi?<OnM?qXKVcnXZi6&

delta 1078
zcmYk&eNfYN90&0I#x@?d!H{k2fei*@IDRz7Y||17P}_8eLU4ysJc!U0PeOnLBgU-&
znTUkM4~7f60F90Zi5$kI7YgAB7$_)oNv0qI;c4*@f%HkvuFu`;pZE9s`TX&2zhXwZ
zy3I)YNd%8eIIBkv;&V=XJc$%fBLBhzD?k85Kmyjl2G{~SKn4^*1@^!J(10V@2AlvL
zFaQ%c0~TNd4&VY8zyo~X3fxSSh`_tQ*xD=r?!W^GP1a^lT?$?kfJp;{TvL-m)XhXR
zSlv?*uc|^sDlQBW0WYu}h)snd-g^cx8Vj|-?y^uCCTF2c%o677ww3v_QRl5JnT-mb
zXI804j$&dK>W<xDqdr^T$eb6ekTEb72ezKy%zp7;GICH79y{iOvN0|nrC`B4bQTjJ
zD82X*9|b<(B_IL5Knna!kNC2scku0T*smYTjBZN(?(@}r6?JJnOX4J<AjfolnHS<7
zZb)jrQd<~`MUyd4_O`3`uwTb=3%O^xm^dyeJ+yscXI<{O(U?!pSS*a&!nF>fluEMo
zE>ab(P!R+n;s`nfr(#5BFOr+Sa}94P(94aLTuNj$>zCl`*P1Vuv>6^G#;-jzoTR1t
zH}-qGb=!9t?$1k?V=nEbf3z?E!a|y(ew-4oO!_g6xZ!v9cWvcio%4y1NVPe#V21O`
zv*_6OAGBnT&hhw#+s3|az?CYerrN4n?faJ$wZq=&tv9_^r^Y)fs+}f0zm$~??qJ-O
z9EmOYpkb(0@$-7GW5G<_e7wh;r2Fn`ks15R^~vdkchhJWJu?@ga4u2A^wJJ<v&6wR
zqIV`-NbM|Kn3M03=njx<HW@ob_4i7yKDl#HuX`($na7zQk&FF{dVCnU>{Lqrz@MVv
z>yl@uk{fF)oi7(*s8M!BE0xJ!-XW7kNj?6n$d=&8B+#c>OmXPoY23LwnQ5iX>&=@1
zkH7hUkHoDWgHG+b$CAdTl<|MikHlN%zxQh4aZ?l1s8++a#~l{Axm|`B=2DhoxW*=I
zNqxG2tV)pk<u|3%l7*s9=887qZ{J4w7|F82@z-J8-)eeRJDm=MRtKfr@f7?OF4fQt
zVKJNUjVO<c6%Fo|`M#W2^QIF-VR72Q@bakF|Csp9*c3><%KYN;wG8*FU8cy#mt6a5
zd9zPVzV&Otdo{yq7TbMuVx*=wI>upAkTiQVYk*u9Q0^#RjJGqa|FnNpsoA|S(iUVG
zs!$Wmx5n(s$@R_W*CI0Hln8q?$tVoeCeBj#-CxN(^v2h#(@$<}oS}1WeL9pQ`rN12
LS01QW;<n}=F^;+{

diff --git a/agents/meshcmd.js b/agents/meshcmd.js
index 67c8b90a..62002ded 100644
--- a/agents/meshcmd.js
+++ b/agents/meshcmd.js
@@ -331,18 +331,26 @@ function run(argv) {
         amtMei.getVersion(function (val) { for (var version in val.Versions) { if (val.Versions[version].Description == 'AMT') { mestate.ver = val.Versions[version].Version; } } });
         amtMei.getProvisioningState(function (result) { mestate.ProvisioningState = result; });
         amtMei.getProvisioningMode(function (result) { mestate.ProvisioningMode = result; });
-        amtMei.getEHBCState(function (result) { mestate.ehbc = result; });
-        amtMei.getControlMode(function (result) { mestate.controlmode = result; });
-        amtMei.getMACAddresses(function (result) { mestate.mac = result; });
-        amtMei.getLanInterfaceSettings(0, function (result) { mestate.net0 = result; });
-        amtMei.getLanInterfaceSettings(1, function (result) { mestate.net1 = result; });
+        amtMei.getEHBCState(function (result) { if (result) { mestate.ehbc = result; } });
+        amtMei.getControlMode(function (result) { if (result) { mestate.controlmode = result; } });
+        amtMei.getMACAddresses(function (result) { if (result) { mestate.mac = result; } });
+        amtMei.getLanInterfaceSettings(0, function (result) { if (result) { mestate.net0 = result; } });
+        amtMei.getLanInterfaceSettings(1, function (result) { if (result) { mestate.net1 = result; } });
         amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { mestate.uuid = result.uuid; } });
         amtMei.getDnsSuffix(function (result) {
             mestate.dns = result;
             var str = 'Intel AMT v' + mestate.ver;
             if (mestate.ProvisioningState.stateStr == 'PRE') { str += ', pre-provisioning state'; }
             else if (mestate.ProvisioningState.stateStr == 'IN') { str += ', in-provisioning state'; }
-            else if (mestate.ProvisioningState.stateStr == 'POST') { if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; } }
+            else if (mestate.ProvisioningState.stateStr == 'POST') {
+                if (mestate.ProvisioningMode) {
+                    if (mestate.controlmode) {
+                        if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; }
+                    } else {
+                        str += ', activated in ' + mestate.ProvisioningMode.modeStr;
+                    }
+                }
+            }
             if ((mestate.ehbc) && (mestate.ehbc.EHBC == true)) { str += ', EHBC enabled'; }
             str += '.';
             if (mestate.net0 != null) { str += '\r\nWired ' + ((mestate.net0.enabled == 1) ? 'Enabled' : 'Disabled') + ((mestate.net0.dhcpEnabled == 1) ? ', DHCP' : ', Static') + ', ' + mestate.net0.mac + (mestate.net0.address == '0.0.0.0' ? '' : (', ' + mestate.net0.address)); }
diff --git a/agents/meshcore.js b/agents/meshcore.js
index fd8cdeee..3548343d 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -1253,7 +1253,7 @@ function createMeshCore(agent) {
                 var intelamt = {}, p = false;
                 if (meinfo.Versions && meinfo.Versions.AMT) { intelamt.ver = meinfo.Versions.AMT; p = true; }
                 if (meinfo.ProvisioningState) { intelamt.state = meinfo.ProvisioningState; p = true; }
-                if (meinfo.flags) { intelamt.flags = meinfo.Flags; p = true; }
+                if (meinfo.Flags) { intelamt.flags = meinfo.Flags; p = true; }
                 if (meinfo.OsHostname) { intelamt.host = meinfo.OsHostname; p = true; }
                 if (meinfo.UUID) { intelamt.uuid = meinfo.UUID; p = true; }
                 if (p == true) { r.intelamt = intelamt }
@@ -1298,7 +1298,7 @@ function createMeshCore(agent) {
         amtMei.getProvisioningMode(function (result) { amtMeiTmpState.ProvisioningMode = result.mode; });
         amtMei.getProvisioningState(function (result) { amtMeiTmpState.ProvisioningState = result.state; });
         amtMei.getEHBCState(function (result) { if ((result != null) && (result.EHBC == true)) { amtMeiTmpState.Flags += 1; } });
-        amtMei.getControlMode(function (result) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } });
+        amtMei.getControlMode(function (result) { if (result != null) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } } });
         amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { amtMeiTmpState.UUID = result.uuid; } });
         //amtMei.getMACAddresses(function (result) { amtMeiTmpState.mac = result; });
         amtMei.getDnsSuffix(function (result) { if (result != null) { amtMeiTmpState.dns = result; } if (func != null) { func(amtMeiTmpState); } });
diff --git a/package.json b/package.json
index e33bee64..6a5b7858 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.1.6-w",
+  "version": "0.1.6-y",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index 157cc408..f674f059 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2809,8 +2809,12 @@
                 if (node.intelamt != null) {
                     var str = '';
                     var provisioningStates = { 0: 'Not Activated (Pre)', 1: 'Not Activated (In)', 2: 'Activated' };
-                    if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else { str += (provisioningStates[node.intelamt.state] + ', v' + node.intelamt.ver); }
-                    if (node.intelamt.tls == 1) { str += ', TLS'; }
+                    if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else {
+                        str += provisioningStates[node.intelamt.state];
+                        if (node.intelamt.flags) { if (node.intelamt.flags & 2) { str += ' <span title="Intel AMT is activated in Client Control Mode">CCM</span>'; } else if (node.intelamt.flags & 4) { str += ' <span title="Intel AMT is activated in Admin Control Mode">ACM</span>'; } }
+                        str += (', v' + node.intelamt.ver);
+                    }
+                    if (node.intelamt.tls == 1) { str += ', <span  title="Intel AMT is setup with TLS network security">TLS</span>'; }
                     if (node.intelamt.user == null || node.intelamt.user == '') {
                         if ((meshrights & 4) != 0) {
                             str += ', <i style=color:#FF0000;cursor:pointer title="Edit Intel&reg; AMT credentials" onclick=editDeviceAmtSettings("' + node._id + '")>No Credentials</i>';