Many fixes.

MeshCentralServer.njsproj

@@ -173,7 +173,6 @@
     <Content Include="public\images\mapmarker.png" />
     <Content Include="public\images\meshicon50.png" />
     <Content Include="public\images\trash.png" />
-    <Content Include="public\messenger.htm" />
     <Content Include="public\scriptblocks.txt" />
     <Content Include="public\sounds\chimes.mp3" />
     <Content Include="public\styles\font-awesome\css\font-awesome.min.css" />
@@ -215,12 +214,18 @@
     <Content Include="readme.txt" />
     <Content Include="sample-config.json" />
     <Content Include="SourceFileList.txt" />
+    <Content Include="views\default-min.handlebars" />
+    <Content Include="views\default-mobile-min.handlebars" />
     <Content Include="views\default-mobile.handlebars" />
     <Content Include="views\default.handlebars" />
     <Content Include="views\download.handlebars" />
+    <Content Include="views\login-min.handlebars" />
+    <Content Include="views\login-mobile-min.handlebars" />
     <Content Include="views\login-mobile.handlebars" />
     <Content Include="views\login.handlebars" />
     <Content Include="views\message.handlebars" />
+    <Content Include="views\messenger-min.handlebars" />
+    <Content Include="views\messenger.handlebars" />
     <Content Include="views\terms-mobile.handlebars" />
     <Content Include="views\terms.handlebars" />
   </ItemGroup>

agents/meshcore.js

