All JavaScript code is now 'strict'
Ylian Saint-Hilaire committed
Aug 27, 2018 at 12:24 UTC
312b937e626d7576d68ada3bbeb1469fe1e6457d
29 files changed
+129
-78
amtevents.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a MeshAgent object, called upon connection
12
module.exports.CreateAmtEventsHandler = function (parent) {
13
var obj = {};
amtscanner.js
+3
-2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a Intel AMT Scanner object
12
module.exports.CreateAmtScanner = function (parent) {
13
var obj = {};
@@ -68,11 +70,10 @@ module.exports.CreateAmtScanner = function (parent) {
70
rangeinfo.server.on('listening', () => {
71
for (var i = rangeinfo.min; i <= rangeinfo.max; i++) { rangeinfo.server.send(obj.rpacket, 623, obj.IPv4NumToStr(i)); }
72
});
71
- rangeinfo.timer = setTimeout(function () {
73
+ rangeinfo.timer = setTimeout(function () { // ************************* USER OF OUTER VARS!!!!!!!!!!!!!!!
74
obj.parent.DispatchEvent(['*', userid], obj, { action: 'scanamtdevice', range: rangeinfo.range, results: rangeinfo.results, nolog: 1 });
75
rangeinfo.server.close();
76
delete rangeinfo.server;
75
- delete rangeinfo;
77
}, 3000);
78
return true;
79
}
amtscript.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.1.0e
7
*/
8
9
+'use strict';
10
+
11
module.exports.CreateAmtScriptEngine = function () {
12
var o = {};
13
certoperations.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
module.exports.CertificateOperations = function () {
12
var obj = {};
13
common.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
const crypto = require('crypto');
12
13
// Binary encoding and decoding functions
db.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.2
7
*/
8
9
+'use strict';
10
+
11
//
12
// Construct Meshcentral database object
13
//
exeHandler.js
+2
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
14
limitations under the License.
15
*/
16
17
+'use strict';
18
+
19
const exeJavaScriptGuid = 'B996015880544A19B7F7E9BE44914C18';
20
const exeMeshPolicyGuid = 'B996015880544A19B7F7E9BE44914C19';
21
interceptor.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.3
7
*/
8
9
+'use strict';
10
+
11
const crypto = require('crypto');
12
const common = require('./common.js');
13
letsEncrypt.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.2
7
*/
8
9
+'use strict';
10
+
11
module.exports.CreateLetsEncrypt = function (parent) {
12
try {
13
const greenlock = require('greenlock');;
meshaccelerator.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
const crypto = require('crypto');
12
var certStore = null;
13
meshagent.js
+5
-2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
var AgentConnectCount = 0;
12
13
// Construct a MeshAgent object, called upon connection
@@ -423,9 +425,10 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
425
426
// Process incoming agent JSON data
427
function processAgentData(msg) {
426
- var str = msg.toString('utf8');
428
+ var str = msg.toString('utf8'), command = null;
429
if (str[0] == '{') {
428
- try { command = JSON.parse(str) } catch (e) { console.log('Unable to parse agent JSON (' + obj.remoteaddr + '): ' + str); return; } // If the command can't be parsed, ignore it.
430
+ try { command = JSON.parse(str) } catch (ex) { console.log('Unable to parse agent JSON (' + obj.remoteaddr + '): ' + str, ex); return; } // If the command can't be parsed, ignore it.
431
+ if (typeof command != 'object') { return; }
432
switch (command.action) {
433
case 'msg':
434
{
meshcentral.js
+5
-4
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// If app metrics is available
12
if (process.argv[2] == '--launch') { try { require('appmetrics-dash').monitor({ url: '/', title: 'MeshCentral', port: 88, host: '127.0.0.1' }); } catch (e) { } }
13
@@ -420,7 +422,7 @@ function CreateMeshCentralServer(config, args) {
422
if ((obj.args.nousers == true) && (obj.args.userallowedip == null)) { obj.args.userallowedip = "::1,127.0.0.1"; }
423
424
// Set the session length to 60 minutes if not set and set a random key if needed
423
- if ((obj.args.sessiontime == null) || (typeof obj.args.sessiontime != 'number') || (obj.args.sessiontime < 1)) { obj.args.sessiontime = 60; }
425
+ if ((obj.args.sessiontime != null) && ((typeof obj.args.sessiontime != 'number') || (obj.args.sessiontime < 1))) { delete obj.args.sessiontime; }
426
if (!obj.args.sessionkey) { obj.args.sessionkey = buf.toString('hex').toUpperCase(); }
427
428
// Start eh web server and if needed, the redirection web server.
@@ -594,7 +596,6 @@ function CreateMeshCentralServer(config, args) {
596
}
597
}
598
if ((fromPeerServer == null) && (obj.multiServer != null) && ((typeof event != 'object') || (event.nopeers != 1))) { obj.multiServer.DispatchEvent(ids, source, event); }
597
- delete targets;
599
}
600
601
// Get the connection state of a node
@@ -742,6 +743,7 @@ function CreateMeshCentralServer(config, args) {
743
744
if (obj.multiServer == null) {
745
// Single server mode
746
+ var eventConnectChange = 0;
747
748
// Remove the agent connection from the nodes connection list
749
var state = obj.connectivityByNode[nodeid];
@@ -1082,7 +1084,7 @@ function CreateMeshCentralServer(config, args) {
1084
if ((name != null) && (meshServerState[name] != val)) { if ((val == null) && (meshServerState[name] != null)) { delete meshServerState[name]; changed = true; } else { if (meshServerState[name] != val) { meshServerState[name] = val; changed = true; } } }
1085
if (changed == false) return;
1086
}
1085
- r = 'time=' + Date.now() + '\r\n';
1087
+ var r = 'time=' + Date.now() + '\r\n';
1088
for (var i in meshServerState) { r += (i + '=' + meshServerState[i] + '\r\n'); }
1089
obj.fs.writeFileSync(obj.getConfigFilePath('serverstate.txt'), r);
1090
}
@@ -1173,7 +1175,6 @@ function InstallModules(modules, func) {
1175
function InstallModule(modulename, func, tag1, tag2) {
1176
try {
1177
var module = require(modulename);
1176
- delete module;
1178
} catch (e) {
1179
console.log('Installing ' + modulename + '...');
1180
var child_process = require('child_process');
meshmail.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a MeshAgent object, called upon connection
12
module.exports.CreateMeshMain = function (parent) {
13
var obj = {};
meshrelay.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
module.exports.CreateMeshRelay = function (parent, ws, req, domain) {
12
var obj = {};
13
obj.ws = ws;
meshscanner.js
+5
-3
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a Mesh Scanner object
12
// TODO: We need once "server4" and "server6" per interface, or change the default multicast interface as we send.
13
module.exports.CreateMeshScanner = function (parent) {
@@ -27,9 +29,9 @@ module.exports.CreateMeshScanner = function (parent) {
29
var ipv4 = ['*'], ipv6 = ['*']; // Bind to IN_ADDR_ANY always
30
var interfaces = require('os').networkInterfaces();
31
for (var i in interfaces) {
30
- var interface = interfaces[i];
31
- for (var j in interface) {
32
- var interface2 = interface[j];
32
+ var xinterface = interfaces[i];
33
+ for (var j in xinterface) {
34
+ var interface2 = xinterface[j];
35
if ((interface2.mac != '00:00:00:00:00:00') && (interface2.internal == false)) {
36
if (interface2.family == 'IPv4') { ipv4.push(interface2.address); }
37
if (interface2.family == 'IPv6') { ipv6.push(interface2.address + '%' + i); }
meshuser.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a MeshAgent object, called upon connection
12
module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
13
var obj = {};
mpsserver.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a Intel AMT MPS server object
12
module.exports.CreateMpsServer = function (parent, db, args, certificates) {
13
var obj = {};
multiserver.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a Mesh Multi-Server object. This is used for MeshCentral-to-MeshCentral communication.
12
module.exports.CreateMultiServer = function (parent, args) {
13
var obj = {};
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.9-q",
3
+ "version": "0.1.9-r",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
pass.js
+2
@@ -1,5 +1,7 @@
1
// check out https://github.com/tj/node-pwd
2
3
+'use strict';
4
+
5
// Module dependencies.
6
const crypto = require('crypto');
7
public/commander.htm
+14
-15
@@ -754,21 +754,20 @@ function processSystemStatus(a,b,c,d){if(void 0==c.IPS_ScreenConfigurationServic
754
QV("go13",!0);d=0;for(var f in c)null!=c[f]&&c[f].status>d&&(d=c[f].status);400!=d&&errcheck(d,a)||(amtsysstate=c,updateSystemStatus())}var DMTFPowerStates=";;Power on;Light sleep;Deep sleep;Power cycle (Soft off);Off - Hard;Hibernate (Off soft);Soft off;Power cycle (Off-hard);Master bus reset;Diagnostic interrupt (NMI);Not applicable;Off - Soft graceful;Off - Hard graceful;Master bus reset graceful;Power cycle (Off - Soft graceful);Power cycle (Off - Hard graceful);Diagnostic interrupt (INIT)".split(";");
755
function updateSystemStatus(){if(amtsysstate&&!(99<currentView)){var a=0,b,c,d=TableStart(),f="",n=amtsysstate.AMT_GeneralSettings.response;t="Unknown";null!=amtsysstate.CIM_ServiceAvailableToElement&&(t=DMTFPowerStates[amtsysstate.CIM_ServiceAvailableToElement.responses[0].PowerState]);n.PowerSource&&(t+=[", Plugged-in",", On Battery"][n.PowerSource]);d+=TableEntry("Power",addLink(t,"showPowerActionDlg()"));b=n.HostName;c=n.DomainName;null!=c&&0<c.length&&(b+="."+c);b=0==b.length?"<i>None</i>":EscapeHtml(b);
756
d+=TableEntry("Name & Domain",addLinkConditional(b,"showEditNameDlg()",xxAccountAdminName));HardwareInventory&&(d+=TableEntry("System ID",guidToStr(HardwareInventory.CIM_ComputerSystemPackage.response.PlatformGUID.toLowerCase())));if(amtlogicalelements){var p="",r=getItem(amtlogicalelements,"CreationClassName","AMT_SetupAndConfigurationService");2==r.ProvisioningState&&5<amtversion&&(p=" activated in Admin Control Mode (ACM)",4==r.ProvisioningMode&&(p=" activated in Client Control Mode (CCM)",a=9));
757
-d+=TableEntry("Intel® ME","v"+getItem(amtlogicalelements,"InstanceID","AMT").VersionString+p)}QV("id_p13warning2",2!=amtsysstate.CIM_ServiceAvailableToElement.responses[0].PowerState);QV("id_p14warning2",2!=amtsysstate.CIM_ServiceAvailableToElement.responses[0].PowerState);if(200==amtsysstate.AMT_RedirectionService.status){var p=amtfeatures[0]=1==amtsysstate.AMT_RedirectionService.response.ListenerEnabled,r=amtfeatures[1]=0!=(amtsysstate.AMT_RedirectionService.response.EnabledState&2),l=amtfeatures[2]=
758
-0!=(amtsysstate.AMT_RedirectionService.response.EnabledState&1),k=amtfeatures[3]=void 0;5<amtversion&&null!=amtsysstate.CIM_KVMRedirectionSAP&&(k=amtfeatures[3]=6==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState&&2==amtsysstate.CIM_KVMRedirectionSAP.response.RequestedState||2==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState||6==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState);p&&(f+=", Redirection Port");r&&(f+=", Serial-over-LAN");l&&(f+=", IDE-Redirect");k&&(f+=", KVM");
759
-""==f&&(f=" None");d+=TableEntry("Active Features",addLinkConditional(f.substring(2),"showFeaturesDlg()",xxAccountAdminName))}null!=amtsysstate.IPS_KVMRedirectionSettingData&&amtsysstate.IPS_KVMRedirectionSettingData.response&&(p=amtsysstate.IPS_KVMRedirectionSettingData.response,f="Primary display",7<amtversion&&void 0!==p.DefaultScreen&&255>p.DefaultScreen&&(f=["Primary display","Secondary display","3rd display"][p.DefaultScreen]),f='<span title="The default remote display is the '+f.toLowerCase()+
760
-'">'+f+"</span>",1==p.Is5900PortEnabled&&(f+=", Port 5900 enabled"),1==p.OptInPolicy&&(f+=", "+p.OptInPolicyTimeout+" second"+(0<p.OptInPolicyTimeout?"s":"")+" opt-in"),f+=", "+p.SessionTimeout+" minute"+(0<p.SessionTimeout?"s":"")+" session timeout",9<amtversion&&null!=amtsysstate.IPS_ScreenConfigurationService?((p=0!=(amtsysstate.IPS_ScreenConfigurationService.response.EnabledState&1))&&(f+=", Blanking Allowed"),QV("id_DeskSBspan",p),Q("id_DeskSB").checked=!1):QV("id_DeskSBspan",!1),d+=TableEntry("Remote Desktop",
761
-f));5<amtversion&&null!=amtsysstate.IPS_OptInService&&void 0!=amtsysstate.IPS_OptInService.response&&(f="Unknown state",p=amtsysstate.IPS_OptInService.response.OptInRequired,0==p&&(f="Not Required"),1==p&&(f="Required for KVM only"),4294967295==p&&(f="Always Required"),1==amtsysstate.IPS_OptInService.response.CanModifyOptInPolicy&&(f=addLinkConditional(f,"showConsentDlg()",xxAccountAdminName)),d+=TableEntry("User Consent",f));if(null!=AmtSystemPowerSchemes)for(f=amtsysstate.CIM_ElementSettingData.responses,
762
-p=0;p<f.length;p++)if(f[p].SettingData&&1==f[p].IsCurrent&&"http://intel.com/wbem/wscim/1/amt-schema/1/AMT_SystemPowerScheme"==f[p].SettingData.ReferenceParameters.ResourceURI)for(r=f[p].SettingData.ReferenceParameters.SelectorSet.Selector[1].Value,l=0;l<AmtSystemPowerSchemes.length;l++)AmtSystemPowerSchemes[l].SchemeGUID==r&&(d+=TableEntry("Power Policy",addLinkConditional(AmtSystemPowerSchemes[l].Description.split(":")[1],'showPowerPolicyDlg("'+r+'")',xxAccountAdminName)));amtdeltatime&&(d+=TableEntry("Date & Time",
763
-(new Date((new Date).getTime()+amtdeltatime)).toLocaleString()));f=AddRefreshButton("PullSystemStatus()")+" ";f+=AddButton("Power Actions...","showPowerActionDlg()")+" ";f+=AddButton("Save State...","saveEntireAmtState()")+" ";f+=AddButton("Run Script...","script_runScriptDlg()")+" ";d+=TableEnd(f);QH(15,d);d="<table class=log1 cellpadding=0 cellspacing=0 style=width:100%;border-radius:8px>"+TableEnd("<div> "+AddRefreshButton("PullSystemStatus(1)")+" Changing network settings may cause this page to becaume unavailable.");
764
-d=d+"<br><h2>General Settings</h2>"+TableStart();f="";"<i>None</i>"!=b&&(1==n.SharedFQDN&&(f=", shared with OS"),0==n.SharedFQDN&&(f=", different from OS"));d+=TableEntry("Name & Domain",addLinkConditional(b+f,"showEditNameDlg(1)",xxAccountAdminName));b="Disabled";1==n.DDNSUpdateEnabled?b="Enabled each "+n.DDNSPeriodicUpdateInterval+" minutes, TTL is "+n.DDNSTTL+" minutes":1==n.DDNSUpdateByDHCPServerEnabled&&(b="Update by DHCP server");d+=TableEntry("Dynamic DNS",addLinkConditional(b,"showEditDnsDlg()",
765
-xxAccountAdminName));d+=TableEnd();for(c in amtsysstate.AMT_EthernetPortSettings.responses){b=amtsysstate.AMT_EthernetPortSettings.responses[c];if(b.WLANLinkProtectionLevel||1==c)amtwirelessif=c;if(0!=c||amtwirelessif==c||"00-00-00-00-00-00"!=b.MACAddress){0==c&&a++;d+="<br><h2>"+(amtwirelessif==c?"Wireless":"Wired")+" Interface</h2>";d+=TableStart();d+=TableEntry("Link state",1==b.LinkIsUp?"Link is up":"Link is down");"00-00-00-00-00-00"!=b.MACAddress&&(d+=TableEntry("MAC address",b.MACAddress));
766
-amtwirelessif==c&&xxWireless&&xxWireless.CIM_WiFiPortCapabilities.response&&(d+=TableEntry("State",addLinkConditional(xxWifiState[xxWireless.CIM_WiFiPort.response.EnabledState],"showWifiStateDlg()",xxAccountAdminName)),s=xxWireless.CIM_WiFiEndpoint.response.LANID,d+=TableEntry("Radio State",xxRadioState[xxWireless.CIM_WiFiEndpoint.response.EnabledState]+", SSID: "+(s?s:"<i>None</i>")));amtwirelessif!=c&&(d+=TableEntry("Respond to ping",addLinkConditional(["Disabled","ICMP response","RMCP response",
767
-"ICMP & RMCP response"][n.PingResponseEnabled+(n.RmcpPingResponseEnabled<<1)],"showPingActionDlg()",xxAccountAdminName)),d+=TableEntry("IPv4 state",addLinkConditional(1==b.DHCPEnabled?"Automatic using DHCP server":"Static IP address","showIPSetupDlg()",xxAccountAdminName)));d+=TableEntry("IPv4 address",isIpAddress(b.IPAddress,"None"));isIpAddress(b.DefaultGateway)&&(d+=TableEntry("IPv4 gateway / Mask",b.DefaultGateway+" / "+isIpAddress(b.SubnetMask,"None")));f=b.PrimaryDNS;isIpAddress(f)&&(b.SecondaryDNS&&
768
-(f+=" / "+b.SecondaryDNS),d+=TableEntry("IPv4 domain name server",f));if(200==amtsysstate.IPS_IPv6PortSettings.status&&5<amtversion){b=amtsysstate.IPS_IPv6PortSettings.responses[c];for(var r="Disabled",u,f=amtsysstate.CIM_ElementSettingData.responses,p=0;p<f.length;p++)f[p].SettingData&&f[p].SettingData.ReferenceParameters.SelectorSet.Selector.Value=="Intel(r) IPS IPv6 Settings "+c&&(u=1==f[p].IsCurrent);1==u&&(f=isIpAddress(b.IPv6Address)||isIpAddress(b.DefaultRouter)||isIpAddress(b.PrimaryDNS)||
769
-isIpAddress(b.SecondaryDNS),r="Enabled, Automatic "+(f?"& manual":"")+" addresses");d+=TableEntry("IPv6 state",addLinkConditional(r,"showIPv6StateDlg("+c+","+u+")",xxAccountAdminName));if(1==u){if(b.CurrentAddressInfo&&0<b.CurrentAddressInfo.length){b.CurrentAddressInfo=MakeToArray(b.CurrentAddressInfo);ipv6addr="";for(p=0;p<b.CurrentAddressInfo.length;p++)0<ipv6addr.length&&(ipv6addr+=", "),ipv6addr+=b.CurrentAddressInfo[p].split(",")[0];d+=TableEntry("IPv6 address",addLink(ipv6addr,"showIPv6AddrDlg("+
770
-c+',"'+b.CurrentAddressInfo+'")'))}else d+=TableEntry("IPv6 address","None");isIpAddress(b.CurrentDefaultRouter)&&(d+=TableEntry("IPv6 default router",b.CurrentDefaultRouter));isIpAddress(b.CurrentPrimaryDNS)&&(f=b.CurrentPrimaryDNS,isIpAddress(b.CurrentSecondaryDNS)&&(f+=" / "+b.CurrentSecondaryDNS),d+=TableEntry("IPv6 domain name server",f))}}d+=TableEnd()}}-1!=amtwirelessif&&0==(amtFirstPull&2)&&PullWireless();QH(19,d);1==a&&0==(amtFirstPull&4)&&PullSystemDefense();0==
771
-(amtFirstPull&8)&&(11<amtversion||11==amtversion&&5<amtversionmin)&&PullStorage();0==currentView&&go(1,1)}}function isIpAddress(a,b){return a&&null!=a&&0<a.length&&"::"!=a&&"::0"!=a?a:b}var IntelAmtEntireState,IntelAmtEntireStateCalls;
757
+d+=TableEntry("Intel® ME","v"+getItem(amtlogicalelements,"InstanceID","AMT").VersionString+p)}if(200==amtsysstate.AMT_RedirectionService.status){var p=amtfeatures[0]=1==amtsysstate.AMT_RedirectionService.response.ListenerEnabled,r=amtfeatures[1]=0!=(amtsysstate.AMT_RedirectionService.response.EnabledState&2),l=amtfeatures[2]=0!=(amtsysstate.AMT_RedirectionService.response.EnabledState&1),k=amtfeatures[3]=void 0;5<amtversion&&null!=amtsysstate.CIM_KVMRedirectionSAP&&(k=amtfeatures[3]=6==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState&&
758
+2==amtsysstate.CIM_KVMRedirectionSAP.response.RequestedState||2==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState||6==amtsysstate.CIM_KVMRedirectionSAP.response.EnabledState);p&&(f+=", Redirection Port");r&&(f+=", Serial-over-LAN");l&&(f+=", IDE-Redirect");k&&(f+=", KVM");""==f&&(f=" None");d+=TableEntry("Active Features",addLinkConditional(f.substring(2),"showFeaturesDlg()",xxAccountAdminName))}null!=amtsysstate.IPS_KVMRedirectionSettingData&&amtsysstate.IPS_KVMRedirectionSettingData.response&&
759
+(p=amtsysstate.IPS_KVMRedirectionSettingData.response,f="Primary display",7<amtversion&&void 0!==p.DefaultScreen&&255>p.DefaultScreen&&(f=["Primary display","Secondary display","3rd display"][p.DefaultScreen]),f='<span title="The default remote display is the '+f.toLowerCase()+'">'+f+"</span>",1==p.Is5900PortEnabled&&(f+=", Port 5900 enabled"),1==p.OptInPolicy&&(f+=", "+p.OptInPolicyTimeout+" second"+(0<p.OptInPolicyTimeout?"s":"")+" opt-in"),f+=", "+p.SessionTimeout+" minute"+(0<p.SessionTimeout?
760
+"s":"")+" session timeout",9<amtversion&&null!=amtsysstate.IPS_ScreenConfigurationService&&0!=(amtsysstate.IPS_ScreenConfigurationService.response.EnabledState&1)&&(f+=", Blanking Allowed"),d+=TableEntry("Remote Desktop",f));5<amtversion&&null!=amtsysstate.IPS_OptInService&&void 0!=amtsysstate.IPS_OptInService.response&&(f="Unknown state",p=amtsysstate.IPS_OptInService.response.OptInRequired,0==p&&(f="Not Required"),1==p&&(f="Required for KVM only"),4294967295==p&&(f="Always Required"),1==amtsysstate.IPS_OptInService.response.CanModifyOptInPolicy&&
761
+(f=addLinkConditional(f,"showConsentDlg()",xxAccountAdminName)),d+=TableEntry("User Consent",f));if(null!=AmtSystemPowerSchemes)for(f=amtsysstate.CIM_ElementSettingData.responses,p=0;p<f.length;p++)if(f[p].SettingData&&1==f[p].IsCurrent&&"http://intel.com/wbem/wscim/1/amt-schema/1/AMT_SystemPowerScheme"==f[p].SettingData.ReferenceParameters.ResourceURI)for(r=f[p].SettingData.ReferenceParameters.SelectorSet.Selector[1].Value,l=0;l<AmtSystemPowerSchemes.length;l++)AmtSystemPowerSchemes[l].SchemeGUID==
762
+r&&(d+=TableEntry("Power Policy",addLinkConditional(AmtSystemPowerSchemes[l].Description.split(":")[1],'showPowerPolicyDlg("'+r+'")',xxAccountAdminName)));amtdeltatime&&(d+=TableEntry("Date & Time",(new Date((new Date).getTime()+amtdeltatime)).toLocaleString()));f=AddRefreshButton("PullSystemStatus()")+" ";f+=AddButton("Power Actions...","showPowerActionDlg()")+" ";f+=AddButton("Save State...","saveEntireAmtState()")+" ";f+=AddButton("Run Script...","script_runScriptDlg()")+" ";d+=TableEnd(f);QH(15,
763
+d);d="<table class=log1 cellpadding=0 cellspacing=0 style=width:100%;border-radius:8px>"+TableEnd("<div> "+AddRefreshButton("PullSystemStatus(1)")+" Changing network settings may cause this page to becaume unavailable.");d=d+"<br><h2>General Settings</h2>"+TableStart();f="";"<i>None</i>"!=b&&(1==n.SharedFQDN&&(f=", shared with OS"),0==n.SharedFQDN&&(f=", different from OS"));d+=TableEntry("Name & Domain",addLinkConditional(b+f,"showEditNameDlg(1)",xxAccountAdminName));b="Disabled";1==n.DDNSUpdateEnabled?
764
+b="Enabled each "+n.DDNSPeriodicUpdateInterval+" minutes, TTL is "+n.DDNSTTL+" minutes":1==n.DDNSUpdateByDHCPServerEnabled&&(b="Update by DHCP server");d+=TableEntry("Dynamic DNS",addLinkConditional(b,"showEditDnsDlg()",xxAccountAdminName));d+=TableEnd();for(c in amtsysstate.AMT_EthernetPortSettings.responses){b=amtsysstate.AMT_EthernetPortSettings.responses[c];if(b.WLANLinkProtectionLevel||1==c)amtwirelessif=c;if(0!=c||amtwirelessif==c||"00-00-00-00-00-00"!=b.MACAddress){0==c&&a++;d+="<br><h2>"+
765
+(amtwirelessif==c?"Wireless":"Wired")+" Interface</h2>";d+=TableStart();d+=TableEntry("Link state",1==b.LinkIsUp?"Link is up":"Link is down");"00-00-00-00-00-00"!=b.MACAddress&&(d+=TableEntry("MAC address",b.MACAddress));amtwirelessif==c&&xxWireless&&xxWireless.CIM_WiFiPortCapabilities.response&&(d+=TableEntry("State",addLinkConditional(xxWifiState[xxWireless.CIM_WiFiPort.response.EnabledState],"showWifiStateDlg()",xxAccountAdminName)),s=xxWireless.CIM_WiFiEndpoint.response.LANID,d+=TableEntry("Radio State",
766
+xxRadioState[xxWireless.CIM_WiFiEndpoint.response.EnabledState]+", SSID: "+(s?s:"<i>None</i>")));amtwirelessif!=c&&(d+=TableEntry("Respond to ping",addLinkConditional(["Disabled","ICMP response","RMCP response","ICMP & RMCP response"][n.PingResponseEnabled+(n.RmcpPingResponseEnabled<<1)],"showPingActionDlg()",xxAccountAdminName)),d+=TableEntry("IPv4 state",addLinkConditional(1==b.DHCPEnabled?"Automatic using DHCP server":"Static IP address","showIPSetupDlg()",xxAccountAdminName)));d+=TableEntry("IPv4 address",
767
+isIpAddress(b.IPAddress,"None"));isIpAddress(b.DefaultGateway)&&(d+=TableEntry("IPv4 gateway / Mask",b.DefaultGateway+" / "+isIpAddress(b.SubnetMask,"None")));f=b.PrimaryDNS;isIpAddress(f)&&(b.SecondaryDNS&&(f+=" / "+b.SecondaryDNS),d+=TableEntry("IPv4 domain name server",f));if(200==amtsysstate.IPS_IPv6PortSettings.status&&5<amtversion){b=amtsysstate.IPS_IPv6PortSettings.responses[c];for(var r="Disabled",u,f=amtsysstate.CIM_ElementSettingData.responses,p=0;p<f.length;p++)f[p].SettingData&&f[p].SettingData.ReferenceParameters.SelectorSet.Selector.Value==
768
+"Intel(r) IPS IPv6 Settings "+c&&(u=1==f[p].IsCurrent);1==u&&(f=isIpAddress(b.IPv6Address)||isIpAddress(b.DefaultRouter)||isIpAddress(b.PrimaryDNS)||isIpAddress(b.SecondaryDNS),r="Enabled, Automatic "+(f?"& manual":"")+" addresses");d+=TableEntry("IPv6 state",addLinkConditional(r,"showIPv6StateDlg("+c+","+u+")",xxAccountAdminName));if(1==u){if(b.CurrentAddressInfo&&0<b.CurrentAddressInfo.length){b.CurrentAddressInfo=MakeToArray(b.CurrentAddressInfo);ipv6addr="";for(p=0;p<b.CurrentAddressInfo.length;p++)0<
769
+ipv6addr.length&&(ipv6addr+=", "),ipv6addr+=b.CurrentAddressInfo[p].split(",")[0];d+=TableEntry("IPv6 address",addLink(ipv6addr,"showIPv6AddrDlg("+c+',"'+b.CurrentAddressInfo+'")'))}else d+=TableEntry("IPv6 address","None");isIpAddress(b.CurrentDefaultRouter)&&(d+=TableEntry("IPv6 default router",b.CurrentDefaultRouter));isIpAddress(b.CurrentPrimaryDNS)&&(f=b.CurrentPrimaryDNS,isIpAddress(b.CurrentSecondaryDNS)&&(f+=" / "+b.CurrentSecondaryDNS),d+=TableEntry("IPv6 domain name server",f))}}d+=TableEnd()}}-1!=
770
+amtwirelessif&&0==(amtFirstPull&2)&&PullWireless();QH(19,d);1==a&&0==(amtFirstPull&4)&&PullSystemDefense();0==(amtFirstPull&8)&&(11<amtversion||11==amtversion&&5<amtversionmin)&&PullStorage();0==currentView&&go(1,1)}}function isIpAddress(a,b){return a&&null!=a&&0<a.length&&"::"!=a&&"::0"!=a?a:b}var IntelAmtEntireState,IntelAmtEntireStateCalls;
771
function saveEntireAmtState(){if(!xxdialogMode){var a="",b=new Date;amtsysstate&&(a="-"+amtsysstate.AMT_GeneralSettings.response.HostName);a+="-"+b.getFullYear()+"-"+("0"+(b.getMonth()+1)).slice(-2)+"-"+("0"+b.getDate()).slice(-2)+"-"+("0"+b.getHours()).slice(-2)+"-"+("0"+b.getMinutes()).slice(-2);c18.value="amtstate"+a+".json";setDialogMode(19,"Save Entire Intel® AMT State",3,saveEntireAmtStateOk)}}
772
function saveEntireAmtStateOk(){IntelAmtEntireState={webappversion:version,localtime:Date(),utctime:(new Date).toUTCString(),isotime:(new Date).toISOString()};QH(36,"Fetching entire state, please wait...");setDialogMode(1,"Save Entire Intel® AMT State",0,null);IntelAmtEntireStateCalls=3;amtstack.BatchEnum(null,AllWsman,saveEntireAmtStateOk2,null,!0);amtstack.GetAuditLog(saveEntireAmtStateOk3);amtstack.GetMessageLog(saveEntireAmtStateOk4)}
773
function saveEntireAmtStateOk2(a,b,c,d){IntelAmtEntireState.wsmanenums=c;saveEntireAmtStateDone()}function saveEntireAmtStateOk3(a,b){IntelAmtEntireState.auditlog=b;saveEntireAmtStateDone()}function saveEntireAmtStateOk4(a,b){IntelAmtEntireState.eventlog=b;saveEntireAmtStateDone()}function saveEntireAmtStateDone(){0==--IntelAmtEntireStateCalls&&(setDialogMode(),saveAs(data2blob(JSON.stringify(IntelAmtEntireState,null," ").replace(/\n/g,"\r\n")),c18.value))}
redirserver.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// ExpressJS login sample
12
// https://github.com/expressjs/express/blob/master/examples/auth/index.js
13
swarmserver.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// Construct a legacy Swarm Server server object
12
module.exports.CreateSwarmServer = function (parent, db, args, certificates) {
13
var obj = {};
views/default-mobile.handlebars
+31
-30
@@ -513,12 +513,17 @@
513
</div>
514
<iframe name="fileUploadFrame" style=display:none></iframe>
515
<script>
516
+ 'use strict';
517
var debugLevel = parseInt('{{{debuglevel}}}');
518
var features = parseInt('{{{features}}}');
519
+ var sessionTime = parseInt("{{{sessiontime}}}");
520
+ var domain = "{{{domain}}}";
521
+ var domainUrl = "{{{domainurl}}}";
522
var meshserver = null;
523
var xdr = null;
524
var serverinfo = null;
525
var nodes = [];
526
+ var meshes = {};
527
var filetree = {};
528
var userinfo = null;
529
var serverinfo = null;
@@ -544,7 +549,7 @@
549
go(1);
550
551
// Connect to the mesh server
547
- meshserver = MeshServerCreateControl("{{{domainurl}}}");
552
+ meshserver = MeshServerCreateControl(domainUrl);
553
meshserver.onStateChanged = onStateChanged;
554
meshserver.onMessage = onMessage;
555
meshserver.Start();
@@ -667,7 +672,7 @@
672
switch (message.event.action) {
673
case 'createmesh': {
674
// A new mesh was created
670
- if (message.event.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()] != null) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some.
675
+ if (message.event.links['user/' + domain + '/' + userinfo.name.toLowerCase()] != null) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some.
676
meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
677
updateMeshes();
678
updateDevices();
@@ -688,7 +693,7 @@
693
meshes[message.event.meshid].links = message.event.links;
694
695
// Check if we lost rights to this mesh in this change.
691
- if (meshes[message.event.meshid].links['user/{{{domain}}}/' + userinfo.name.toLowerCase()] == null) {
696
+ if (meshes[message.event.meshid].links['user/' + domain + '/' + userinfo.name.toLowerCase()] == null) {
697
if ((xxcurrentView == 20) && (currentMesh == meshes[message.event.meshid])) go(2);
698
delete meshes[message.event.meshid];
699
@@ -753,7 +758,8 @@
758
var node = nodes[index];
759
if (currentNode == node) {
760
if (xxcurrentView >= 10 && xxcurrentView < 20) { setDialogMode(0); go(1); }
756
- delete currentNode; // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
761
+ currentNode = null;
762
+ // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
763
}
764
nodes.splice(index, 1);
765
updateDevices();
@@ -831,7 +837,7 @@
837
}
838
case 'login': {
839
// Update the last login time
834
- if (users != null && users['user/{{{domain}}}/' + message.event.username.toLowerCase()]) { users['user/{{{domain}}}/' + message.event.username.toLowerCase()].login = message.event.time; }
840
+ if (users != null && users['user/' + domain + '/' + message.event.username.toLowerCase()]) { users['user/' + domain + '/' + message.event.username.toLowerCase()].login = message.event.time; }
841
break;
842
}
843
case 'notify': {
@@ -917,7 +923,7 @@
923
924
function account_showDeleteAccount() {
925
if (xxdialogMode) return;
920
- var x = "<form action='{{{domainurl}}}deleteaccount' method=post><table style=margin-left:10px><tr>";
926
+ var x = "<form action='" + domainUrl + "deleteaccount' method=post><table style=margin-left:10px><tr>";
927
x += "<td align=right>Password:</td><td><input id=apassword1 type=password name=apassword1 autocomplete=off onchange=account_validateDeleteAccount() onkeyup=account_validateDeleteAccount() /></td>";
928
x += "</tr><tr><td align=right>Password:</td><td><input id=apassword2 type=password name=apassword2 autocomplete=off onchange=account_validateDeleteAccount() onkeyup=account_validateDeleteAccount() /></td>";
929
x += '</tr></table><div style=padding:10px;margin-bottom:4px>';
@@ -931,7 +937,7 @@
937
938
function account_showChangePassword() {
939
if (xxdialogMode) return;
934
- var x = "<form action='{{{domainurl}}}changepassword' method=post><table style=margin-left:10px><tr>";
940
+ var x = "<form action='" + domainUrl + "changepassword' method=post><table style=margin-left:10px><tr>";
941
x += "<td align=right>Password:</td><td><input id=apassword1 type=password name=apassword1 autocomplete=off onchange=account_validateNewPassword() onkeyup=account_validateNewPassword() /> <b><span id=dxPassWarn></span></b></td>";
942
x += "</tr><tr><td align=right>Password:</td><td><input id=apassword2 type=password name=apassword2 autocomplete=off onchange=account_validateNewPassword() onkeyup=account_validateNewPassword() /></td>";
943
x += "</tr><tr><td align=right>Hint:</td><td><input id=apasswordhint name=apasswordhint maxlength=250 type=text autocomplete=off /></td>";
@@ -991,7 +997,7 @@
997
count++;
998
999
// Mesh rights
994
- var meshrights = meshes[i].links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
1000
+ var meshrights = meshes[i].links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
1001
var rights = 'Partial Rights';
1002
if (meshrights == 0xFFFFFFFF) rights = 'Full Administrator'; else if (meshrights == 0) rights = 'No Rights';
1003
@@ -1003,7 +1009,7 @@
1009
r += '</div></div>';
1010
}
1011
1006
- meshcount = count;
1012
+ //meshcount = count;
1013
QH('p3meshes', r);
1014
QV('p3noMeshFound', count == 0);
1015
}
@@ -1282,7 +1288,7 @@
1288
// Go thru the list of nodes and display them
1289
for (var i in nodes) {
1290
if (nodes[i].v == false) continue;
1285
- var mesh2 = meshes[nodes[i].meshid], meshlinks = mesh2.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
1291
+ var mesh2 = meshes[nodes[i].meshid], meshlinks = mesh2.links['user/' + domain + '/' + userinfo.name.toLowerCase()];
1292
if (meshlinks == null) continue;
1293
var meshrights = meshlinks.rights;
1294
@@ -1353,7 +1359,7 @@
1359
// Display all empty meshes, we need to do this because users can add devices to these at any time.
1360
if (sort == 0) {
1361
for (var i in meshes) {
1356
- var mesh = meshes[i], meshlink = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
1362
+ var mesh = meshes[i], meshlink = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()];
1363
if (meshlink != null) {
1364
var meshrights = meshlink.rights;
1365
if (displayedMeshes[mesh._id] == null) {
@@ -1414,7 +1420,7 @@
1420
if (deviceHeaderId == 0) { deviceHeaderId = 1; return; }
1421
deviceHeaders["DevxHeader" + deviceHeaderId] = ', ' + deviceHeaderTotal + ((deviceHeaderTotal == 1) ? ' node' : ' nodes');
1422
var title = '';
1417
- for (x in deviceHeaderCount) { if (title.length > 0) title += ', '; title += deviceHeaderCount[x] + ' ' + PowerStateStr2(x); }
1423
+ for (var x in deviceHeaderCount) { if (title.length > 0) title += ', '; title += deviceHeaderCount[x] + ' ' + PowerStateStr2(x); }
1424
deviceHeadersTitles["DevxHeader" + deviceHeaderId] = title;
1425
deviceHeaderId++;
1426
deviceHeaderCount = {};
@@ -1437,7 +1443,7 @@
1443
1444
function getNodeRights(nodeid) {
1445
var node = getNodeFromId(nodeid), mesh = meshes[node.meshid];
1440
- return mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
1446
+ return mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
1447
}
1448
1449
var currentDevicePanel = 0;
@@ -1452,7 +1458,7 @@
1458
if (node == null) { goBack(); }
1459
var mesh = meshes[node.meshid];
1460
if (mesh == null) { goBack(); }
1455
- var meshrights = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
1461
+ var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
1462
if (!currentNode || currentNode._id != node._id || refresh == true) {
1463
currentNode = node;
1464
@@ -1580,7 +1586,7 @@
1586
QH('p10html3', x);
1587
1588
// Set the node power state
1583
- powerstate = PowerStateStr(node.state);
1589
+ var powerstate = PowerStateStr(node.state);
1590
//if (node.state == 0) { powerstate = 'Unknown State'; }
1591
if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px title="Agent connected">Mesh Agent</span>'; }
1592
if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px title="Intel® AMT connected">Intel® AMT connected</span>'; } else
@@ -1624,7 +1630,7 @@
1630
1631
function deviceActionFunction() {
1632
if (xxdialogMode) return;
1627
- var meshrights = meshes[currentNode.meshid].links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
1633
+ var meshrights = meshes[currentNode.meshid].links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
1634
var x = "Select an operation to perform on this device.<br /><br />";
1635
var y = '<select id=d2deviceop style=float:right;width:170px>';
1636
if ((meshrights & 64) != 0) { y += '<option value=100>Wake-up</option>'; } // Wake-up permission
@@ -1767,7 +1773,7 @@
1773
function p10showiconselector() {
1774
if (xxdialogMode) return;
1775
var mesh = meshes[currentNode.meshid];
1770
- var meshrights = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
1776
+ var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
1777
if ((meshrights & 4) == 0) return;
1778
1779
var x = '<table align=center><td>';
@@ -1822,7 +1828,7 @@
1828
var desktopsettings = { encoding: 2, showfocus: false, showmouse: true, showcad: true, quality: 40, scaling: 1024, framerate: 50 };
1829
function setupDesktop() {
1830
// Setup the remote desktop
1825
- if ((desktopNode != currentNode) && (desktop != null)) { desktop.Stop(); delete desktop; desktopNode = null; desktop = null; }
1831
+ if ((desktopNode != currentNode) && (desktop != null)) { desktop.Stop(); desktopNode = null; desktop = null; }
1832
1833
// If the device desktop is already connected in multi-desktop, use that.
1834
if ((desktopNode != currentNode) || (desktop == null)) {
@@ -1905,7 +1911,6 @@
1911
} else {
1912
// Disconnect and clean up the remote desktop
1913
desktop.Stop();
1908
- delete desktop;
1914
desktopNode = desktop = null;
1915
}
1916
}
@@ -1921,7 +1926,6 @@
1926
case 0:
1927
// Disconnect and clean up the remote desktop
1928
desktop.Stop();
1924
- delete desktop;
1929
desktopNode = desktop = null;
1930
QV('termdisplays', false);
1931
if (fullscreen == true) { deskToggleFull(); }
@@ -2143,7 +2147,7 @@
2147
filesNode = currentNode;
2148
var online = ((filesNode.conn & 1) != 0)?true:false; // If Agent (1) connected, enable Terminal
2149
QE('p13Connect', online);
2146
- if (((samenode == false) || (online == false)) && files) { files.Stop(); delete files; files = null; }
2150
+ if (((samenode == false) || (online == false)) && files) { files.Stop(); files = null; }
2151
}
2152
2153
function onFilesStateChange(xfiles, state) {
@@ -2160,7 +2164,7 @@
2164
QH('p13currentpath', '');
2165
QE('p13FolderUp', false);
2166
p13setActions();
2163
- if (files != null) { files.Stop(); delete files; files = null; }
2167
+ if (files != null) { files.Stop(); files = null; }
2168
break;
2169
case 3:
2170
p13targetpath = '';
@@ -2191,13 +2195,11 @@
2195
} else {
2196
//QH('Term', '');
2197
files.Stop();
2194
- delete files;
2198
files = null;
2199
}
2200
p13clipboard = p13clipboardFolder = null;
2201
p13clipboardCut = 0;
2202
p13updateClipview();
2200
- p13oldlinkpath = null;
2203
}
2204
2205
var p13filetree = null;
@@ -2236,7 +2238,6 @@
2238
return checkedNames;
2239
}
2240
2239
- //var p13oldlinkpath = null;
2241
function p13updateFiles(checkedNames) {
2242
var html1 = '', html2 = '', displayPath = '<a style=cursor:pointer onclick=p13folderup(0)>Root</a>', fullPath = 'Root';
2243
@@ -2574,7 +2575,7 @@
2575
if (currentMesh == null) return;
2576
QH('p20meshName', EscapeHtml(currentMesh.name));
2577
var meshtype = 'Unknown #' + currentMesh.mtype;
2577
- var meshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
2578
+ var meshrights = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
2579
if (currentMesh.mtype == 1) meshtype = 'Intel® AMT group';
2580
if (currentMesh.mtype == 2) meshtype = 'Mesh agent group';
2581
@@ -2587,7 +2588,7 @@
2588
//x += '<br><input type=button value=Notes title="View notes about this mesh" onclick=showNotes(false,"' + encodeURIComponent(currentMesh._id) + '") />';
2589
2590
x += '<br style=clear:both><br>';
2590
- var currentMeshLinks = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
2591
+ var currentMeshLinks = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()];
2592
if (currentMeshLinks && ((currentMeshLinks.rights & 2) != 0)) { x += '<div style=margin-bottom:6px><a onclick=p20showAddMeshUserDialog() style=cursor:pointer><img src=images/icon-addnew.png border=0 height=12 width=12> Add User</a></div>'; }
2593
2594
/*
@@ -2699,7 +2700,7 @@
2700
}
2701
2702
function p20validateAddMeshUserDialog() {
2702
- var meshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
2703
+ var meshrights = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
2704
QE('idx_dlgOkButton', (Q('dp20username').value.length > 0));
2705
QE('p20fulladmin', meshrights == 0xFFFFFFFF);
2706
QE('p20editmesh', (!Q('p20fulladmin').checked) && (meshrights == 0xFFFFFFFF));
@@ -2730,7 +2731,7 @@
2731
function p20viewuser(userid) {
2732
if (xxdialogMode) return;
2733
userid = decodeURIComponent(userid);
2733
- var r = '', cmeshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights, meshrights = currentMesh.links[userid].rights;
2734
+ var r = '', cmeshrights = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights, meshrights = currentMesh.links[userid].rights;
2735
if (meshrights == 0xFFFFFFFF) r = ', Full Administrator'; else {
2736
if ((meshrights & 1) != 0) r += ', Edit Mesh';
2737
if ((meshrights & 2) != 0) r += ', Manage Mesh Users';
@@ -2745,7 +2746,7 @@
2746
if (r == '') { r = 'No Rights'; }
2747
var buttons = 1, x = addHtmlValue('User', userid.split('/')[2]);
2748
x += addHtmlValue('Permissions', r);
2748
- if ((('user/{{{domain}}}/' + userinfo.name.toLowerCase()) != userid) && (cmeshrights == 0xFFFFFFFF || (((cmeshrights & 2) != 0) && (meshrights != 0xFFFFFFFF)))) buttons += 4;
2749
+ if ((('user/' + domain + '/' + userinfo.name.toLowerCase()) != userid) && (cmeshrights == 0xFFFFFFFF || (((cmeshrights & 2) != 0) && (meshrights != 0xFFFFFFFF)))) buttons += 4;
2750
setDialogMode(2, "Mesh User", buttons, p20viewuserEx, x, userid);
2751
}
2752
views/default.handlebars
+10
-13
@@ -746,6 +746,7 @@
746
</div>
747
</div>
748
<script type="text/javascript">
749
+ 'use strict';
750
var args;
751
var powerStatetable = ['', 'Powered', 'Sleep', 'Sleep', 'Sleep', 'Hibernating', 'Power off', 'Present'];
752
var StatusStrs = ['Disconnected', 'Connecting...', 'Setup...', 'Connected', 'Intel® AMT Connected'];
@@ -1268,7 +1269,8 @@
1269
var node = nodes[index];
1270
if (currentNode == node) {
1271
if (xxcurrentView >= 10 && xxcurrentView < 20) { setDialogMode(0); go(1); }
1271
- delete currentNode; // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
1272
+ currentNode = null;
1273
+ // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
1274
}
1275
nodes.splice(index, 1);
1276
updateDevices();
@@ -1502,6 +1504,8 @@
1504
function updateDevices() { if (updateDevicesTimer != null) return; updateDevicesTimer = setTimeout(updateDevicesEx, 200); }
1505
1506
var deviceHeaderId = 0;
1507
+ var deviceHeaderTotal = 0;
1508
+ var deviceHeadersTitles = {};
1509
var deviceHeaderCount;
1510
var deviceHeaders = {};
1511
var oldviewmode = 0;
@@ -2995,7 +2999,7 @@
2999
QH('p10html3', x);
3000
3001
// Set the node power state
2998
- powerstate = PowerStateStr(node.state);
3002
+ var powerstate = PowerStateStr(node.state);
3003
//if (node.state == 0) { powerstate = 'Unknown State'; }
3004
if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title="Agent connected">Agent connected</span>'; }
3005
if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title="Intel® AMT connected">Intel® AMT connected</span>'; }
@@ -3374,7 +3378,7 @@
3378
var desktopNode;
3379
function setupDesktop() {
3380
// Setup the remote desktop
3377
- if ((desktopNode != currentNode) && (desktop != null)) { desktop.Stop(); delete desktop; desktopNode = null; desktop = null; }
3381
+ if ((desktopNode != currentNode) && (desktop != null)) { desktop.Stop(); desktopNode = null; desktop = null; }
3382
3383
// If the device desktop is already connected in multi-desktop, use that.
3384
if ((desktopNode != currentNode) || (desktop == null)) {
@@ -3482,7 +3486,6 @@
3486
} else {
3487
// Disconnect and clean up the remote desktop
3488
desktop.Stop();
3485
- delete desktop;
3489
desktopNode = desktop = null;
3490
}
3491
}
@@ -3498,7 +3501,6 @@
3501
case 0:
3502
// Disconnect and clean up the remote desktop
3503
desktop.Stop();
3501
- delete desktop;
3504
desktopNode = desktop = null;
3505
QV('DeskFocus', false);
3506
QV('termdisplays', false);
@@ -3747,7 +3749,7 @@
3749
var terminalNode;
3750
function setupTerminal() {
3751
// Setup the terminal
3750
- if ((terminalNode != currentNode) && (terminal != null)) { terminal.Stop(); delete terminal; terminal = null; }
3752
+ if ((terminalNode != currentNode) && (terminal != null)) { terminal.Stop(); terminal = null; }
3753
terminalNode = currentNode;
3754
updateTerminalButtons();
3755
}
@@ -3791,7 +3793,6 @@
3793
xterminal.m.TermDraw();
3794
if (terminal != null) {
3795
terminal.Stop();
3794
- delete terminal;
3796
terminal = null;
3797
}
3798
break;
@@ -3832,7 +3833,6 @@
3833
} else {
3834
//QH('Term', '');
3835
terminal.Stop();
3835
- delete terminal;
3836
terminal = null;
3837
}
3838
Q('connectbutton2').blur(); // Deselect the connect button so the button does not get key presses.
@@ -3890,7 +3890,7 @@
3890
filesNode = currentNode;
3891
var online = ((filesNode.conn & 1) != 0)?true:false; // If Agent (1) connected, enable Terminal
3892
QE('p13Connect', online);
3893
- if (((samenode == false) || (online == false)) && files) { files.Stop(); delete files; files = null; }
3893
+ if (((samenode == false) || (online == false)) && files) { files.Stop(); files = null; }
3894
}
3895
3896
function onFilesStateChange(xfiles, state) {
@@ -3907,7 +3907,7 @@
3907
QH('p13currentpath', '');
3908
QE('p13FolderUp', false);
3909
p13setActions();
3910
- if (files != null) { files.Stop(); delete files; files = null; }
3910
+ if (files != null) { files.Stop(); files = null; }
3911
break;
3912
case 3:
3913
p13targetpath = '';
@@ -3938,13 +3938,11 @@
3938
} else {
3939
//QH('Term', '');
3940
files.Stop();
3941
- delete files;
3941
files = null;
3942
}
3943
p13clipboard = p13clipboardFolder = null;
3944
p13clipboardCut = 0;
3945
p13updateClipview();
3947
- p13oldlinkpath = null;
3946
}
3947
3948
var p13filetree = null;
@@ -3982,7 +3980,6 @@
3980
return checkedNames;
3981
}
3982
3985
- //var p13oldlinkpath = null;
3983
function p13updateFiles(checkedNames) {
3984
var html1 = '', html2 = '', displayPath = '<a style=cursor:pointer onclick=p13folderup(0)>Root</a>', fullPath = 'Root';
3985
views/login-mobile.handlebars
+1
@@ -174,6 +174,7 @@
174
</div>
175
</div>
176
<script>
177
+ 'use strict';
178
var passhint = "{{{passhint}}}";
179
var newAccountPass = parseInt('{{{newAccountPass}}}');
180
var emailCheck = parseInt('{{{emailcheck}}}');
views/login.handlebars
+1
@@ -168,6 +168,7 @@
168
</div>
169
</div>
170
<script>
171
+ 'use strict';
172
var passhint = "{{{passhint}}}";
173
var newAccountPass = parseInt('{{{newAccountPass}}}');
174
var emailCheck = parseInt('{{{emailcheck}}}');
webserver.js
+17
-8
@@ -6,7 +6,7 @@
6
* @version v0.0.1
7
*/
8
9
-"use strict";
9
+'use strict';
10
11
/*
12
class SerialTunnel extends require('stream').Duplex {
@@ -153,13 +153,22 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
153
obj.app.engine('handlebars', obj.exphbs({})); // defaultLayout: 'main'
154
obj.app.set('view engine', 'handlebars');
155
obj.app.use(obj.bodyParser.urlencoded({ extended: false }));
156
- obj.app.use(obj.session({
157
- name: 'xid', // Recommanded security practice to not use the default cookie name
158
- httpOnly: true,
159
- keys: [ obj.args.sessionkey ], // If multiple instances of this server are behind a load-balancer, this secret must be the same for all instances
160
- secure: (obj.args.notls != true), // Use this cookie only over TLS
161
- maxAge: (obj.args.sessiontime * 60 * 1000) // 24 hours
162
- }));
156
+ if (obj.args.sessiontime != null) {
157
+ obj.app.use(obj.session({
158
+ name: 'xid', // Recommanded security practice to not use the default cookie name
159
+ httpOnly: true,
160
+ keys: [obj.args.sessionkey], // If multiple instances of this server are behind a load-balancer, this secret must be the same for all instances
161
+ secure: (obj.args.notls != true), // Use this cookie only over TLS
162
+ maxAge: (obj.args.sessiontime * 60 * 1000) // Number of minutes
163
+ }));
164
+ } else {
165
+ obj.app.use(obj.session({
166
+ name: 'xid', // Recommanded security practice to not use the default cookie name
167
+ httpOnly: true,
168
+ keys: [obj.args.sessionkey], // If multiple instances of this server are behind a load-balancer, this secret must be the same for all instances
169
+ secure: (obj.args.notls != true) // Use this cookie only over TLS
170
+ }));
171
+ }
172
173
// Session-persisted message middleware
174
obj.app.use(function (req, res, next) {
winservice.js
+2
@@ -6,6 +6,8 @@
6
* @version v0.0.1
7
*/
8
9
+'use strict';
10
+
11
// This module is only called when MeshCentral is running as a Windows service.
12
// In this case, we don't want to start a child process, so we launch directly without arguments.
13
require('./meshcentral.js').mainStart({ "launch": true });