Fixed MeshCMD

MeshCentralServer.njsproj

@@ -32,7 +32,6 @@
     <Compile Include="agents\modules_meshcmd\amt-wsman.js" />
     <Compile Include="agents\modules_meshcmd\amt-xml.js" />
     <Compile Include="agents\modules_meshcmd\amt.js" />
-    <Compile Include="agents\modules_meshcmd\process-manager.js" />
     <Compile Include="agents\modules_meshcmd\service-host.js" />
     <Compile Include="agents\modules_meshcmd\service-manager.js" />
     <Compile Include="agents\modules_meshcmd\smbios.js" />

agents/modules_meshcmd/amt-xml.js

@@ -121,6 +121,8 @@ function _getChildElementsByTagName(name) { var ret = []; if (this.childNodes !=
 function _getChildElementsByTagNameNS(ns, name) { var ret = []; if (this.childNodes != null) { for (var node in this.childNodes) { if (this.childNodes[node].localName == name && (ns == '*' || this.childNodes[node].namespace == ns)) { ret.push(this.childNodes[node]); } } } return (ret); }
 function _xmlTraverseAllRec(nodes, func) { for (var i in nodes) { func(nodes[i]); if (nodes[i].childNodes) { _xmlTraverseAllRec(nodes[i].childNodes, func); } } }
 function _turnToXmlRec(text) {
+    try {
+        if (text == null) return null;
         var elementStack = new _treeBuilder(), lastElement = null, x1 = text.split('<'), ret = [], element = null, currentElementName = null;
         for (var i in x1) {
             var x2 = x1[i].split('>'), x3 = x2[0].split(' '), elementName = x3[0];
@@ -181,5 +183,6 @@ function _turnToXmlRec(text) {
                 } else { lastElement = elementStack.pop(); }
             }
         }
+    } catch (ex) { return null; }
     return lastElement;
 }

agents/modules_meshcore/amt-xml.js

@@ -121,6 +121,7 @@ function _getChildElementsByTagName(name) { var ret = []; if (this.childNodes !=
 function _getChildElementsByTagNameNS(ns, name) { var ret = []; if (this.childNodes != null) { for (var node in this.childNodes) { if (this.childNodes[node].localName == name && (ns == '*' || this.childNodes[node].namespace == ns)) { ret.push(this.childNodes[node]); } } } return (ret); }
 function _xmlTraverseAllRec(nodes, func) { for (var i in nodes) { func(nodes[i]); if (nodes[i].childNodes) { _xmlTraverseAllRec(nodes[i].childNodes, func); } } }
 function _turnToXmlRec(text) {
+    if (text == null) return null;
     var elementStack = new _treeBuilder(), lastElement = null, x1 = text.split('<'), ret = [], element = null, currentElementName = null;
     for (var i in x1) {
         var x2 = x1[i].split('>'), x3 = x2[0].split(' '), elementName = x3[0];

meshcentral.js

@@ -1649,8 +1649,7 @@ function InstallModule(modulename, func, tag1, tag2) {
     InstallModuleChildProcess = child_process.exec('npm install --no-optional --save ' + modulename, { maxBuffer: 512000, timeout: 10000 }, function (error, stdout, stderr) {
         InstallModuleChildProcess = null;
         if (error != null) {
-            console.log('ERROR: Unable to install missing package \'' + modulename + '\', make sure npm is installed: ' + error);
-            console.log(stdout);
+            console.log('ERROR: Unable to install required module "' + modulename + '". MeshCentral may not have access to npm, or npm may not have suffisent rights to load the new module. Try "npm install ' + modulename + '" to manualy install this module.\r\n');
             process.exit();
             return;
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.1-p",
+  "version": "0.3.1-q",
   "keywords": [
     "Remote Management",
     "Intel AMT",

views/default.handlebars

@@ -1549,9 +1549,11 @@
                             meshserver.send({ action: 'otp-hkey-setup-response', response: registrationResponse, name: Q('dp1keyname').value });
                             setDialogMode(2, "Add Security Key", 0, null, '<br />Checking...<br /><br /><br />', 'otpauth-hardware-manage');
                         } else {
+                            if (xxdialogMode && (xxdialogTag != 'otpauth-hardware-manage')) {
                                 var errorCodes = ['', 'Unknown error', 'Bad request', 'Unsupported configuration', 'This key was already registered', 'Timeout'];
                                 setDialogMode(2, "Add Security Key", 1, null, '<br />' + errorCodes[registrationResponse.errorCode] + '.<br /><br />');
                             }
+                        }
                     }, message.request.timeoutSeconds);
                     break;
                 }