From ba9b72c11e13e53cd89e522f62e51301cf56dd67 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Thu, 10 Dec 2020 00:03:00 -0800 Subject: [PATCH] Many improvements for Intel AMT agentless management. --- agents/MeshCmd-signed.exe | Bin 4409752 -> 4405264 bytes agents/MeshCmd64-signed.exe | Bin 4016024 -> 4011536 bytes agents/MeshService-signed.exe | Bin 3396008 -> 3396008 bytes agents/MeshService64-signed.exe | Bin 3002280 -> 3002280 bytes agents/meshcmd.js | 17 +++ agents/modules_meshcmd/identifiers.js | 208 -------------------------- mpsserver.js | 15 +- public/scripts/amt-wsman-0.2.0-min.js | 2 +- translate/translate.json | 8 +- views/default.handlebars | 4 +- 10 files changed, 34 insertions(+), 220 deletions(-) delete mode 100644 agents/modules_meshcmd/identifiers.js diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index a387ad5065218e7056ded6f7c22cfc4ca39645a8..773db0ea2703bd39030933352d0579a4d2e3da36 100644 GIT binary patch delta 1989 zcmZY63se(l76Ac*vrHAC(fK5eOE^8UqRB@K%AgB99gV8OVr9Fo`_mlweh8 z1s5#rjv`i0!3T;3QRK0377!4W6|z0zO0D36JQc$uTF@?g18#M@bLMx>%s1z|_y5g3 zRd9lwugN7>Ws=CpM+&|od61LPkycW6D@lh8RscP)66ga1U04wkZU=7xSbznWP0k&WRK)?=s2sQ$H@DXqTbl?aWU=!F3m|zQV0?xn% zuz)Mr3O=rFCApdZD|=wx4QvDMfDQf#wgV2>0l2`Uc3|G~haZRyWjv~$2vfun!gIW} zt94I^i-ht7g_G{NHuDlM1`*#i@GOaF3g2OcP$VH*x_O@wXUBN7rMGKiyiEjeg10h6 zw>MI^OO7WgahddUv~&sHtsq%EQi?Go!jkbgjEN2^FcC@-V^S24%N0r_6p3I#DMJcO zo{Y(f14BG|?R+Qi%$$lZ5+PhF!sCRx(g=UQ5W*EGR;W~B@-&nrOTpxrhzWgQ74D@T zx{_j93KAlTEEeC7Av_L>EOmySxHRFtSX86s+z2U@LM7&eE4+kCQ(f`k<=XIr90`jn zOu8O&a6q~z2Ajd58ok@-?2L4I{iRB5KjQEF6vaU#Osd3%`yo?2N|MWxaX2c~hzKa; z+YrGae2OWTi|7ia9Kz5UP?$LB$G32>gGD-nfzsa<*QHxdCX^_XgbD@X5;-z2n|1&5 z0gf$)pmZ1*E~OJLJNXtwSRtQARL1fR|F72*E53!(Z@u1?e_KU?DV2~*;iP+)3MCi^ zeMz+3^Ri;YN&VyDx4t)a-B17T0husKDGW}j8>(*d%Y%J;?m*ox^t*E-$KSdweg1u_ zz zyh|6p+JCEh`gK5e&xu!c5PQSvvnom z8KKtrMZft*O1vHQl!;c`>{xTIC!(t?=gaa3Nyn{g?>EQRms_o>s7Sx}X0N|&uDv%g zdEKVFwlUPljT@yum9L@hYi{IOE|!%R_(d*w>4$w^hJM!fkL73sCXQK)wWh(;!-aTa zEh&^UvPE^>%p@qx;FLML{%&f{&L=0B;`h3#!QAZu1k~JYL#%pwy<-&x5`W#UBA!6ch_WY$+tbiHG;~)s#j%%=75je z(>ouA%9KvS`R47kUf0l!o}rgF+m3wV`G6bPkRq8P8(tv zWmA@4)+;KBqQ`R8b18gSDAlA_lPL?E>s|!YMWc89{LkJX67e6W^k0Y8O;Cn8{9VVH zdqXZyPexpL;Ik}u9?bBYdWKL_FQ$SQ+B;^#p~kg)ZAAuc%0pR zRmIrlZEy0rj`od=mk8t5j&3$>H#M}XX^!)A_~$L6{;F7Oaqb>z(LQsrBWMnP7NRmR z=HguK&(C7I(=O?MZT0dCiTccre>{Iug|)bm2Md@v_3i78()%ov?Ny#q@?SmdJ});d z91SQiknq$)Eb3Lu?;1w6WgR7glPeq5XP6qAKs=C1*i8o(-Jp~@3jD*0t_OTE11X34HLQbzfAhWbubqD}R!`rywWN*TB=)HIWxgp|R2*Su;+rv}?YrXIJ4c(_ z*`coViZ%Xrl<7V>s7miXnl{m*=$;hs*)bQjP+h+LnKfVXyr!|H6jyhVtcPqL{W)@? zZ#Ki5(HZr107V?0YP>x^euikVyI*J(v_5azLm>(-`)&+G;dP&tCGh@|nxAlm}JiYoWSw5aeAMlK_FXv>?w zd^{7KC+&}EuB(d=XBYcQw2y1XZKf;jSlbSMF}$--py8ZFC-r7;-07%{4k!uNn2`+g XvtxG|n^9w|ud#{^7j695AHek=f8S7L delta 6154 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 diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 37709c7815877c6c72ca18c5c0eb29caa9224a35..ae3f1f6092e3bfd8b8889b8eaff262f8ab5968f2 100644 GIT binary patch delta 1967 zcmZY63se(l76)(>AP^`b5Pb3acu0s~9>_BxB8aviFD(%lwK67yj*x^TBZ!m}SSpH^ z72?WZEfvt?0ji+3HdtOND!W+~7a!27rJz+@#A*QpJ%_e8;8xqtncq1x-<|2Mbt zz&Ne!*%Z0Sh>RxnLfc4;Fxhz!|szSKtQR0RkSt6LL>idmhjg6Fhta81wp zf)m0tM19sQbfPv}ihRs4nVh<45K5@3$3pw*w=<80i>c*9LW?z~y&Fus)I=6ZC>5K~ z^cDSP1u4@JxeZ4$Je!c>{%D5=m!X_(xB{gUY7L1nnG6<4CDP#PY+OyL283+=Rzwh6sg>kYc9Nh$tiE{}}6h_*aiYLv~h9Bfht-s^VHb*`_$n?Ys<%n#p z-)!XZkSTABg2XdXWPCD`LL^*45?Cf=N=I30Wi|mvwY8>Vbs|?PDN)3<6N?dBL#iPR zn*)WZ@>L?1j|VKWIUJPtrno8HOfpPPW?>o)5>xx-;jYeq_yEUNLr^vhj8L#C{%R46 zO3{hzsiriM)n9rIIEh%?-+R3&|GJ6>CrQYq;hNqRm>d_OeCp!0@Ohzd(wKDkt#6Ip z^wa-;K!2E|0tQE#hH9Gp%wS)id$nm7`qR0Q@9*8FKmR$^%pNH8I+E!f;_TVoBGT_} z3CBo!dI~kf6BqImDauCz}`U5pYJX$$ke3xAS$ZEyYhs=V&mmEW{v$9Q5)=IH$i!>MiC$J<_g zByWx*gF3NEbGz^l%%WQF^!zI$QI*hd*k85CzVOS2PrDRx_4kYIu;tHYzvFYFKIVAV z)ntGB{z>zo-tD(9v{6W#5JI49b1 zi*ewZUSpA2BYFJ2x45zM=-nr4PI!s13VxBwq1qoDs@uwOtwf5c*zdI`UY1#aZKN|Z-#s(<+dY3` zc-i)S2`P`~KkFXT35P>}nsv-8&Z4#Hv_hK`xa(Nq=L-+r3h*;l%&O|HXz=`XZid&9 zoPo}o&kwOBks)Eejpx^0_abWJdU*AugY@SLH~;SSSKM<)Qui*r?8R)~e6d3tw-_%B z8Bo>4rF0fdlpI>wYxBP~=XAy2)W^hLj*b7YS|^nMkXpuFTYsf|@a)R2G=5(wPqL*o zP&?{UvU^xoUH;4Z+YL`zr&@xCd)>U(EjXD_?sSIn^$$vygteTFtv6qswiHxHov?X& zuzJC5g5V2hiCSsR zqa(*kOJ5yedmOYQALM_Oc&s2;|KhMKmQZ@IZeN?ljr^XIs#^En+B8LeoAEmfRkCx) z^Nm|Ki+oqDyP+PeVi6t-ZqMb8o$b?qQe~<7?8Bapv5I8d=3(y*$19p1j(-(jZWopk QSdcW&YP`viG7GNX0Mc4D-2eap delta 6175 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 diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 7ee74f20f961d582d55272f1f46d61b206dbf711..6dd0a4e6d5d872d3c43443bef3432f52f5114a8b 100644 GIT binary patch delta 755 zcmWl|3osJ^7yw}N+GJkMGd7Q5W|}c1N=}pssIP;igv>dBYJ5uu&ciqt(M}Obl*IYl2XokW(gwFg$A07|!n1}dZ8|pw^s0Z~S z5~831JOm9P8X7@kXaY^489WRz&>UJoOK1hHp$$9&ZJ`~+LL9V*4$u)gK|FMZF3=Sc zpc^DYcSwRB@F*lhPe_4Y(EB|PK^;+`yeO1oRBvxeW$ZYW#<_hfhRY{ec8&*n1O%B+ zVpoQC`}d|hT(N~zqYF%wI1(oj-={5BNcxW}A1zy?53jH@uUe5R>A77);<3(MB3e0i zXDcMK!aC1VdxO<5BHVJA^9_=$W9rfl#H@nt-mn+vCnA1L)YL?1WHbX+@|j)%`)q#O z+6;EEHUGj)TugsWgG1FSx@^J*+VTK z7QJl{NzdQB+~l{JnY6}V9Df@9m?|FyM6b-Ml)>RWU+|TCz$># zRW7q^zL2sggNn3;w(YEf5TU$B9b?N`b19x*p}cO7GARsK7(5RssqLR%Z1^0_`PLa# za?oA(9XY;08Hl_p8xnJiBJ_qisCaqGK$wZ$%N3-OTT^2 aHJFd)GN|~lyPBMg)vb)09VC501m>pM z56?gc=m?$QSxAA-kP2y#{z{B6Mkg>-7M;#?q0`DaQ;Z-H*8B~-#Ag0lk*vd#uTr+U z#D?eiZ^j`5jTR-joa*1w56@yeUWbWdiuXH)YfZ*uwjyi>>%y377}>OHdNbLT`BWOl z$xm^;#kH@z^jNK`+OJ`a8KuY zRD<-rrl`f)b&L4WNWbgF=+V}`ozp!#@n~b)cFNdBDyi1nGvw#2pt38fhKF~%e?VJK z+7%+7<&||j!eIh`ucI(4Zs1AukON!WSt5V5l02EzIv;i2j*_leQ{X)m;ao*US5u-l zX}D^igTrU_%`WvLI!44!-a_g8C$eObx-Rk!;HG6R=hY8qQ!kLMr%16YBLn;$A5YZP zk_dbCnSz_!<4ZYnvTiDuF)^p5OuT}NYj`=+%IHt0MeYCq diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index 43adb6f52dbd9860c78013ff4e7f2bdbdca0269a..05c0647771c7b3e477b77675201df1eb27c0b779 100644 GIT binary patch delta 730 zcmWl|3osJ^7y#gH9`nd+p4-ebo7b4fZi>sBq%f{w96FghxaM@EC;Bc z0~EcNs5*1b_6f?Ow-`A!Idqolfo8k3r6Gi!(@RTieRiKr>~|q zWZTQDss%*_n%64ZUYbA^$BDt*C@!eCV@ae&EJha92N7BMm~s-g5*AdbYBk8QSzy!I zZ_jxT^l8}z_$oz8pZLsHUgW86DkI-(4sR7Z7pXFEKauv%e7g|Kummr#1+u%Paqnb{rrXyy93==txuI1t+S3()dU6%Qw zQl0-knADh{%#Om5W%14%)*&)t-r;ldS#0X>+WSuuXQ$_LkUWem93$F_UV0(daVgsS zX^EAOlbKJChP$_mX~b*vAc-=07cE?#=NAjjH0n*HO48L?oyt}8YSx-KapF6DLEaw^ P&?xJ8$)fh?X4(8dP^daW delta 730 zcmWl|3oz3G901_kBQ}q*Li5^eV`N+!i`JdyE$-$~TpranqCz4!kK_Ix*IeYT99AOA zd$~7>I=jpa#^0 zIEaT@P#fw%T}Xg>P#+TEL3junKtpH*4?_|(h9=Mynn80&h7@Q4sgMTg&=Oif2DFAY z@CdYpOlT*|K-rHC;~ZRAEVdKNNpfbyJ_HFEr(OR3Z7L_cdi$Z;Oi0HFTzPC_jLSRT zURE71r_+hk)uu4{;@gqbJ>jPLXFNa>%0XDe-USTU{@Yy zw9LD2z@-K~S<<(c_D=HsaJ}dILU{znY}`GBLv9^Tw$x6LG$ztjCrG8ax%)^=5v9G> z?$^MQT*li#MqQQrrW5Z`7mF7PS|i68ZKGk+^|bzARo*L|5(R%GQyM`%S7{?=FK{jA zjIp=08}1|yHjvUp)4g?}N$I}T-Q}ds%(Ln19zlOKKJ*Q9EQl90Qkw&rJkDx%Q9+n* z@sJNcJ~#5Ww{&w!w>d?CM0swmL$9~uh!HjB=1m4uF5wqIafp= z<~zrFXfcw~Q~lP;h?ze>-3_Q6^~$B1?K!UpZ)OTtG6TYNhuGtDQ^8Z8{h5vEPQ^wv zck{SnVLvPUkt}?^%&swz@`5C`D8MbO+r+EU?u@|a>uRU1k4S7w%gF{$$5Pr2c46yk z1rM!G=^m>T`6$T}a-1MR`Uz>rr%Iz89pqhm(q-Wqu|q{^^BBTLY+a9KhO~0>3|(H& zVwU+gi`J%AuIZtK?kwk{YQIi=PfeoReleaseDate -// bios_vendor = BIOS->Manufacturer -// bios_version = BIOS->SMBIOSBIOSVersion -// board_name = BASEBOARD->Product = ioreg/board-id -// board_serial = BASEBOARD->SerialNumber = ioreg/serial-number | ioreg/IOPlatformSerialNumber -// board_vendor = BASEBOARD->Manufacturer = ioreg/manufacturer -// board_version = BASEBOARD->Version - diff --git a/mpsserver.js b/mpsserver.js index 4d5fc828..e14583bd 100644 --- a/mpsserver.js +++ b/mpsserver.js @@ -442,7 +442,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { } else { // We are under the limit, create the new device. // Node is not in the database, add it. Credentials will be empty until added by the user. - var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, host: null, domain: domainid, intelamt: { user: '', pass: '', tls: 0, state: 2 } }; + var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, icon: (socket.tag.meiState.isBatteryPowered) ? 2 : 1, host: socket.remoteAddr, domain: domainid, intelamt: { user: (typeof socket.tag.meiState.amtuser == 'string') ? socket.tag.meiState.amtuser : '', pass: (typeof socket.tag.meiState.amtpass == 'string') ? socket.tag.meiState.amtpass : '', tls: 0, state: 2 } }; + if ((typeof socket.tag.meiState.desc == 'string') && (socket.tag.meiState.desc.length > 0) && (socket.tag.meiState.desc.length < 1024)) { device.desc = socket.tag.meiState.desc; } obj.db.Set(device); // Event the new node @@ -457,7 +458,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { return; } else { // Node is not in the database, add it. Credentials will be empty until added by the user. - var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, host: null, domain: domainid, intelamt: { user: '', pass: '', tls: 0, state: 2 } }; + var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, icon: (socket.tag.meiState.isBatteryPowered) ? 2 : 1, host: socket.remoteAddr, domain: domainid, intelamt: { user: (typeof socket.tag.meiState.amtuser == 'string') ? socket.tag.meiState.amtuser : '', pass: (typeof socket.tag.meiState.amtpass == 'string') ? socket.tag.meiState.amtpass : '', tls: 0, state: 2 } }; + if ((typeof socket.tag.meiState.desc == 'string') && (socket.tag.meiState.desc.length > 0) && (socket.tag.meiState.desc.length < 1024)) { device.desc = socket.tag.meiState.desc; } obj.db.Set(device); // Event the new node @@ -578,7 +580,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { var domain = obj.parent.config.domains[mesh.domain]; socket.tag.domain = domain; socket.tag.domainid = mesh.domain; - socket.tag.name = ''; + if (socket.tag.name == null) { socket.tag.name = ''; } socket.tag.nodeid = 'node/' + mesh.domain + '/' + nodeid; // Turn 16bit systemid guid into 48bit nodeid that is base64 encoded socket.tag.meshid = mesh._id; socket.tag.connectTime = Date.now(); @@ -596,7 +598,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { } else { // We are under the limit, create the new device. // Node is not in the database, add it. Credentials will be empty until added by the user. - var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, host: null, domain: mesh.domain, intelamt: { user: '', pass: '', tls: 0, state: 2 } }; + var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, icon: (socket.tag.meiState.isBatteryPowered) ? 2 : 1, host: socket.remoteAddr, domain: mesh.domain, intelamt: { user: (typeof socket.tag.meiState.amtuser == 'string') ? socket.tag.meiState.amtuser : '', pass: (typeof socket.tag.meiState.amtpass == 'string') ? socket.tag.meiState.amtpass : '', tls: 0, state: 2 } }; + if ((typeof socket.tag.meiState.desc == 'string') && (socket.tag.meiState.desc.length > 0) && (socket.tag.meiState.desc.length < 1024)) { device.desc = socket.tag.meiState.desc; } obj.db.Set(device); // Event the new node @@ -612,7 +615,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { return; } else { // Node is not in the database, add it. Credentials will be empty until added by the user. - var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, host: null, domain: mesh.domain, intelamt: { user: '', pass: '', tls: 0, state: 2 } }; + var device = { type: 'node', mtype: 1, _id: socket.tag.nodeid, meshid: socket.tag.meshid, name: socket.tag.name, icon: (socket.tag.meiState.isBatteryPowered) ? 2 : 1, host: socket.remoteAddr, domain: mesh.domain, intelamt: { user: (typeof socket.tag.meiState.amtuser == 'string') ? socket.tag.meiState.amtuser : '', pass: (typeof socket.tag.meiState.amtpass == 'string') ? socket.tag.meiState.amtpass : '', tls: 0, state: 2 } }; + if ((typeof socket.tag.meiState.desc == 'string') && (socket.tag.meiState.desc.length > 0) && (socket.tag.meiState.desc.length < 1024)) { device.desc = socket.tag.meiState.desc; } obj.db.Set(device); // Event the new node @@ -919,6 +923,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { case 'meiState': if (socket.tag.connType != 2) break; // Only accept MEI state on CIRA-LMS connection socket.tag.meiState = jsondata.value; + if (((socket.tag.name == '') || (socket.tag.name == null)) && (typeof jsondata.value.OsHostname == 'string')) { socket.tag.name = jsondata.value.OsHostname; } if (obj.parent.amtManager != null) { obj.parent.amtManager.mpsControlMessage(socket.tag.nodeid, socket, socket.tag.connType, jsondata); } break; case 'deactivate': diff --git a/public/scripts/amt-wsman-0.2.0-min.js b/public/scripts/amt-wsman-0.2.0-min.js index a8eb3bca..86d1ae50 100644 --- a/public/scripts/amt-wsman-0.2.0-min.js +++ b/public/scripts/amt-wsman-0.2.0-min.js @@ -1 +1 @@ -var WsmanStackCreateService=function(e,s,r,a,o,t){var p={};function l(e){if(!e)return"";var s=" ";for(var r in e)e.hasOwnProperty(r)&&0===r.indexOf("@")&&(s+=r.substring(1)+'="'+e[r]+'" ');return s}function w(e){if(!e)return"";if("string"==typeof e)return e;if(e.InstanceID)return''+e.InstanceID+"";var s="";for(var r in e)if(e.hasOwnProperty(r)){if(s+='',e[r].ReferenceParameters){s+="",s+=""+e[r].Address+""+e[r].ReferenceParameters.ResourceURI+"";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o"+a[o].Value+"";else s+=""+a.Value+"";s+=""}else s+=e[r];s+=""}return s+=""}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('
"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,d,c){var m="",i="";null!=d&&null!=c&&(m="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken"+d+''+c+"",i=''),l=null!=l&&null!=l?""+l+"":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(n)+m+'
'+r+""+i+"PT0.000000S";p.PerformAjax(u+"",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(o)+"";p.PerformAjax(t+"",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S"+w(t)+""+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+=""+s[o].Address+""+s[o].ReferenceParameters.ResourceURI+"";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n"+t[n].Value+"";else a+=""+t.Value+"";a+=""}else if(Array.isArray(s[o]))for(n=0;n"+s[o][n].toString()+"";else a+=""+s[o].toString()+"";return a+=""}(e,s);p.PerformAjax(n+"",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(t)+"';for(var d in s)l+=""+s[d]+"";p.PerformAjax(l+"",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S'+s+"",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(s)+"";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var d in r)if(null!=r[d])if(Array.isArray(r[d]))for(var c in r[d])l+=""+r[d][c]+"";else l+=""+r[d]+"";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+""+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(n)+"'+r+"",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S'+s+"99999999",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;o'+e.InstanceID+"";var s="";for(var r in e)if(e.hasOwnProperty(r)){if(s+='',e[r].ReferenceParameters){s+="",s+=""+e[r].Address+""+e[r].ReferenceParameters.ResourceURI+"";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o"+a[o].Value+"";else s+=""+a.Value+"";s+=""}else s+=e[r];s+=""}return s+=""}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('
"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,c,d){var m="",i="";null!=c&&null!=d&&(m="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken"+c+''+d+"",i=''),l=null!=l&&null!=l?""+l+"":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(n)+m+'
'+r+""+i+"PT0.000000S";p.PerformAjax(u+"",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"+w(o)+"";p.PerformAjax(t+"",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S"+w(t)+""+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+=""+s[o].Address+""+s[o].ReferenceParameters.ResourceURI+"";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n"+t[n].Value+"";else a+=""+t.Value+"";a+=""}else if(Array.isArray(s[o]))for(n=0;n"+s[o][n].toString()+"";else a+=""+s[o].toString()+"";return a+=""}(e,s);p.PerformAjax(n+"",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(t)+"';for(var c in s)l+=""+s[c]+"";p.PerformAjax(l+"",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60.000S'+s+"",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(s)+"";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get"+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var c in r)if(null!=r[c])if(Array.isArray(r[c]))for(var d in r[c])l+=""+r[c][d]+"";else l+=""+r[c]+"";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+""+p.Address+""+e+""+p.NextMessageId+++"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S"+w(n)+"'+r+"",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull"+p.Address+""+e+""+p.NextMessageId+++'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymousPT60S'+s+"99999999",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;o29->812" + "default.handlebars->29->813" ] }, { @@ -21244,7 +21244,7 @@ "zh-chs": "Linux x86（64位）", "zh-cht": "Linux x86（64位）", "xloc": [ - "default.handlebars->29->813" + "default.handlebars->29->812" ] }, { @@ -40268,7 +40268,7 @@ "zh-chs": "Windows（32位）", "zh-cht": "Windows（32位）", "xloc": [ - "default.handlebars->29->810" + "default.handlebars->29->811" ] }, { @@ -40288,7 +40288,7 @@ "zh-chs": "Windows（64位）", "zh-cht": "Windows（64位）", "xloc": [ - "default.handlebars->29->811" + "default.handlebars->29->810" ] }, { diff --git a/views/default.handlebars b/views/default.handlebars index 9669e852..d979e46e 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -6725,10 +6725,10 @@ function p10showMeshCmdDialog(mode, nodeid) { if (xxdialogMode) return; var y = '