@@ -1012,7 +1012,7 @@ function createMeshCore(agent) {
         try {
             switch (process.platform) {
                 case 'win32':
-                    //child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER, uid: require('user-sessions').Current().Active[0].SessionId }); // TODO: Using user-session breaks Win7
+                    //child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER, uid: require('user-sessions').Current().Active[0].SessionId });
                     child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ["/c", "start", url], { type: childProcess.SpawnTypes.USER });
                     break;
                 case 'linux':
@@ -1061,7 +1061,7 @@ function createMeshCore(agent) {
                 }
                 case 'users': {
                     if (meshCoreObj.users == null) { response = 'Active users are unknown.'; } else { response = 'Active Users: ' + meshCoreObj.users.join(', ') + '.'; }
-                    //require('user-sessions').enumerateUsers().then(function (u) { for (var i in u) { sendConsoleText(u[i]); } });
+                    require('user-sessions').enumerateUsers().then(function (u) { for (var i in u) { sendConsoleText(u[i]); } });
                     break;
                 }
                 case 'toast': {
@@ -1597,7 +1597,6 @@ function createMeshCore(agent) {
         } catch (e) { amtLmsState = -1; amtLms = null; }
 
         // Setup logged in user monitoring (THIS IS BROKEN IN WIN7)
-        /*
         try {
             var userSession = require('user-sessions');
             userSession.on('changed', function onUserSessionChanged() {
@@ -1615,7 +1614,6 @@ function createMeshCore(agent) {
             //userSession.on('locked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has LOCKED the desktop'); });
             //userSession.on('unlocked', function (user) { sendConsoleText('[' + (user.Domain ? user.Domain + '\\' : '') + user.Username + '] has UNLOCKED the desktop'); });
         } catch (ex) { }
-        */
     }
     
     obj.stop = function () {

agents/modules_meshcore/user-sessions.js

@@ -93,7 +93,7 @@ function UserSessions()
         }
 
         this._user32 = this._marshal.CreateNativeProxy('user32.dll');
-        this._user32.CreateMethod('RegisterPowerSettingNotification');
+        this._user32.CreateMethod({ method: 'RegisterPowerSettingNotification', threadDispatch: 1 });
         this._user32.CreateMethod('UnregisterPowerSettingNotification');
         this._rpcrt = this._marshal.CreateNativeProxy('Rpcrt4.dll');
         this._rpcrt.CreateMethod('UuidFromStringA');

certoperations.js

@@ -151,7 +151,7 @@ module.exports.CertificateOperations = function () {
         var certargs = args.cert;
         var mpscertargs = args.mpscert;
         var strongCertificate = (args.fastcert ? false : true);
-        var rcountmax = 5;
+        var rcountmax = 4;
         var caindex = 1;
         var caok = false;
         var calist = [];
@@ -197,12 +197,6 @@ module.exports.CertificateOperations = function () {
             rcount++;
         }
 
-        // If the console certificate already exist, load it
-        if (obj.fileExists(parent.getConfigFilePath("amtconsole-cert-public.crt")) && obj.fileExists(parent.getConfigFilePath("agentserver-cert-private.key"))) {
-            r.console = { cert: obj.fs.readFileSync(parent.getConfigFilePath("amtconsole-cert-public.crt"), "utf8"), key: obj.fs.readFileSync(parent.getConfigFilePath("amtconsole-cert-private.key"), "utf8") };
-            rcount++;
-        }
-
         // If the swarm server certificate exist, load it (This is an optional certificate)
         if (obj.fileExists(parent.getConfigFilePath("swarmserver-cert-public.crt")) && obj.fileExists(parent.getConfigFilePath("swarmserver-cert-private.key"))) {
             r.swarmserver = { cert: obj.fs.readFileSync(parent.getConfigFilePath("swarmserver-cert-public.crt"), "utf8"), key: obj.fs.readFileSync(parent.getConfigFilePath("swarmserver-cert-private.key"), "utf8") };
@@ -285,8 +279,6 @@ module.exports.CertificateOperations = function () {
         }
 
         if (rcount === rcountmax) {
-            // Fetch the Intel AMT console name
-            r.AmtConsoleName = obj.pki.certificateFromPem(r.console.cert).subject.getField("CN").value;
             // Fetch the Intel AMT MPS common name
             r.AmtMpsName = obj.pki.certificateFromPem(r.mps.cert).subject.getField("CN").value;
             // Fetch the name of the server
@@ -396,24 +388,7 @@ module.exports.CertificateOperations = function () {
             mpsPrivateKey = r.mps.key;
         }
 
-        // If the Intel AMT console certificate does not exist, create one
+        r = { root: { cert: rootCertificate, key: rootPrivateKey }, web: { cert: webCertificate, key: webPrivateKey, ca: [] }, mps: { cert: mpsCertificate, key: mpsPrivateKey }, agent: { cert: agentCertificate, key: agentPrivateKey }, ca: calist, CommonName: commonName, RootName: rootName, AmtMpsName: mpsCommonName, dns: {}, WebIssuer: webIssuer };
-        var consoleCertAndKey, consoleCertificate, consolePrivateKey, amtConsoleName = "MeshCentral";
-        if (r.console == null) {
-            console.log("Generating Intel AMT console certificate...");
-            consoleCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, false, amtConsoleName, country, organization, { name: "extKeyUsage", clientAuth: true, "2.16.840.1.113741.1.2.1": true, "2.16.840.1.113741.1.2.2": true, "2.16.840.1.113741.1.2.3": true }, false); // Intel AMT Remote, Agent and Activation usages
-            consoleCertificate = obj.pki.certificateToPem(consoleCertAndKey.cert);
-            consolePrivateKey = obj.pki.privateKeyToPem(consoleCertAndKey.key);
-            obj.fs.writeFileSync(parent.getConfigFilePath("amtconsole-cert-public.crt"), consoleCertificate);
-            obj.fs.writeFileSync(parent.getConfigFilePath("amtconsole-cert-private.key"), consolePrivateKey);
-        } else {
-            // Keep the console certificate we have
-            consoleCertAndKey = { cert: obj.pki.certificateFromPem(r.console.cert), key: obj.pki.privateKeyFromPem(r.console.key) };
-            consoleCertificate = r.console.cert;
-            consolePrivateKey = r.console.key;
-            amtConsoleName = consoleCertAndKey.cert.subject.getField("CN").value;
-        }
-
-        r = { root: { cert: rootCertificate, key: rootPrivateKey }, web: { cert: webCertificate, key: webPrivateKey, ca: [] }, mps: { cert: mpsCertificate, key: mpsPrivateKey }, agent: { cert: agentCertificate, key: agentPrivateKey }, console: { cert: consoleCertificate, key: consolePrivateKey }, ca: calist, CommonName: commonName, RootName: rootName, AmtConsoleName: amtConsoleName, AmtMpsName: mpsCommonName, dns: {}, WebIssuer: webIssuer };
 
         // Look for domains with DNS names that have no certificates and generated them.
         for (i in config.domains) {

letsEncrypt.js

@@ -78,8 +78,18 @@ module.exports.CreateLetsEncrypt = function (parent) {
                     obj.leResults = results;
 
                     // If we already have real certificates, use them.
-                    if (results.altnames.indexOf(certs.CommonName) >= 0) { certs.web.cert = results.cert; certs.web.key = results.privkey; certs.web.ca = [results.chain]; }
+                    if (results.altnames.indexOf(certs.CommonName) >= 0) {
-                    for (var i in obj.parent.config.domains) { if ((obj.parent.config.domains[i].dns != null) && (results.altnames.indexOf(obj.parent.config.domains[i].dns) >= 0)) { certs.dns[i].cert = results.cert; certs.dns[i].key = results.privkey; certs.dns[i].ca = [results.chain]; } }
+                        certs.web.cert = results.cert;
+                        certs.web.key = results.privkey;
+                        certs.web.ca = [results.chain];
+                    }
+                    for (var i in obj.parent.config.domains) {
+                        if ((obj.parent.config.domains[i].dns != null) && (results.altnames.indexOf(obj.parent.config.domains[i].dns) >= 0)) {
+                            certs.dns[i].cert = results.cert;
+                            certs.dns[i].key = results.privkey;
+                            certs.dns[i].ca = [results.chain];
+                        }
+                    }
                     func(certs);
 
                     // Check if the Let's Encrypt certificate needs to be renewed.

meshuser.js

@@ -632,7 +632,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                             var httpsPort = ((obj.parent.args.aliasport == null) ? obj.parent.args.port : obj.parent.args.aliasport); // Use HTTPS alias port is specified
                             var xdomain = (domain.dns == null) ? domain.id : '';
                             if (xdomain != '') xdomain += "/";
-                            var url = "http" + (obj.args.notls ? '' : 's') + "://" + obj.parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger.htm?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id) + "&title=" + encodeURIComponent(user.name);
+                            var url = "http" + (obj.args.notls ? '' : 's') + "://" + obj.parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id) + "&title=" + encodeURIComponent(user.name);
 
                             // Create the notification message
                             routeCommandToNode({ "action": "openUrl", "nodeid": command.nodeid, "userid": user._id, "username": user.name, "url": url });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.2.4-t",
+  "version": "0.2.4-y",
   "keywords": [
     "Remote Management",
     "Intel AMT",

public/compress.bat

@@ -31,4 +31,11 @@ COPY ..\views\login-mobile.handlebars index.html
 ..\..\WebSiteCompiler\bin\Debug\WebSiteCompiler.exe compress.wcc -c
 COPY compress.htm ..\views\login-mobile-min.handlebars
 DEL compress.htm
+DEL index.html
+
+REM *** messenger.handlebars
+COPY ..\views\messenger.handlebars index.html
+..\..\WebSiteCompiler\bin\Debug\WebSiteCompiler.exe compress.wcc -c
+COPY compress.htm ..\views\messenger-min.handlebars
+DEL compress.htm
 DEL index.html

public/scripts/agent-redir-ws-0.1.0.js

@@ -107,7 +107,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort) {
                         }
                         obj.webrtc.oniceconnectionstatechange = function () {
                             if (obj.webrtc != null) {
-                                if (obj.webrtc.iceConnectionState == 'disconnected') { obj.Stop(); }
+                                if (obj.webrtc.iceConnectionState == 'disconnected') { if (obj.webRtcActive == true) { obj.Stop(); } else { obj.xxCloseWebRTC(); } }
                                 else if (obj.webrtc.iceConnectionState == 'failed') { obj.xxCloseWebRTC(); }
                             }
                         }

public/scripts/filesaver.js

@@ -0,0 +1,180 @@
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define([], factory);
+  } else if (typeof exports !== "undefined") {
+    factory();
+  } else {
+    var mod = {
+      exports: {}
+    };
+    factory();
+    global.FileSaver = mod.exports;
+  }
+})(this, function () {
+  "use strict";
+
+  /*
+  * FileSaver.js
+  * A saveAs() FileSaver implementation.
+  *
+  * By Eli Grey, http://eligrey.com
+  *
+  * License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+  * source  : http://purl.eligrey.com/github/FileSaver.js
+  */
+  // The one and only way of getting global scope in all environments
+  // https://stackoverflow.com/q/3277182/1008999
+  var _global = typeof window === 'object' && window.window === window ? window : typeof self === 'object' && self.self === self ? self : typeof global === 'object' && global.global === global ? global : void 0;
+
+  function bom(blob, opts) {
+    if (typeof opts === 'undefined') opts = {
+      autoBom: false
+    };else if (typeof opts !== 'object') {
+      console.warn('Depricated: Expected third argument to be a object');
+      opts = {
+        autoBom: !opts
+      };
+    } // prepend BOM for UTF-8 XML and text/* types (including HTML)
+    // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+
+    if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+      return new Blob([String.fromCharCode(0xFEFF), blob], {
+        type: blob.type
+      });
+    }
+
+    return blob;
+  }
+
+  function download(url, name, opts) {
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url);
+    xhr.responseType = 'blob';
+
+    xhr.onload = function () {
+      saveAs(xhr.response, name, opts);
+    };
+
+    xhr.onerror = function () {
+      console.error('could not download file');
+    };
+
+    xhr.send();
+  }
+
+  function corsEnabled(url) {
+    var xhr = new XMLHttpRequest(); // use sync to avoid popup blocker
+
+    xhr.open('HEAD', url, false);
+    xhr.send();
+    return xhr.status >= 200 && xhr.status <= 299;
+  } // `a.click()` doesn't work for all browsers (#465)
+
+
+  function click(node) {
+    try {
+      node.dispatchEvent(new MouseEvent('click'));
+    } catch (e) {
+      var evt = document.createEvent('MouseEvents');
+      evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
+      node.dispatchEvent(evt);
+    }
+  }
+
+  var saveAs = _global.saveAs || // probably in some web worker
+  typeof window !== 'object' || window !== _global ? function saveAs() {}
+  /* noop */
+  // Use download attribute first if possible (#193 Lumia mobile)
+  : 'download' in HTMLAnchorElement.prototype ? function saveAs(blob, name, opts) {
+    var URL = _global.URL || _global.webkitURL;
+    var a = document.createElement('a');
+    name = name || blob.name || 'download';
+    a.download = name;
+    a.rel = 'noopener'; // tabnabbing
+    // TODO: detect chrome extensions & packaged apps
+    // a.target = '_blank'
+
+    if (typeof blob === 'string') {
+      // Support regular links
+      a.href = blob;
+
+      if (a.origin !== location.origin) {
+        corsEnabled(a.href) ? download(blob, name, opts) : click(a, a.target = '_blank');
+      } else {
+        click(a);
+      }
+    } else {
+      // Support blobs
+      a.href = URL.createObjectURL(blob);
+      setTimeout(function () {
+        URL.revokeObjectURL(a.href);
+      }, 4E4); // 40s
+
+      setTimeout(function () {
+        click(a);
+      }, 0);
+    }
+  } // Use msSaveOrOpenBlob as a second approach
+  : 'msSaveOrOpenBlob' in navigator ? function saveAs(blob, name, opts) {
+    name = name || blob.name || 'download';
+
+    if (typeof blob === 'string') {
+      if (corsEnabled(blob)) {
+        download(blob, name, opts);
+      } else {
+        var a = document.createElement('a');
+        a.href = blob;
+        a.target = '_blank';
+        setTimeout(function () {
+          click(a);
+        });
+      }
+    } else {
+      navigator.msSaveOrOpenBlob(bom(blob, opts), name);
+    }
+  } // Fallback to using FileReader and a popup
+  : function saveAs(blob, name, opts, popup) {
+    // Open a popup immediately do go around popup blocker
+    // Mostly only avalible on user interaction and the fileReader is async so...
+    popup = popup || open('', '_blank');
+
+    if (popup) {
+      popup.document.title = popup.document.body.innerText = 'downloading...';
+    }
+
+    if (typeof blob === 'string') return download(blob, name, opts);
+    var force = blob.type === 'application/octet-stream';
+
+    var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari;
+
+    var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent);
+
+    if ((isChromeIOS || force && isSafari) && typeof FileReader === 'object') {
+      // Safari doesn't allow downloading of blob urls
+      var reader = new FileReader();
+
+      reader.onloadend = function () {
+        var url = reader.result;
+        url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;');
+        if (popup) popup.location.href = url;else location = url;
+        popup = null; // reverse-tabnabbing #460
+      };
+
+      reader.readAsDataURL(blob);
+    } else {
+      var URL = _global.URL || _global.webkitURL;
+      var url = URL.createObjectURL(blob);
+      if (popup) popup.location = url;else location.href = url;
+      popup = null; // reverse-tabnabbing #460
+
+      setTimeout(function () {
+        URL.revokeObjectURL(url);
+      }, 4E4); // 40s
+    }
+  };
+  _global.saveAs = saveAs.saveAs = saveAs;
+
+  if (typeof module !== 'undefined') {
+    module.exports = saveAs;
+  }
+});

