From 1e27592ce4ff177374760b98b2b32fbdb66c007b Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 30 Nov 2020 13:20:31 -0800
Subject: [PATCH] Agent core download and reverse proxy improvements.

---
 agents/meshcore.js              | 2 +-
 views/default-mobile.handlebars | 4 ++++
 views/default.handlebars        | 1 +
 views/mstsc.handlebars          | 4 ++++
 views/terms-mobile.handlebars   | 4 ++++
 webserver.js                    | 9 +++++----
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/agents/meshcore.js b/agents/meshcore.js
index ad7c5e65..190e6b53 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -2274,7 +2274,7 @@ function createMeshCore(agent) {
                                     if ((process.cwd() != '//') && fs.existsSync(process.cwd() + 'core')) { cmd.path = process.cwd() + 'core'; }
                                 }
                             }
-                            MeshServerLogEx(49, [cmd.path], 'Download: \"' + cmd.path + '\"', this.httprequest);
+                            MeshServerLogEx((cmd.ask == 'coredump')?104:49, [cmd.path], 'Download: \"' + cmd.path + '\"', this.httprequest);
                             if ((cmd.path == null) || (this.filedownload != null)) { this.write({ action: 'download', sub: 'cancel', id: this.filedownload.id }); delete this.filedownload; }
                             this.filedownload = { id: cmd.id, path: cmd.path, ptr: 0 }
                             try { this.filedownload.f = fs.openSync(this.filedownload.path, 'rbN'); } catch (e) { this.write({ action: 'download', sub: 'cancel', id: this.filedownload.id }); delete this.filedownload; }
diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 93622242..c104e217 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -31,6 +31,10 @@
     <meta name="theme-color" content="#ffffff">
     <title>{{{title}}}</title>
     <style>
+        :focus {
+            outline: 0;
+        }
+
         a {
             color: #036;
             text-decoration: underline;
diff --git a/views/default.handlebars b/views/default.handlebars
index 429e6ab5..fd2476e9 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -11086,6 +11086,7 @@
             101: "Added device share {0} from {1} to {2}",
             102: "Removed device share {0}",
             103: "Batch upload of {0} file(s) to folder {1}",
+            104: "Automated download of agent core dump file: \"{0}\""
         };
 
         // Highlights the device being hovered
diff --git a/views/mstsc.handlebars b/views/mstsc.handlebars
index a96db993..b82c844a 100644
--- a/views/mstsc.handlebars
+++ b/views/mstsc.handlebars
@@ -14,6 +14,10 @@
     <script type="text/javascript" src="mstsc/client.js"></script>
     <script type="text/javascript" src="mstsc/canvas.js"></script>
     <style>
+        :focus {
+            outline: 0;
+        }
+
         body {
             font-family:sans-serif;
             margin: 0;
diff --git a/views/terms-mobile.handlebars b/views/terms-mobile.handlebars
index 95ba706d..f87eece8 100644
--- a/views/terms-mobile.handlebars
+++ b/views/terms-mobile.handlebars
@@ -10,6 +10,10 @@
     <link rel="apple-touch-icon" href="/favicon-303x303.png" />
     <title>{{{title}}} - Terms of use</title>
     <style type="text/css">
+        :focus {
+            outline: 0;
+        }
+
         a {
            color: #036;
             text-decoration: underline;
diff --git a/webserver.js b/webserver.js
index 01a9a260..ec07699a 100644
--- a/webserver.js
+++ b/webserver.js
@@ -3928,7 +3928,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
             if (obj.fs.existsSync(coreDumpPath) == false) { try { obj.fs.mkdirSync(coreDumpPath); } catch (ex) { } }
             ws.xfilepath = obj.path.join(parent.datapath, '..', 'meshcentral-coredumps', ws.xarg);
             ws.xid = 'coredump';
-            ws.send(JSON.stringify({ action: 'download', sub: 'start', ask: 'coredump', id: 'coredump' })); // Ask for a directory (test)
+            ws.send(JSON.stringify({ action: 'download', sub: 'start', ask: 'coredump', id: 'coredump' })); // Ask for a core dump file
         }
 
         // When data is received from the web socket, echo it back
@@ -4853,7 +4853,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
         obj.app.use(function (req, res, next) {
             // Set the real IP address of the request
             // If a trusted reverse-proxy is sending us the remote IP address, use it.
-            var ipex = '0.0.0.0', serverHost = req.headers.host;
+            var ipex = '0.0.0.0', xforwardedhost = req.headers.host;
             if (typeof req.connection.remoteAddress == 'string') { ipex = (req.connection.remoteAddress.startsWith('::ffff:')) ? req.connection.remoteAddress.substring(7) : req.connection.remoteAddress; }
             if (
                 (obj.args.trustedproxy === true) ||
@@ -4872,7 +4872,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                 }
 
                 // Get server host
-                if (req.headers['x-forwarded-host']) { serverHost = req.headers['x-forwarded-host']; }
+                if (req.headers['x-forwarded-host']) { xforwardedhost = req.headers['x-forwarded-host']; }
             } else {
                 req.clientIp = ipex;
             }
@@ -4892,7 +4892,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
             } else {
                 // Use default security headers
                 const geourl = (domain.geolocation ? ' *.openstreetmap.org' : '');
-                const selfurl = ' wss://' + serverHost;
+                var selfurl = ' wss://' + req.headers.host;
+                if ((xforwardedhost != null) && (xforwardedhost != req.headers.host)) { selfurl += ' wss://' + xforwardedhost; }
                 const headers = {
                     'Referrer-Policy': 'no-referrer',
                     'X-XSS-Protection': '1; mode=block',