Updated mesh agents.

agents/recoverycore.js

@@ -1,14 +1,56 @@
 
 var http = require('http');
 var childProcess = require('child_process');
-var meshCoreObj = { "action": "coreinfo", "value": "MeshCore Recovery", "caps": 10 }; // Capability bitmask: 1 = Desktop, 2 = Terminal, 4 = Files, 8 = Console, 16 = JavaScript
+var meshCoreObj = { "action": "coreinfo", "value": "MeshCore Recovery", "caps": 14 }; // Capability bitmask: 1 = Desktop, 2 = Terminal, 4 = Files, 8 = Console, 16 = JavaScript
 var nextTunnelIndex = 1;
 var tunnels = {};
+var fs = require('fs');
+
+//attachDebugger({ webport: 9994, wait: 1 }).then(function (p) { console.log('Debug on port: ' + p); });
 
 function sendConsoleText(msg)
 {
     require('MeshAgent').SendCommand({ "action": "msg", "type": "console", "value": msg });
 }
+// Return p number of spaces 
+function addPad(p, ret) { var r = ''; for (var i = 0; i < p; i++) { r += ret; } return r; }
+
+var path =
+    {
+        join: function ()
+        {
+            var x = [];
+            for (var i in arguments)
+            {
+                var w = arguments[i];
+                if (w != null)
+                {
+                    while (w.endsWith('/') || w.endsWith('\\')) { w = w.substring(0, w.length - 1); }
+                    if (i != 0)
+                    {
+                        while (w.startsWith('/') || w.startsWith('\\')) { w = w.substring(1); }
+                    }
+                    x.push(w);
+                }
+            }
+            if (x.length == 0) return '/';
+            return x.join('/');
+        }
+    };
+// Convert an object to string with all functions
+function objToString(x, p, pad, ret) {
+    if (ret == undefined) ret = '';
+    if (p == undefined) p = 0;
+    if (x == null) { return '[null]'; }
+    if (p > 8) { return '[...]'; }
+    if (x == undefined) { return '[undefined]'; }
+    if (typeof x == 'string') { if (p == 0) return x; return '"' + x + '"'; }
+    if (typeof x == 'buffer') { return '[buffer]'; }
+    if (typeof x != 'object') { return x; }
+    var r = '{' + (ret ? '\r\n' : ' ');
+    for (var i in x) { if (i != '_ObjectID') { r += (addPad(p + 2, pad) + i + ': ' + objToString(x[i], p + 2, pad, ret) + (ret ? '\r\n' : ' ')); } }
+    return r + addPad(p, pad) + '}';
+}
 
 // Split a string taking into account the quoats. Used for command line parsing
 function splitArgs(str)