public/scripts/filesaver.min.js

@@ -0,0 +1,3 @@
+(function(a,b){if("function"==typeof define&&define.amd)define([],b);else if("undefined"!=typeof exports)b();else{b(),a.FileSaver={exports:{}}.exports}})(this,function(){"use strict";function b(a,b){return"undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Depricated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(b,c,d){var e=new XMLHttpRequest;e.open("GET",b),e.responseType="blob",e.onload=function(){a(e.response,c,d)},e.onerror=function(){console.error("could not download file")},e.send()}function d(a){var b=new XMLHttpRequest;return b.open("HEAD",a,!1),b.send(),200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"))}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b)}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof global&&global.global===global?global:void 0,a=f.saveAs||"object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href)},4E4),setTimeout(function(){e(j)},0))}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else{var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i)})}}:function(a,b,d,e){if(e=e||open("","_blank"),e&&(e.document.title=e.document.body.innerText="downloading..."),"string"==typeof a)return c(a,b,d);var g="application/octet-stream"===a.type,h=/constructor/i.test(f.HTMLElement)||f.safari,i=/CriOS\/[\d]+/.test(navigator.userAgent);if((i||g&&h)&&"object"==typeof FileReader){var j=new FileReader;j.onloadend=function(){var a=j.result;a=i?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),e?e.location.href=a:location=a,e=null},j.readAsDataURL(a)}else{var k=f.URL||f.webkitURL,l=k.createObjectURL(a);e?e.location=l:location.href=l,e=null,setTimeout(function(){k.revokeObjectURL(l)},4E4)}};f.saveAs=a.saveAs=a,"undefined"!=typeof module&&(module.exports=a)});
+
+//# sourceMappingURL=FileSaver.min.js.map

