diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 9890996f..ac26da21 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 76c0cf80..3377a38f 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 60b35c31..13ca8580 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService.exe b/agents/MeshService.exe index 81ac047d..3af133b0 100644 Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index d4f6f895..b8552db8 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe index 3d87e0a5..b53f5cb1 100644 Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ diff --git a/meshcentral.js b/meshcentral.js index a1d7f2ac..11ca7e13 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -99,7 +99,7 @@ function CreateMeshCentralServer(config, args) { console.log(' --redirport [number] Creates an additional HTTP server to redirect users to the HTTPS server.'); console.log(' --exactports Server must run with correct ports or exit.'); console.log(' --noagentupdate Server will not update mesh agent native binaries.'); - console.log(' --cert [name], (country), (org) Create a web server certificate with [name]server name.'); + console.log(' --cert [name], (country), (org) Create a web server certificate with [name] server name.'); console.log(' country and organization can optionaly be set.'); return; } @@ -1148,9 +1148,13 @@ function mainStart(args) { var config = getConfig(); if (config == null) { process.exit(); } + // Check is Windows SSPI will be used + var sspi = false; + if (require('os').platform() == 'win32') { for (var i in config.domains) { if (config.domains[i].auth == 'sspi') { sspi = true; } } } + // Build the list of required modules var modules = ['ws', 'nedb', 'https', 'yauzl', 'xmldom', 'express', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'express-session', 'express-handlebars']; - if (require('os').platform() == 'win32') { modules.push('node-sspi'); modules.push('node-windows'); } // Add Windows modules + if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules if (config.letsencrypt != null) { modules.push('greenlock'); modules.push('le-store-certbot'); modules.push('le-challenge-fs'); modules.push('le-acme-core'); } // Add Greenlock Modules if (config.settings.mongodb != null) { modules.push('mongojs'); } // Add MongoDB if (config.smtp != null) { modules.push('nodemailer'); } // Add SMTP support diff --git a/meshuser.js b/meshuser.js index 9c99be5e..7c3d4d27 100644 --- a/meshuser.js +++ b/meshuser.js @@ -624,7 +624,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) { if ((command.meshid.split('/').length != 3) || (command.meshid.split('/')[1] != domain.id)) return; // Invalid domain, operation only valid for current domain if ((obj.common.validateString(command.meshname, 1, 64) == true) && (command.meshname != mesh.name)) { change = 'Mesh name changed from "' + mesh.name + '" to "' + command.meshname + '"'; mesh.name = command.meshname; } - if ((obj.common.validateString(command.desc, 1, 1024) == true) && (command.desc != mesh.desc)) { if (change != '') change += ' and description changed'; else change += 'Mesh "' + mesh.name + '" description changed'; mesh.desc = command.desc; } + if ((obj.common.validateString(command.desc, 0, 1024) == true) && (command.desc != mesh.desc)) { if (change != '') change += ' and description changed'; else change += 'Mesh "' + mesh.name + '" description changed'; mesh.desc = command.desc; } if (change != '') { obj.db.Set(mesh); obj.parent.parent.DispatchEvent(['*', mesh._id, user._id], obj, { etype: 'mesh', username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id }) } } break; diff --git a/package.json b/package.json index d801fefc..22d130f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.1.7-s", + "version": "0.1.7-x", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 8db6b8ac..a2679a39 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -20,58 +20,34 @@ text-decoration: underline; } - #footer a:hover { - color: #fff; - text-decoration: none; - } - - .i1 { - background: url(../images/icons50.png) 0px 0px; - height: 50px; - width: 50px; - border: none; + #footer a:hover { + color: #fff; + text-decoration: none; } - .i2 { - background: url(../images/icons50.png) -50px 0px; - height: 50px; - width: 50px; - border: none; - } - - .i3 { - background: url(../images/icons50.png) -100px 0px; - height: 50px; - width: 50px; - border: none; - } - - .i4 { - background: url(../images/icons50.png) -150px 0px; - height: 50px; - width: 50px; - border: none; - } - - .i5 { - background: url(../images/icons50.png) -200px 0px; - height: 50px; - width: 50px; - border: none; - } - - .i6 { - background: url(../images/icons50.png) -250px 0px; - height: 50px; - width: 50px; - border: none; - } + .i1 {background:url(../images/icons50.png) 0px 0px;height:50px;width:50px;border:none;} + .i2 {background:url(../images/icons50.png) -50px 0px;height:50px;width:50px;border:none;} + .i3 {background:url(../images/icons50.png) -100px 0px;height:50px;width:50px;border:none;} + .i4 {background:url(../images/icons50.png) -150px 0px;height:50px;width:50px;border:none;} + .i5 {background:url(../images/icons50.png) -200px 0px;height:50px;width:50px;border:none;} + .i6 {background:url(../images/icons50.png) -250px 0px; height:50px;width:50px; border:none; } + .m0 {background:url(../images/images16.png) -32px 0px; height:16px;width:16px; border:none;float:left } + .m1 {background:url(../images/images16.png) -16px 0px; height:16px;width:16px; border:none;float:left } + .m2 {background:url(../images/images16.png) -96px 0px; height:16px;width:16px; border:none;float:left } + .m3 {background:url(../images/images16.png) -112px 0px; height:16px;width:16px; border:none;float:left } .gray { /*filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");*/ /* Firefox 10+, Firefox on Android */ filter: gray; /* IE6-9 */ -webkit-filter: grayscale(100%) opacity(60%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */ } + + .DevSt { + padding-left:5px; + border-bottom-style: solid; + border-bottom-width: 1px; + border-bottom-color: #DDDDDD; + } @@ -86,7 +62,7 @@
-
+
-