@@ -122,6 +164,12 @@ require('MeshAgent').AddCommandHandler(function (data)
                                     s.on('end', function ()
                                     {
                                         if (tunnels[this.httprequest.index] == null) return; // Stop duplicate calls.
+
+                                        // If there is a upload or download active on this connection, close the file
+                                        if (this.httprequest.uploadFile) { fs.closeSync(this.httprequest.uploadFile); this.httprequest.uploadFile = undefined; }
+                                        if (this.httprequest.downloadFile) { fs.closeSync(this.httprequest.downloadFile); this.httprequest.downloadFile = undefined; }
+
+
                                         //sendConsoleText("Tunnel #" + this.httprequest.index + " closed.", this.httprequest.sessionid);
                                         delete tunnels[this.httprequest.index];
 
@@ -130,6 +178,14 @@ require('MeshAgent').AddCommandHandler(function (data)
                                     });
                                     s.on('data', function (data)
                                     {
+                                        // If this is upload data, save it to file
+                                        if (this.httprequest.uploadFile)
+                                        {
+                                            try { fs.writeSync(this.httprequest.uploadFile, data); } catch (e) { this.write(new Buffer(JSON.stringify({ action: 'uploaderror' }))); return; } // Write to the file, if there is a problem, error out.
+                                            this.write(new Buffer(JSON.stringify({ action: 'uploadack', reqid: this.httprequest.uploadFileid }))); // Ask for more data
+                                            return;
+                                        }
+
                                         if (this.httprequest.state == 0) {
                                             // Check if this is a relay connection
                                             if (data == 'c') { this.httprequest.state = 1; sendConsoleText("Tunnel #" + this.httprequest.index + " now active", this.httprequest.sessionid); }
@@ -175,6 +231,76 @@ require('MeshAgent').AddCommandHandler(function (data)
                                                     });
                                                 }
                                             }
+                                            else if (this.httprequest.protocol == 5)
+                                            {
+                                                // Process files commands
+                                                var cmd = null;
+                                                try { cmd = JSON.parse(data); } catch (e) { };
+                                                if (cmd == null) { return; }
+                                                if ((cmd.ctrlChannel == '102938') || ((cmd.type == 'offer') && (cmd.sdp != null))) { return; } // If this is control data, handle it now.
+                                                if (cmd.action == undefined) { return; }
+                                                console.log('action: ', cmd.action);
+
+                                                //sendConsoleText('CMD: ' + JSON.stringify(cmd));
+
+                                                if ((cmd.path != null) && (process.platform != 'win32') && (cmd.path[0] != '/')) { cmd.path = '/' + cmd.path; } // Add '/' to paths on non-windows
+                                                //console.log(objToString(cmd, 0, ' '));
+                                                switch (cmd.action)
+                                                {
+                                                    case 'ls':
+                                                        // Send the folder content to the browser
+                                                        var response = getDirectoryInfo(cmd.path);
+                                                        if (cmd.reqid != undefined) { response.reqid = cmd.reqid; }
+                                                        this.write(new Buffer(JSON.stringify(response)));
+                                                        break;
+                                                    case 'mkdir': {
+                                                        // Create a new empty folder
+                                                        fs.mkdirSync(cmd.path);
+                                                        break;
+                                                    }
+                                                    case 'rm': {
+                                                        // Delete, possibly recursive delete
+                                                        for (var i in cmd.delfiles)
+                                                        {
+                                                            try { deleteFolderRecursive(path.join(cmd.path, cmd.delfiles[i]), cmd.rec); } catch (e) { }
+                                                        }
+                                                        break;
+                                                    }
+                                                    case 'rename': {
+                                                        // Rename a file or folder
+                                                        var oldfullpath = path.join(cmd.path, cmd.oldname);
+                                                        var newfullpath = path.join(cmd.path, cmd.newname);
+                                                        try { fs.renameSync(oldfullpath, newfullpath); } catch (e) { console.log(e); }
+                                                        break;
+                                                    }
+                                                    case 'upload': {
+                                                        // Upload a file, browser to agent
+                                                        if (this.httprequest.uploadFile != undefined) { fs.closeSync(this.httprequest.uploadFile); this.httprequest.uploadFile = undefined; }
+                                                        if (cmd.path == undefined) break;
+                                                        var filepath = cmd.name ? path.join(cmd.path, cmd.name) : cmd.path;
+                                                        try { this.httprequest.uploadFile = fs.openSync(filepath, 'wbN'); } catch (e) { this.write(new Buffer(JSON.stringify({ action: 'uploaderror', reqid: cmd.reqid }))); break; }
+                                                        this.httprequest.uploadFileid = cmd.reqid;
+                                                        if (this.httprequest.uploadFile) { this.write(new Buffer(JSON.stringify({ action: 'uploadstart', reqid: this.httprequest.uploadFileid }))); }
+                                                        break;
+                                                    }
+                                                    case 'copy': {
+                                                        // Copy a bunch of files from scpath to dspath
+                                                        for (var i in cmd.names) {
+                                                            var sc = path.join(cmd.scpath, cmd.names[i]), ds = path.join(cmd.dspath, cmd.names[i]);
+                                                            if (sc != ds) { try { fs.copyFileSync(sc, ds); } catch (e) { } }
+                                                        }
+                                                        break;
+                                                    }
+                                                    case 'move': {
+                                                        // Move a bunch of files from scpath to dspath
+                                                        for (var i in cmd.names) {
+                                                            var sc = path.join(cmd.scpath, cmd.names[i]), ds = path.join(cmd.dspath, cmd.names[i]);
+                                                            if (sc != ds) { try { fs.copyFileSync(sc, ds); fs.unlinkSync(sc); } catch (e) { } }
+                                                        }
+                                                        break;
+                                                    }
+                                                }
+                                            }
                                         }
                                     });
                                 });
@@ -281,3 +407,60 @@ function processConsoleCommand(cmd, args, rights, sessionid)
     } catch (e) { response = 'Command returned an exception error: ' + e; console.log(e); }
     if (response != null) { sendConsoleText(response, sessionid); }
 }
