From 82300f0cbeb317758d8246eaf50a040847bb4148 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sat, 22 Jun 2019 22:06:50 -0700 Subject: [PATCH] more Intel AMT ACM work... --- agents/MeshCmd-signed.exe | Bin 5775544 -> 5773296 bytes agents/MeshCmd64-signed.exe | Bin 5358264 -> 5356016 bytes agents/meshcmd.js | 11 +++++++++-- agents/meshcmd.min.js | 11 +++++++++-- meshuser.js | 9 +++++++++ views/default.handlebars | 24 ++++++++++++++++++++++++ webserver.js | 4 ++-- 7 files changed, 53 insertions(+), 6 deletions(-) diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 37fd7a90a376769221e42d7870aa1b0f618ab9a0..3fde67be953d2d7ee4b95db586c78b83b7ff4595 100644 GIT binary patch delta 2037 zcmZY9Yc$mR8VB(C|Bca%8FIhYFe2pgA7(I1{}68?poiDu4)70STyqWq=GQKpjv44QK#OupDRsZJ+~m zfgaEY2EY&)0b^hSOu-7U63~GeFb51^0agJ^UkS80VZ$)&VZ#<31Hvauf8ijE-8Lbl*69*-8kRc#fW0FmSP4a`O$3YZHzm;;p*aX zy=)pjdWY?R(D2u<*!uX2YOb0_SU{**bYxOA*KD=f8Z$in4%>=uvzGRKf9a2?1CssL zPHgu7^l;r4_A1ryBbjb3Y~TW1ft%8;g_AgdIy&O19io-^{c^4gezZemn>k(11#5vj z;DL334?KV;5CAXW4b}r6umSi2Kj05Gf&dT*f`AYNgTH_f5DLP;Ca_sKT`pq8VDmSN z5OG?Vzmalg{8#V10K;A?fj~e}0w$;4Bav;7`5v30A!=xaocas28t@GiaR|#$5+c+Y zpWR*kL;3PY))l>FGbMEl_xhaU3%xuI=3DNV&hVSc45j1k$h*2`lk>F|aP4qtAIS(8*Y5mj`|y@Y{6Zy~8TGdZ@^`__eejC%o50$+8`@p$sjkTuUhRKQpXAL9^euih> zG;Ix9P}qhY3ZCr#{3vhi)WM#Cg9SZB&I=mpzcQM4>DyKJTbtDJF2BXQJ~k7VkMVrh z&(ou$q%G3$Q<6IjCUs}r`K?ii`PE&m48zqQM!$6tcpDrpG#=Z$jrdB(z%tHs&|6cl zL;3QoC`AxYh?bw~8g3bw{9A!2;Qg|n8RnggHN{lHs352_`ob^2HD=D}6Ma2-TYKM^2bwX7eNmPF>X4{~>ht$DwGuD$9MOngZZy;f3GJ&MI8+Y#bk+TGSxPIk-Z2dDS+?Elh-&kFCBP&&5f&Kivm zoh@&jJZU~^f6(#);iyR9ta$egY-_W0z^7XHt<|gT`+lcx3 zNhXOpz26=!zM4^NzWF@kdKu?>)uF}i$vW{nwhDdpyw>$(M%rb5!jzM(KqRer@^~44 zvD{x46l?LY)Le1NxB7M_&LX9-j)!NQm2jm$?~SKDj`Ey33^P5$t$GJv?xKoNYEAMSRyl&+R%+*Ec)pl-SXx_ul zRrfxPlvE#G+_~Nx84e__u_&XK3yNQ6^nC5qsV4{&9IJzsK0!g0;v@YRMDZWUr!*Tp zOw+YTFY<#GY3zvUA1XQ?`0+2B(r@2>(GbV`O0Q0vyLr*-z*Bqo$5NxLur1gAo%}-j pu~e18dMVxEmYR2x7a2|({x+Ozf^4!YjM2>XHx+F0fdpTw{{WnSaxnk^ delta 4045 zcma*q2|U#6{s-{c8pe#qpkZVgyAZ#zWXm#kvShmrS(~ia));kKG#Mhv8YYxOXwgBO zN)ggxNkpXxS&u?QgcAPGoRjmv_uPA5_s;9}e$713?|J>^_xe50=llGAbCtu0yG_H0 zo2TH2{p07^a3i!59}SjHjBAD`Hp96P01`j}TL3h`1MmVEfDga|IDjA63g7_&fB*;r zLVz%^4Ily{fG9u$#DML9I3NK?0#X1OkOpJ`SwIeu2NVEBKnd6ZC<7{hDzFn!t7(R- z8`>uF*r@{$KmjxWO+c%L$4>h`Qy@5itQ6(XIPA{|@{0;0OLJ0c^+hBeR=+-PY=^c8<`L$4Al5@IHe^=s6p*~;$>;?=0BfuCi0jPi}ULT)K)@h2F&2$cPOwf`=7;kj3fV*k=nCiPU}?@;v1F#jl!X~vkLSLu#)0lW)a5v- z#gttB6R<2xxw?exGm=@A)COcsmIdbNLD<=Murw55pV=Tz*OvW z7ABq~<;=IISx({V9*FAFeJ!r@Cjk52M@Y3qNA8( zswqVQlH>Mbg(Uv$wfKqY&j|MmCA+%rB|G>tk3=y3PLYAgV4NWeDMb3$fo4>)b3_Ca zk`&>Gw4q&)4x|g|Q6LWyehmoH)`TdKmae9*2j|09S}uo;qmfyiWwFM^#eP4PQDAP_ zgaSppl=zT-K063{VCyF_ufFwL!_nnZ*-vgxIq@C+WB0<1D7}2-z?Q|n#;j>8lo6s+ z`Lb6c3bO=V55uY@^Iz`%BA9!mss=M0G$DR> zA&Y({BxD_XxUGS;C^H^-?}nK7k*3o;gZ!b5v*?y1A=HAa_&2MwSt2#xPdAj@cq~pC zd~>IJeD2c_F|FG9{F|azNku$rjU#YDQ%SLr-fXS@gGZG%YSjo2fBUdM(|Xkk`!Muv zxkemyq4YOuB#MTtVhQ^Mu-7mjJ&Qds`>Si$uZvVK^u-Bk>d;11Y|BBD4x1RBwDE4PVonRC0OP==5Jq*tg@sGXq686eO|+csx& zbJoqMU@AGhg0#IXdsFo*O=qWhPNmZ<&#jR30+e@qsD?d%)tBg&auh3g=D0~(Ps_@l z6gMKhyk_5kflB?$CPztR;vVz-u~8EXg#`s0m5}&(*JH0t-+q4?QWtRYX~EQF-2hL^ zqfCdm-LW=5XZC1drfk%T2#4}^y?Ejfbf;kk$%y4l@^mj zs~0MTMQ2L9my)t9=G;)WgByy2Xj_w|TleS3@wte)HLtB|N=*$0K4Qikf%yAGqu%0+ zbcuj=PoK9&3wS<^woHHj17q0N34X7@?zKWmq)MO3a>KL40M}Djitm0Q9q4(XP<26J zHm}|Ms)a{v_BJu;FHR5}H31UW`6F=$JnhrZ^_Z^SP%Dixo_8g2`nJ-3kpQb(LkIf( z^Vby*9pe<^Y3|ZwND|zB5FQaTM|($eN3v^hm_ONt=@%9m93DtEqjF+#G-*~Ddp`d9 z{@z2kUwEm^EDDivU-Kus)0p1jv(r1Qds`b+r}_MRpVeokoET)*@f8F)lts%$DOTt# zh_Oq-F3uV5YZm$Fh3kKNG<}<9?Y_(5?mKJ&^ewiFA|FDnav%dNeld_(gS8D8T`MqVQ zSA61J1Wn=5oauMBcm555y7XTORYmeM*Yg{!hwP3#C?jF-tl6fi9(Ai)clYoJb4wOC zTdHzn>`1aVF>YYlz`b_od-AS69gW_$<@_by0~@vc{beh+8wE6;GNyPH@ExQ-Qo)AX zLTtDt$Av&s^*tz)aK|>O4TbMQ(K1zj4L6ij42Axh0B&jfBLQH=g9ISpFi42oCy&BG zd}v-3G$@HYNZx;w3{D$?X5qlx90P}=f}jA%aI*~|5-34TW~9ElI-S8(iv}ANlUqF1 z=n-M+ZmtfS`EfiD;!kJ#m{HZhFph*E&45K{GaT9S!NC8QHYNpG^EOVmIkR@HW2K*- zA0wGwa-p@47Nm814lC_a;BL7_KRvW=RTepJ?9H34 z=Y7q$|AOAqfQ`4%)%3tUW8v?o=geBV)MGYsJgy>N=erilzASxMnEKVRyBaOMF72hr zI#*cPchhx4l^)6mf3fu|A68s(xf;FgrW57nJaxm!LqXE_uUnA!9cr${w4}cs0FxKQY~@T0@rv^0N-|Gw~xoDpCDRI>F9kzlQB+XdlDo zuRGQsY1#i@)56_oD0*P40ox1r^DnWBjr)ha&&rgt9U^h_$BX0C;%VaAI35?j(0~ZW zK?*3j+yi_#ybGAU;J^s7U2s@1)Bhkv1=_(qg2c)EIKsgR&~~#Lop-VI2beniKlQMP zdr1K^wPLy5blp5$K($H#)l+*LgVlDa^93546xp7oYv*^7o-xZrNEs@(-N>ZX2V(kR zPxbQIpKG&=#Co+_?j{|NJQL{@5d87TdUF=z*mL>V87+3+5brh}%B`>p@kY@e{^#qr zM;@5d|tsKENVOerrks3Y)Qc3u=Ab;)4->3oZvhbe-|ffZ7f z!8g!3v9O_x6WQVu1*C&Rhg*Hk)osSoSiT_^dP3&XrM0UW->4=t_J~`1SVN=3hIh*r z#CoZ5X)MhdDta`gz}O`|Md|I};pY0~R7u^A2kpLc$alva?QU#FlnEjl`A=KdzfJ0& zTbFRfY@ctf_ZL;T;96=*wHrg*GGd-{oPCWEBOkroa(!kXLy~ zb~A|xI8lU~#3&HOs6S@w_Yj)xb>U`MlJ!rWzt>rAncb|iW>g;ykj+qtv3Wue^#JJL ze~kM7bUNn$U!MpBPx$=;!SzMZqaxLQoPc8@NE2lpV_mm>akE5Rg8$M^&*ln`!88kr zxdPAhCGTG%*I)K^jFU?E%%Xim;z}On#*-!Bc*o$VE6qmW3P%ns4pBj=K)!&gq~)}=e%^Wo7F{5z*- z!XTpoCL$d^8us1!=%-lu+UG)DtAi>Xv3K?*Im`_%U~RRYp5EZSm*X={5E>qNf-K)B zKH`;$ZrI+s+qjhcb8uI1)02m7M(>|6mZ!GojAm8xC8$x@DDV)B3g`F=(b6Cp(n3gk zDf^}ITY~<{-!8-_Cx5gj6^(d(-nrZ%qMJvAi^C~ET?u5^6+m1swifoqH=A^o+X;||F&R^|Rzc#FC&mt7&C zbA;C}dm33^8lHV0$-$tGFF&%}`|Lt%^euSjXqUj*s)4XN{L|5=vh<{aVVG(|`koMd z{fmZY7gn9UJsmHFtHrcb)%Curg0tLi8W1fMo>{AV#AMn%&RYE0dvPr1>G9;REg#b~ zh?IC`C@ezDFjjEnWEw?NalC=F;9~#k+WWI+-B~Gi>o2e;J95-nBYHTRKW^I@zM%B$ zT?J+KZJLQ=-U&a%vzu%=F-o6RH>2YNqA!FN)X* zC5VlX`}0{JgQl<%+dvlq0f$4esXv}MH2-TAMF{-09&0rU66=C-EKycx6t`Sdf?w)-{f{Laz6FM2!(qzMZ;0(_DOMS!9VL=+a(8Dn zyFxEy%1}dWR(e+aV2^24Do!^ZIpUP5I|S^mH!T)_R5{XRz0~7pJ!b4-Wyo?lT&2}q zFkyUMXL%n>J3T>rO5t?P<>JMq_D~t|EC%aVjEgK;?DI)q?_`bG`|H;}Wkq`SWs4g& zE~I@=jcu#$z9cRdDS&={#R+#VB0q_piQq?J)IGV<@KX^d#OC rzgVv%UPgp*S(n%iYcmwu*B{@{`Fy^AeExVhUg$=zZFHf3 zIRl|jhZLkh9#};I3pFB{-VbH=LwnGG2!H`Z0W2T}hyxM;4!{GF00EE!qyZT~7LWtv z0R>bDly()DD@6N%^|_kRn49A`g;uNrogOFpQ$3t8Y#Cdw=hbh%@X&JyUb@ z|LrA4#>aj`(nZqZ)Ro0_|1+Fv6;1(QfC`ujt-@(>lV}PBNsVQxBi#;W7RZHImOh@C3Ys zZyi|VD0t`o4^Tjw?-3>8)>4aezPsXxBnpK>qfszV@)1_T;3D(l76B4Nm+>SUK&uvU zsb+bbSzoF&v(Cd09lmdBE{pjQr;U-`on1|;`olPzGrW9)pP(Lfr`B24;wz?6XSem( zP#I6GMA%o&f<#n`VV(%LOau*~(bB}MHM;ia;dyKYy4V5@kHpurs@2V@rZg)2cLnVy zQ0cHGOs86z!8D5?n45u|y3Y!fF@W{3B7PVVc}*wJqn^&5NPH8^hO@N9m>RYe?@_m^ z_4aW*MP9Gz#A2ea?eG%4oKm~Wnl(H=pyPCER-H!DbC{nNrI8f=^3}=88&cM)&Wfk= z&Q$DY@4719oNW&F*v&KWP4Qa$^IdQLVsY~DWOCu~542sW^cHe!IML|Fgr3UJjJq$9 z!Sz;*%p!w%Xh$P5g450kEM~Wnsghwaw}K-e&0oSh$%?wK7d{Q57%nEa8!vtqf_Wyt zUpq#1%2|3}pK!dwKglr`70D|eoNJ$4`?k>EeMS5VS+k#PSS0DV;8;*tRIs{(9kqLK zti;!bRP#D&$R*{`-Lxf`Ke>L>&hIEr!tBy%{Xw<>k@jkRPk1bW7J*RE4eln)T}S2` zSVjtY(Z;msP1>!3I(dG@G;T}IJSq#>Zf02`Ukh2zh(sOh2&aj5z}`OR+;~7~-SMK@ zw{6tjWsMlGcev^K1+G9R^ZL|I-PmTr25MVhC0k{m?Rd0zfnjGgojYuE!kqQE2T$CRLp2Z`Kvy*m=BRL zVS&bFE!#imU}1bC(e2sl13!tsx@_f4lIouIJFb36@}CjnMD2?L_#tt`g1DRr?#tMX z?5*ttLH%OuXkKg;-cx&{apup7(?yZo_f>5JX%9O)>Dle?daj)uPW&*6y!U*_$Mt=F z`MuK8bVX_B+IN}@#>v_}T>>XKX!5hzA&~>lxpo?^uJ=o zGWo6R_Fyx6T;R)i?v|DM>pX@JJ*hf2KEG+qp1n4;KFS$?z*P3vUnl+asI3Lh^?v&O z$VG9fFKtV{8!ey@1lWaN(6q{KDHrW=dNsDZIw|0kZ3*W3pkty}0s@;1^U5x}LHl9|cn{jjKmfyWGDYr4F z@=yH}I&M#k8S)xCLvH6CpQc?BkG_8L>t4y|bKl!G!Fe`TrCAZ)TUU+5Lrj_8GV<)% z7^e$FEz8<+9@+`!q3!<34+$)lhlWARXz#?_I|#R)RV4fW0bte6VsL1%nVBigG6>fC z?>>e~#3;-#=47W#nQbdugxe5_kL)>@H$+`EQd+&4aJkRHudEfv0{OAA7`+k4#JM)Wei2As8M8z2h zQ6O+R60$_g-yyN2Vq&_Wgf55)0U!YszzU!NHh>-A05}0IfE(Zeb^*KqAHWX?0D^!J zup7Vt!hi^X1w?^8fEXYSNC1)m4!{Faz+ONakO5=?xw;v`# z3V;sgla)>xGjK@uY-#QheM(d~kS1(n&R8h9X&6iP1?`mQGkAD+4e<095Lh z$f~D@8P$er5{x)QwSx(>hH8L1!2GNMXaZWmAwV0@0dxU9Kp!vwh=3tr1Q-J*fGKbo zI0Bdf=D<CI)o;L+sLi6bSl)A=J5`?71!gQp69uff|5PXKBUotpiv642NN86-j zi;luPe|{sx%E|%<5x8IuG}0c07DU*Z5QJa>W`k3Zi|FBDM+ps~;)sR>Sy-Cc%OxoO zXRpZ_swXAT%^zoHXN|M;q=pAkP7$PF92lpILJDI4eV`E$XA=}eg(ZY}V0HK)tO0An zS_Ifpm`4SM)m32vtfr}|>B#t4LAuJImyvL^uHtC@8#mm}6cbqNGx>AncqPR~4&~5& z;0NYz;tR^V)|(<$3-^AuCuPMxAAEl=P>;~hiSuq>8fea#IgHXnbnXAuDFMZ?0$&&T ziBVN7wn^;CKiIjUo7V7QAXt5U;zR1AoEtf>be09KhF8{cjQUK9)h}j{FZ%gyafNj> z(UznpyziBWI)^`uV;kb}Z=OT9hx-w8i+JB`%w-7IZN@bflspzA486JAJu&}z1d~!_ zbNNkvZ(=^1Qu7!jU??Fv)}N_1=n)~m-JrzZ^0$varXSfj%+=!mwp1mCxLEi%V(>T5 z)PVJM(&Mjxk&UC$opz$IICH=*6b8j`sU~4ecQKp15VVa#fu(?kd6{iNW}6j8 zf;X6-*?~iG!t5{_jRGH8U}I*NBuW?7hPCoE^3>y18Skn|*xfs`xijlVL@<>M_8O8k z?Ul)m=0qe=D{a%tW1ciIY# zuO3=SAQO%n=e!>`Fp*u9HB<15U9gMnHGI4I%J06{g{QgGQ}^GowLeO?jM0fU`z5_k zg=5-GDWCsz_Q9T3OP{-)yY|Rn%Ke9(!ulm?l*-Gp@xp^5!{sJZBO6!Bg+yixoL3Sv zOy=!T=0n?ZLuhk@m73ocCU~zR?tgRIr6m8bN!vwKpTQUV8%D4H#x=6ISLaEWw|a}b zoE+*>gM$zBS-wv4IC*z}%acGV3>d67JxlPii@JHEei`fD*CShbMRqQ`)40gQF*d$?K8zoAGA^Hn;SjIpF>5e#9-6|UJ@2|hEcsP=Aqmpz2 zkAo$^&kw>QY-DxJ%Ge5L=NsUOv!%KP1p5YhDnGAh1n%R z9QW6psqPf2bKu;}z9aolniOX^-CUnFrYD^nqTc7s^|34tl@5_B(^wRx7Y5Wn;V`wh zkRLNOj&v=+^T`=xpBM`$*Q1x?eNP0CpLJEPV6r1(7>C5U%RA0@TlPOP%`d!C?Am4D zE5N^~&E?;Ak=Br@^f}MeMC;t0srRKHk274hHd;86wvw|8^-q{?wjXecO_&dIkbN|7 zxM@G^+2pNBuI8`Imzlkt({yCSBK$!ymh0{}^AyDh`^v2oj*bELm&A-#D(xxz5|0_^ zH_^->C!L&=>>E$VLwB=YzRvEx-M}+gyjI)Hr}C6C%`VIP9Q#Kq=#V)~hfEo^)g(n% z52^UO=7}9B-j^tcbcO0bT?sjV_^%0ImbO0<09HIm00Lrx1(|&^C~lY&&8~n3C6Nuu z{vVRT=%^-{SWaRzV56cki>DGfC_vfX&T=O| zR_=bDWU7l1Q3(uVh}V#`Y5X0!W2_&wJ@0f-3COy)F`8}Z4d0%x4U%)tOQaTDc{1SO zqgFf5g}2Q;Vfu|6H?noOICw(enLSh9MQGuhR9Wyu-9p9PAAYIyuJ?&?zU4Z2MQi1q znX_O~s`t_Nfgfh(joM!-pWn`MEJD7{vCG^0s<0(5`KwiT6&k;Vcao$1oL4?jVKcY+ zWVY_wLWiv8>q3>;Ba94Z-BDfjnu-pG@^*)9cPb{`gZTF8t(i;6#)p<=l4&aSW767Z zXN7z?;3D*nb@BOs0A5YKePgV)) z+apoOxKb&-GaJ7pq>`#sG_fE*TOdD^-}9poGDs!!TR8rxV*Uj_PBHuIj`c@ce*B+l zVQw@8EwI&q?S=XJx7bC;{L|id*pRRX#xnEA&dq43B#EhWv)Q`&dj(NE2%zLLFK}}6 z+Jf2h^$x;W_y+h=Jv|5t@IK}hB)8P}D-7-`k`Are<{-%sINZ5fov7c$YaYV_<8_T3tUnt(E~W|2Og7hAPsk2fk0pPpKu zBd5_mEqv-af#N?`#^q`|y??Pu8NvI~!igZLEaA%=mt&IEk|c1+yG*j&w*;LP%`%d9 zE>mnW7wa(+_Qcg#+3bA^&DGCDOVAi!*szhdPBfT3hNwA88yO$ftuI~_?I*^h&{SuM z=<)Np`nIu2@^6R2+8S4rB{ZKu=ya7v4o6y9l^oJ=sHw01lf<69g)c>#BQUCFL z!Y~y7`vZdK3nGUED}BEK!=Q#FLW`u`Ht(q@5EJLQe&A$Vnd4B3iTHf($$M=9bBn}uCnZO8Sh`7aXELNBki zKk+W+a<8jdKu>&_z#qk`TvfY=bqnWIP4)JFaM3({Io}9cEc-R6BeO9}b2WyxT6#`i za#3?68UN(8kL`iZvf^=AI7VupNbT6qi8Fy~7c}puTHSMDQxiDF=$q6|Yhn?`2aX49 z+C+SgmT7n)_;O=N;d%7k~+3#h!%(etQnHut2cp_>G71BEXMrIiTbdwp4+?Gxk=rUgW3S ztv=)zK~25-7_xl3OLS`2WqozwlF%ITml|cg$zMYQBj|5Rk-QJeFz3IbWD8P4ha(|@ zb2@QD=2OWc4!t^l*(&DEJj;=zA?G=+7F)Y_-@Je32>xrT%))X$9U%|X5z>F2^*PW4 zI$}5I;zvLb9G(3A%%S=}t0;o+ul1PWUr*AdfugEv$XloB^+X9LD31jLYz!fTk>QRp zRkocq{j$^@0vuW1cECx zyq=z`gia1K!RMTceW=>aMLVF9=~AFEMZ0;uk~7>5;x{yiYbw2k3MD5OY>Wi+Ra|K9 eXMbcnY+1j!YGxIwdU2_DbY`GrV5 0) { serverinfo.amtAcmFqdn = matchingDomains; } + } if (args.notls == true) { serverinfo.https = false; } else { serverinfo.https = true; serverinfo.redirport = args.redirport; } if (typeof domain.userconsentflags == 'number') { serverinfo.consent = domain.userconsentflags; } if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) { serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); } diff --git a/views/default.handlebars b/views/default.handlebars index e5f1c76e..922fcc2f 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -2577,6 +2577,9 @@ r += ' Add Local'; r += ' Scan Network'; } + if ((features & 0x00100000) != 0) { // ACM activation + r += ' Activation'; + } } if (mesh.mtype == 2) { r += ' Add Agent'; @@ -2599,6 +2602,27 @@ Q('dp1devicename').focus(); } + // Intel AMT Activation + function showAcmActivation(meshid) { + if (xxdialogMode) return; + var servername = serverinfo.name, mesh = meshes[meshid]; + if ((servername.indexOf('.') == -1) || ((features & 2) != 0)) { servername = window.location.hostname; } // If the server name is not set or it's in LAN-only mode, use the URL hostname as server name. + var url, domainUrlNoSlash = domainUrl.substring(0, domainUrl.length - 1); + if (serverinfo.https == true) { + var portStr = (serverinfo.port == 443) ? '' : (":" + serverinfo.port); + url = "wss://" + servername + portStr + domainUrl; + } else { + var portStr = (serverinfo.port == 80) ? '' : (":" + serverinfo.port); + url = "ws://" + servername + portStr + domainUrl; + } + var x = "Perform Intel AMT admin control mode (ACM) activation to group \"" + EscapeHtml(mesh.name) + "\" by downloading the MeshCMD tool and running it like this:

"; + x += ''; + if (serverinfo.amtAcmFqdn != null) { + x += '
Intel AMT will need to be set with a Trusted FQDN in MEBx or have a wired LAN on the network: ' + serverinfo.amtAcmFqdn.join(', ') + '
'; + } + setDialogMode(2, "Intel® AMT activation", 9, null, x); + } + // Display the Intel AMT scanning dialog box function addAmtScanToMesh(meshid) { if (xxdialogMode) return; diff --git a/webserver.js b/webserver.js index dfc2112b..3bf12629 100644 --- a/webserver.js +++ b/webserver.js @@ -2164,7 +2164,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { const mesh = obj.meshes[ws.meshid]; if (mesh == null) { delete ws.meshid; ws.send(JSON.stringify({ errorText: 'Invalid device group' })); ws.close(); return; } if (mesh.mtype != 1) { ws.send(JSON.stringify({ errorText: 'Invalid device group type' })); ws.close(); return; } - + // Fetch the remote IP:Port for logging const remoteaddr = (req.ip.startsWith('::ffff:')) ? (req.ip.substring(7)) : req.ip; ws.remoteaddrport = remoteaddr + ':' + ws._socket.remotePort; @@ -2215,7 +2215,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { // Agent is asking the server to sign an Intel AMT ACM activation request var signResponse = parent.certificateOperations.signAcmRequest(domain, cmd, 'admin', amtpassword, ws.remoteaddrport, null, ws.meshid, null, null); - ws.send(JSON.stringify(signResponse)); + //ws.send(JSON.stringify(signResponse)); // DEBUG*************************** break; } default: {