public/styles/messenger.css

@@ -2,6 +2,7 @@
     cursor: pointer;
     border: none;
     margin: 2px;
+    margin-top: 3px;
     float: right;
     border-radius: 3px;
     height: 32px;

sample-config.json

@@ -18,7 +18,8 @@
     "_UserAllowedIP": "127.0.0.1,::1,192.168.0.100",
     "_LocalDiscovery": { "name": "Local server name", "info": "Information about this server" },
     "_TlsOffload": true,
-    "_MpsTlsOffload":  true
+    "_MpsTlsOffload": true,
+    "_WebRtConfig": { "iceServers": [ { "urls": "stun:stun.services.mozilla.com" }, { "urls": "stun:stun.l.google.com:19302" } ] }
   },
   "_domains": {
     "": {

views/default.handlebars

@@ -447,11 +447,10 @@
                             <td style=padding-top:2px;padding-bottom:2px;background:#C0C0C0>
                                 <div style=float:right;text-align:right>
                                     <select id=termdisplays style=display:none onchange=deskSetDisplay(event) onclick=deskGetDisplayNumbers(event)></select>&nbsp;
-                                    <!--<input id=DeskToastButton type=button value=Toast title="Display a notification message on the remote computer" onkeypress="return false" onkeydown="return false" onclick="deviceToastFunction()">&nbsp;-->
                                     <input id=DeskToolsButton type=button value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()">&nbsp;
-                                    <span style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open chat window to this computer"><a onclick=deviceChat()><img src='images/icon-chat.png' height=16 width=16 style=padding-top:2px /></a></span>
+                                    <span id=DeskChatButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open chat window to this computer"><img src='images/icon-chat.png' onclick=deviceChat() height=16 width=16 style=padding-top:2px /></span>
-                                    <span style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Display a notification on the remote computer"><a onclick=deviceToastFunction()><img src='images/icon-notify.png' height=16 width=16 style=padding-top:2px /></a></span>
+                                    <span id=DeskNotifyButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Display a notification on the remote computer"><img src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
-                                    <span style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open a web address on remote computer"><a onclick=deviceUrlFunction()><img src='images/icon-url2.png' height=16 width=16 style=padding-top:2px /></a></span>
+                                    <span id=DeskOpenWebButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open a web address on remote computer"><img src='images/icon-url2.png' onclick=deviceUrlFunction() height=16 width=16 style=padding-top:2px /></span>
                                 </div>
                                 <div>
                                     <select style="margin-left:6px" id="deskkeys">
@@ -3316,7 +3315,7 @@
 
         function deviceChat() {
             if (xxdialogMode) return;
-            window.open('/messenger.htm?id=meshmessenger/' + encodeURIComponent(currentNode._id) + '/' + encodeURIComponent(userinfo._id) + '&title=' + currentNode.name, 'meshmessenger:' + currentNode._id);
+            window.open('/messenger?id=meshmessenger/' + encodeURIComponent(currentNode._id) + '/' + encodeURIComponent(userinfo._id) + '&title=' + currentNode.name, 'meshmessenger:' + currentNode._id);
             meshserver.send({ action: 'meshmessenger', nodeid: decodeURIComponent(currentNode._id) });
         }
 
@@ -3716,10 +3715,12 @@
             QE('DeskWD', deskState == 3);
             QV('deskkeys', (currentNode.agent) && (currentNode.agent.id < 5) && (meshrights & 8));
             QE('deskkeys', deskState == 3);
-            QV('DeskToolsButton', meshrights & 8);
+
-            QE('DeskToolsButton', online);
+            QV('DeskToolsButton', (meshrights & 8) && (mesh.mtype == 2) && online);
-            QV('DeskToastButton', (currentNode.agent) && (currentNode.agent.id < 5) && (meshrights & 8) && (browserfullscreen == false));
+            QV('DeskChatButton', (browserfullscreen == false) && (meshrights & 8) && (mesh.mtype == 2) && online);
-            QE('DeskToastButton', online);
+            QV('DeskNotifyButton', (browserfullscreen == false) && (currentNode.agent) && (currentNode.agent.id < 5) && (meshrights & 8) && (mesh.mtype == 2) && online);
+            QV('DeskOpenWebButton', (browserfullscreen == false) && (meshrights & 8) && (mesh.mtype == 2) && online);
+
             QV('DeskControlSpan', meshrights & 8)
             QV('deskActionsBtn', (browserfullscreen == false));
             QV('deskActionsSettings', (browserfullscreen == false));
@@ -5789,7 +5790,7 @@
 
         function userChat(e, userid, name) {
             haltEvent(e);
-            window.open('/messenger.htm?id=meshmessenger/' + userid + '/' + encodeURIComponent(userinfo._id) + '&title=' + name, 'meshmessenger:' + userid);
+            window.open('/messenger?id=meshmessenger/' + userid + '/' + encodeURIComponent(userinfo._id) + '&title=' + name, 'meshmessenger:' + userid);
             meshserver.send({ action: 'meshmessenger', userid: decodeURIComponent(userid) });
             return false;
         }
@@ -6254,7 +6255,7 @@
                     else gotoDevice(n.nodeid, 10); // General
                 } else {
                     if (n.tag.startsWith('meshmessenger/')) {
-                        window.open('/messenger.htm?id=' + n.tag + '&title=' + encodeURIComponent(n.username), n.tag.split('/')[2]);
+                        window.open('/messenger?id=' + n.tag + '&title=' + encodeURIComponent(n.username), n.tag.split('/')[2]);
                         notificationDelete(id);
                     }
                 }

views/messenger.handlebars

@@ -8,7 +8,7 @@
         <link type="text/css" href="styles/style.css" media="screen" rel="stylesheet" title="CSS" />
         <link type="text/css" href="styles/messenger.css" media="screen" rel="stylesheet" title="CSS" />
         <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
-        <script type="text/javascript" src="scripts/filesaver.1.1.20151003.js"></script>
+        <script type="text/javascript" src="scripts/filesaver.js"></script>
     </head>
     <body style="font-family:Arial,Helvetica,sans-serif">
         <div id="xtop" style="position:absolute;left:0;right:0;top:0;height:38px;background-color:#036;color:#c8c8c8;box-shadow:3px 3px 10px gray">
@@ -38,17 +38,25 @@
             <video id="localVideoCanvas" autoplay muted style="position:absolute;top:20px;left:0;width:100%;height:calc(100% - 30px);background-color:black"></video>
         </div>
         <input id="uploadFileInput" type="file" multiple style="display:none">
-        <script type="text/javascript">
+        <script type="text/javascript" onunload="onUnLoad()">
             var userInputFocus = 0;
             var args = parseUriArgs();
             var socket = null;                  // Websocket object
             var state = 0;                      // Connection state. 0 = Disconnected, 1 = Connecting, 2 = Connected.
+
+            // WebRTC sessions and data, audio and video channels
             var random = Math.random();         // Selected random, larger value initiates WebRTC.
             var webrtcSessions = { };           // WebRTC objects: 0 for data, 1 for outbound audio/video, 2 for inbound audio/video
             var webchannel = null;              // WebRTC data channel
-            var webrtcconfiguration = null;     //{ "iceServers": [ { 'urls': 'stun:stun.services.mozilla.com' }, { 'urls': 'stun:stun.l.google.com:19302' } ] };
             var localStream = null;
             var remoteStream = null;
+            var multiWebRtc = true;             // if set to true, multiple WebRTC sessions will be setup. If false, everything uses one session.
+            var userMediaSupport = 0;
+            getUserMediaSupport(function (x) { userMediaSupport = x; })
+            var webrtcconfiguration = "{{{webrtconfig}}}";
+            if (webrtcconfiguration == '') { webrtcconfiguration = null; } else { try { webrtcconfiguration = JSON.parse(decodeURIComponent(webrtcconfiguration)); } catch (ex) { console.log('Invalid WebRTC config: \"' + webrtcconfiguration + '\".'); webrtcconfiguration = null; } }
+
+            // File transfer state
             var fileUploads = [];
             var fileDownloads = {};
             var currentFileUpload = null;
@@ -56,11 +64,13 @@
 
             // Set the title
             if (args.title) { QH('xtitle', ' - ' + args.title); document.title = document.title + ' - ' + args.title; }
-
+            
+            // Listen to drag & drop events
             document.addEventListener('dragover', haltEvent, false);
             document.addEventListener('dragleave', haltEvent, false);
             document.addEventListener('drop', fileDrop, false);
 
+            // Trap document key up events
             document.onkeyup = function ondockeypress(e) {
                 if (state == 2) {
                     if ((e.keyCode == 8) && (userInputFocus == 0)) {
@@ -89,6 +99,38 @@
             function onUserInputFocus(x) { userInputFocus = x; }
             function displayClear() { QH('xmsg', ''); cancelAllFileTransfers(); fileUploads = [], fileDownloads = {}; }
 
+            // Polyfill FileReader if needed
+            if (!FileReader.prototype.readAsBinaryString) {
+                FileReader.prototype.readAsBinaryString = function (fileData) {
+                    var binary = '', self = this, reader = new FileReader();
+                    reader.onload = function (e) {
+                        var bytes = new Uint8Array(reader.result);
+                        for (var i = 0; i < bytes.byteLength; i++) { binary += String.fromCharCode(bytes[i]); }
+                        self.onload({ target: { result: binary } });
+                    }
+                    reader.readAsArrayBuffer(fileData);
+                }
+            }
+
+            // Detect if microphone & camera are present
+            // 0 = nomedia, 1 = miconly, 2 = mic&cam
+            function getUserMediaSupport(func) {
+                try {
+                    navigator.mediaDevices.enumerateDevices()
+                    .then(devices => {
+                        try {
+                            var mic = 0, cam = 0;
+                            devices.forEach(device => {
+                                if (device.kind === 'audioinput') { mic = 1; }
+                                if (device.kind === 'videoinput') { cam = 1; }
+                            })
+                            if (mic == 0) { func(0); }
+                            func(mic + cam);
+                        } catch (ex) { }
+                    })
+                } catch (ex) { }
+            }
+
             // Display a control message
             function displayControl(msg) {
                 QA('xmsg', '<div style="clear:both"><div style="color:gray;float:left;margin-bottom:2px">' + msg + '</div><div></div></div>');
@@ -129,21 +171,26 @@
                 QE('clearButton', state == 2);
                 QE('xouttext', state == 2);
                 QV('fileButton', state == 2);
-                QV('camButton', webchannel && webchannel.ok && !localStream);
+                QV('camButton', webchannel && webchannel.ok && !localStream && (userMediaSupport == 2));
-                QV('micButton', webchannel && webchannel.ok && !localStream);
+                QV('micButton', webchannel && webchannel.ok && !localStream && (userMediaSupport > 0));
                 QV('hangupButton', webchannel && webchannel.ok && localStream);
             }
 
             // This is the WebRTC setup
             function startWebRTC(id, startDataChannel) {
+                if ((webrtcSessions[0] != null) && (multiWebRtc == false)) { return webrtcSessions[0]; };
+
                 // Setup the WebRTC object
-                var webrtc;
+                var webrtc = null;
                 if (typeof RTCPeerConnection !== 'undefined') { webrtc = new RTCPeerConnection(webrtcconfiguration); }
                 else if (typeof webkitRTCPeerConnection !== 'undefined') { webrtc = new webkitRTCPeerConnection(webrtcconfiguration); }
+                if (webrtc == null) return null; // No WebRTC support.
+
                 webrtc.id = id;
                 webrtc.onicecandidate = function (e) { try { if (e.candidate != null) { sendws({ action: 'webRtcIce', ice: e.candidate, id: this.id }); } } catch (ex) { } }
-                webrtc.oniceconnectionstatechange = function () { if (webrtc && webrtc.iceConnectionState == 'failed') { hangUpButtonClick(webrtc.id); } }
+                webrtc.oniceconnectionstatechange = function () { if (webrtc && webrtc.iceConnectionState == 'failed') { webrtc.close(); if (webrtcSessions[webrtc.id]) { delete webrtcSessions[webrtc.id]; } } }
                 webrtc.ondatachannel = function (ev) {
+                    //console.log('ondatachannel');
                     webchannel = ev.channel;
                     webchannel.onmessage = function (event) { processMessage(event.data, 2); };
                     webchannel.onopen = function () { webchannel.ok = true; updateControls(); sendws({ action: 'rtcSwitch', v: 0 }); };
@@ -154,7 +201,7 @@
                     webrtc.holdTimer = setTimeout(function () { // This time is needed to keep Chrome from being to excited. Wait until we add all tracks before kicking this off.
                         //console.log('onnegotiationneeded', id);
                         webrtc.holdTimer = null;
-                        webrtc.createOffer(function (offer) { webrtc.setLocalDescription(offer, function () { sendws({ action: 'webRtcSdp', sdp: offer, id: id }); }, function () { hangUpButtonClick(id); }); }, function () { hangUpButtonClick(id); });
+                        webrtc.createOffer(function (offer) { /*console.log('offer', offer.sdp.length);*/ webrtc.setLocalDescription(offer, function () { sendws({ action: 'webRtcSdp', sdp: offer, id: id }); }, function () { hangUpButtonClick(id); }); }, function () { hangUpButtonClick(id); });
                     }, 20);
                 }
                 webrtc.ontrack = function (event) {
@@ -225,6 +272,7 @@
             // Send data over the websocket transport (WebSocket only)
             function sendws(data) {
                 if (state != 2) return;
+                //console.log('SEND', data);
                 if (typeof data == 'object') { data = JSON.stringify(data); }
                 if (socket != null) { socket.send(data); }
             }
@@ -236,7 +284,7 @@
             function processMessage(data, transport) {
                 if (typeof data == 'string') {
                     try { data = JSON.parse(data); } catch (ex) { console.log('Unable to parse', data); return; }
-                    //console.log(data);
+                    //console.log('RECV', data);
                     switch (data.action) {
                         case 'chat': { displayRemote(data.msg); break; } // Incoming chat message.
                         case 'random': { if (random > data.random) { startWebRTC(0, true); } break; } // If we have a larger random value, we start WebRTC.
@@ -369,7 +417,7 @@
             }
 
             // Convert a string into a blob
-            data2blob = function (data) {
+            function data2blob(data) {
                 var bytes = new Array(data.length);
                 for (var i = 0; i < data.length; i++) bytes[i] = data.charCodeAt(i);
                 return new Blob([new Uint8Array(bytes)]);
@@ -452,25 +500,29 @@
                 //console.log('hangUpButtonClick', id);
                 var localVideo = Q('localVideoCanvas');
                 var remoteVideo = Q('remoteVideoCanvas');
-                var webrtc = webrtcSessions[1];
+                var webrtc = webrtcSessions[(multiWebRtc == true)? id : 0];
 
                 if ((id == 0) && (webchannel != null)) { try { webchannel.close(); } catch (e) { } webchannel = null; }
 
                 if (webrtc) {
-                    webrtc.ontrack = null;
+                    if ((multiWebRtc == true) || (id == 0)) {
-                    webrtc.onremovetrack = null;
+                        webrtc.ontrack = null;
-                    webrtc.onremovestream = null;
+                        webrtc.onremovetrack = null;
-                    webrtc.onnicecandidate = null;
+                        webrtc.onremovestream = null;
-                    webrtc.oniceconnectionstatechange = null;
+                        webrtc.onnicecandidate = null;
-                    webrtc.onsignalingstatechange = null;
+                        webrtc.oniceconnectionstatechange = null;
-                    webrtc.onicegatheringstatechange = null;
+                        webrtc.onsignalingstatechange = null;
-                    webrtc.onnotificationneeded = null;
+                        webrtc.onicegatheringstatechange = null;
+                        webrtc.onnotificationneeded = null;
+                    }
 
-                    if ((id == 1) && localVideo.srcObject) { localVideo.srcObject.getTracks().forEach(track => track.stop()); }
+                    if ((id == 1) && localStream) { var tracks = localStream.getTracks(); for (var i in tracks) { tracks[i].stop(); } localStream = null; }
-                    if ((id == 2) && remoteVideo.srcObject) { remoteVideo.srcObject.getTracks().forEach(track => track.stop()); }
+                    if ((id == 2) && remoteStream) { var tracks = remoteStream.getTracks(); for (var i in tracks) { tracks[i].stop(); } remoteStream = null; }
 
-                    webrtc.close();
+                    if ((multiWebRtc == true) || (id == 0)) {
-                    delete webrtcSessions[id];
+                        webrtc.close();
+                        delete webrtcSessions[id];
+                    }
                 }
 
                 if (id == 1) {
@@ -490,20 +542,24 @@
 
             // Setup local audio/video
             function startLocalStream(constraints) {
-                if ((localStream != null) || (webrtcSessions[1] != null)) return;
+                var channel = (multiWebRtc == true) ? 1 : 0;
+                if (localStream != null) return;
+                if ((multiWebRtc == true) && (webrtcSessions[1] != null)) return;
                 if (navigator.mediaDevices.getUserMedia) {
                     localStream = 1;
                     updateControls();
                     navigator.mediaDevices.getUserMedia(constraints)
                     .then(function (stream) {
                         localStream = stream;
+                        var tracks = localStream.getTracks();
+                        var webrtc = startWebRTC(channel);
                         if (constraints.video == true) {
-                            var video = Q('localVideoCanvas'), tracks = localStream.getTracks(), webrtc = startWebRTC(1);
+                            var video = Q('localVideoCanvas');
                             video.srcObject = stream;
                             video.onloadedmetadata = function (e) { video.play(); };
                             displayLocalVideo(true);
-                            for (var i in tracks) { webrtc.addTrack(tracks[i], localStream); }
                         }
+                        for (var i in tracks) { webrtc.addTrack(tracks[i], localStream); }
                     })
                     .catch(function (err) {
                         displayControl(err.message + '.');
@@ -519,7 +575,7 @@
                 if ((typeof args.id == 'string') && (args.id.length > 0)) {
                     socket = new WebSocket(window.location.protocol.replace("http", "ws") + "//" + window.location.host + window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) + '/meshrelay.ashx?id=' + args.id);
                     socket.onopen = function () { state = 1; displayControl('Waiting for other user...'); }
-                    socket.onerror = function (e) { console.error(e); }
+                    socket.onerror = function (e) { /*console.error(e);*/ }
                     socket.onclose = function () { disconnect(); }
                     socket.onmessage = function (msg) {
                         if ((state < 2) && (typeof msg.data == 'string') && (msg.data == 'c')) {
@@ -540,6 +596,12 @@
             }
 
             start();
+
+            function onUnLoad() {
+                for (var i = 0; i < 3; i++) { if (webrtcSessions[i]) { webrtcSessions[i].close(); delete webrtcSessions[i]; } }
+                if (webchannel != null) { try { webchannel.close(); } catch (e) { } webchannel = null; }
+                if (socket != null) { try { socket.close(); } catch (e) { } socket = null; }
+            }
         </script>
 </body>
 </html>

webserver.js

@@ -656,6 +656,17 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
         if ((domain.sspi != null) && ((req.query.login == null) || (obj.parent.loginCookieEncryptionKey == null))) {
             // Login using SSPI
             domain.sspi.authenticate(req, res, function (err) { if ((err != null) || (req.connection.user == null)) { res.end('Authentication Required...'); } else { handleRootRequestEx(req, res, domain); } });
+        } else if (req.query.user && req.query.pass) {
+            // User credentials are being passed in the URL. WARNING: Putting credentials in a URL is not good security... but people are requesting this option.
+            var userid = 'user/' + domain.id + '/' + req.query.user.toLowerCase();
+            if (obj.users[userid] != null) {
+                obj.authenticate(req.query.user, req.query.pass, domain, function (err, userid) {
+                    req.session.userid = userid;
+                    req.session.domainid = domain.id;
+                    req.session.currentNode = '';
+                    handleRootRequestEx(req, res, domain);
+                });
+            }
         } else {
             // Login using a different system
             handleRootRequestEx(req, res, domain);
@@ -813,7 +824,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
         return '';
     }
 
-    // Renter the terms of service.
+    // Render the terms of service.
     function handleTermsRequest(req, res) {
         var domain = checkUserIpAddress(req, res);
         if (domain == null) return;
@@ -847,6 +858,14 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
         }
     }
 
+    // Render the messenger application.
+    function handleMessengerRequest(req, res) {
+        var webRtcConfig = null;
+        if (obj.parent.config.settings && obj.parent.config.settings.webrtconfig && (typeof obj.parent.config.settings.webrtconfig == 'object')) { webRtcConfig = encodeURIComponent(JSON.stringify(obj.parent.config.settings.webrtconfig)); }
+        res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0' });
+        res.render(obj.path.join(__dirname, 'views/messenger'), { webrtconfig: webRtcConfig });
+    }
+
     // Returns the server root certificate encoded in base64
     function getRootCertBase64() {
         var rootcert = obj.certificates.root.cert;
@@ -1188,7 +1207,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
 
                     // TLSSocket to encapsulate TLS communication, which then tunneled via SerialTunnel an then wrapped through CIRA APF
                     var TLSSocket = require('tls').TLSSocket;
-                    var tlsoptions = { secureProtocol: ((req.query.tls1only == 1) ? 'TLSv1_method' : 'SSLv23_method'), ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE, rejectUnauthorized: false, cert: obj.certificates.console.cert, key: obj.certificates.console.key };
+                    var tlsoptions = { secureProtocol: ((req.query.tls1only == 1) ? 'TLSv1_method' : 'SSLv23_method'), ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE, rejectUnauthorized: false };
                     var tlsock = new TLSSocket(ser, tlsoptions);
                     tlsock.on('error', function (err) { Debug(1, "CIRA TLS Connection Error ", err); });
                     tlsock.on('secureConnect', function () { Debug(2, "CIRA Secure TLS Connection"); ws._socket.resume(); });
@@ -1301,7 +1320,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                     ws._socket.resume();
                 } else {
                     // If TLS is going to be used, setup a TLS socket
-                    var tlsoptions = { secureProtocol: ((req.query.tls1only == 1) ? 'TLSv1_method' : 'SSLv23_method'), ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE, rejectUnauthorized: false, cert: obj.certificates.console.cert, key: obj.certificates.console.key };
+                    var tlsoptions = { secureProtocol: ((req.query.tls1only == 1) ? 'TLSv1_method' : 'SSLv23_method'), ciphers: 'RSA+AES:!aNULL:!MD5:!DSS', secureOptions: obj.constants.SSL_OP_NO_SSLv2 | obj.constants.SSL_OP_NO_SSLv3 | obj.constants.SSL_OP_NO_COMPRESSION | obj.constants.SSL_OP_CIPHER_SERVER_PREFERENCE, rejectUnauthorized: false };
                     ws.forwardclient = obj.tls.connect(port, node.host, tlsoptions, function () {
                         // The TLS connection method is the same as TCP, but located a bit differently.
                         Debug(2, 'TLS connected to ' + node.host + ':' + port + '.');
@@ -1843,6 +1862,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
         obj.app.get(url + 'checkmail', handleCheckMailRequest);
         obj.app.post(url + 'amtevents.ashx', obj.handleAmtEventRequest);
         obj.app.get(url + 'meshagents', obj.handleMeshAgentRequest);
+        obj.app.get(url + 'messenger', handleMessengerRequest);
         obj.app.get(url + 'meshosxagent', obj.handleMeshOsxAgentRequest);
         obj.app.get(url + 'meshsettings', obj.handleMeshSettingsRequest);
         obj.app.get(url + 'downloadfile.ashx', handleDownloadFile);