+
+// Get a formated response for a given directory path
+function getDirectoryInfo(reqpath)
+{
+    var response = { path: reqpath, dir: [] };
+    if (((reqpath == undefined) || (reqpath == '')) && (process.platform == 'win32')) {
+        // List all the drives in the root, or the root itself
+        var results = null;
+        try { results = fs.readDrivesSync(); } catch (e) { } // TODO: Anyway to get drive total size and free space? Could draw a progress bar.
+        if (results != null) {
+            for (var i = 0; i < results.length; ++i) {
+                var drive = { n: results[i].name, t: 1 };
+                if (results[i].type == 'REMOVABLE') { drive.dt = 'removable'; } // TODO: See if this is USB/CDROM or something else, we can draw icons.
+                response.dir.push(drive);
+            }
+        }
+    } else {
+        // List all the files and folders in this path
+        if (reqpath == '') { reqpath = '/'; }
+        var results = null, xpath = path.join(reqpath, '*');
+        //if (process.platform == "win32") { xpath = xpath.split('/').join('\\'); }
+        try { results = fs.readdirSync(xpath); } catch (e) { }
+        if (results != null) {
+            for (var i = 0; i < results.length; ++i) {
+                if ((results[i] != '.') && (results[i] != '..')) {
+                    var stat = null, p = path.join(reqpath, results[i]);
+                    //if (process.platform == "win32") { p = p.split('/').join('\\'); }
+                    try { stat = fs.statSync(p); } catch (e) { } // TODO: Get file size/date
+                    if ((stat != null) && (stat != undefined)) {
+                        if (stat.isDirectory() == true) {
+                            response.dir.push({ n: results[i], t: 2, d: stat.mtime });
+                        } else {
+                            response.dir.push({ n: results[i], t: 3, s: stat.size, d: stat.mtime });
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return response;
+}
+// Delete a directory with a files and directories within it
+function deleteFolderRecursive(path, rec) {
+    if (fs.existsSync(path)) {
+        if (rec == true) {
+            fs.readdirSync(path.join(path, '*')).forEach(function (file, index) {
+                var curPath = path.join(path, file);
+                if (fs.statSync(curPath).isDirectory()) { // recurse
+                    deleteFolderRecursive(curPath, true);
+                } else { // delete file
+                    fs.unlinkSync(curPath);
+                }
+            });
+        }
+        fs.unlinkSync(path);
+    }
+};

meshagent.js

@@ -322,7 +322,13 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
     ws.on('error', function (err) { console.log('AGENT WSERR: ' + err); });
 
     // If the mesh agent web socket is closed, clean up.
-    ws.on('close', function (req) { if (obj.nodeid != null) { obj.parent.parent.debug(1, 'Agent disconnect ' + obj.nodeid + ' (' + obj.remoteaddrport + ')'); } obj.close(0); });
+    ws.on('close', function (req) {
+        if (obj.nodeid != null) {
+            //console.log('Agent disconnect ' + obj.nodeid + ' (' + obj.remoteaddrport + ') id=' + obj.agentInfo.agentId);
+            obj.parent.parent.debug(1, 'Agent disconnect ' + obj.nodeid + ' (' + obj.remoteaddrport + ') id=' + obj.agentInfo.agentId);
+        }
+        obj.close(0);
+    });
     // obj.ws._socket._parent.on('close', function (req) { if (obj.nodeid != null) { obj.parent.parent.debug(1, 'Agent TCP disconnect ' + obj.nodeid + ' (' + obj.remoteaddrport + ')'); } });
 
     // Start authenticate the mesh agent by sending a auth nonce & server TLS cert hash.

public/scripts/agent-desktop-0.0.2.js

@@ -160,6 +160,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
 
     obj.ProcessScreenMsg = function (width, height) {
         if (obj.debugmode > 0) { console.log("ScreenSize: " + width + " x " + height); }
+        console.log("ScreenSize: " + width + " x " + height);
         obj.Canvas.setTransform(1, 0, 0, 1, 0, 0);
         obj.rotation = 0;
         obj.FirstDraw = true;

views/default.handlebars

@@ -6620,7 +6620,7 @@
         //function addHtmlValue(t, v) { return '<div style=height:20px><div style=float:right;width:220px><b>' + v + '</b></div><div>' + t + '</div></div>'; }
         function addHtmlValue(t, v) { return '<table><td style=width:120px>' + t + '<td><b>' + v + '</b></table>'; }
         function addHtmlValue2(t, v) { return '<div><div style=display:inline-block;float:right>' + v + '</div><div style=display:inline-block>' + t + '</div></div>'; }
-        function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = parsedUri[x]; break; } case 1: { r[name] = parsedUri[x]; var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } default: { break; } } } return r; }
+        function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = decodeURIComponent(parsedUri[x]); break; } case 1: { r[name] = decodeURIComponent(parsedUri[x]); var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } default: { break; } } } return r; }
         function focusTextBox(x) { setTimeout(function(){ Q(x).selectionStart = Q(x).selectionEnd = 65535; Q(x).focus(); }, 0); }
         function validateEmail(v) { var emailReg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; return emailReg.test(v); } // New version
     </script>

views/messenger.handlebars

@@ -162,7 +162,7 @@
             }
 
             function haltEvent(e) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
-            function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = parsedUri[x]; break; } case 1: { r[name] = parsedUri[x]; var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } default: { break; } } } return r; }
+            function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = decodeURIComponent(parsedUri[x]); break; } case 1: { r[name] = decodeURIComponent(parsedUri[x]); var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } default: { break; } } } return r; }
 
             // Update user controls
             function updateControls() {