Fixed GreenLock v4
This commit is contained in:
Ylian Saint-Hilaire
parent
3e9543adf4
commit
5d4cf20e49
|
|
@ -39,7 +39,8 @@ var MESHRIGHT_LIMITEDINPUT = 4096;
|
|||
|
||||
function createMeshCore(agent) {
|
||||
var obj = {};
|
||||
if (process.platform == 'win32' && require('user-sessions').isRoot()) {
|
||||
if (process.platform == 'win32' && require('user-sessions').isRoot())
|
||||
{
|
||||
// Check the Agent Uninstall MetaData for correctness, as the installer may have written an incorrect value
|
||||
try {
|
||||
var writtenSize = 0, actualSize = Math.floor(require('fs').statSync(process.execPath).size / 1024);
|
||||
|
|
@ -1198,8 +1199,7 @@ function createMeshCore(agent) {
|
|||
this.pipe(this.httprequest._term, { dataTypeSkip: 1, end: false });
|
||||
this.prependListener('end', function () { this.httprequest._term.end(function () { console.log("Terminal was closed"); }); });
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
try {
|
||||
var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false;
|
||||
var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false;
|
||||
|
|
@ -1223,28 +1223,21 @@ function createMeshCore(agent) {
|
|||
var options = { uid: (this.httprequest.protocol == 8) ? require('user-sessions').consoleUid() : null, env: env };
|
||||
var setupcommands = ' alias ls=\'ls --color=auto\'\n';
|
||||
if (shell == sh) setupcommands += ' stty erase ^H\n';
|
||||
setupcommands += ' clear\n';
|
||||
|
||||
if (script && shell && process.platform == 'linux') {
|
||||
this.httprequest.process = childProcess.execFile(script, ['script', '--return', '--quiet', '-c', '"' + shell + '"', '/dev/null'], options); // Start as active user
|
||||
// Is child process the shell? Needed for resizing.
|
||||
this.httprequest.process.isChildShell = true;
|
||||
this.httprequest.process.stdin.write(setupcommands);
|
||||
} else if (python && shell) {
|
||||
this.httprequest.process = childProcess.execFile(python, ['python', '-c', 'import pty; pty.spawn(["' + shell + '"])'], options); // Start as active user
|
||||
// Is child process the shell? Needed for resizing.
|
||||
this.httprequest.process.isChildShell = true;
|
||||
if (process.platform == 'linux') { this.httprequest.process.stdin.write(setupcommands); }
|
||||
} else if (bash) {
|
||||
options.type = childProcess.SpawnTypes.TERM;
|
||||
this.httprequest.process = childProcess.execFile(bash, ['bash', '-i'], options); // Start as active user
|
||||
// Is child process the shell? Needed for resizing.
|
||||
this.httprequest.process.isChildShell = false;
|
||||
if (process.platform == 'linux') { this.httprequest.process.stdin.write(setupcommands); }
|
||||
} else if (sh) {
|
||||
options.type = childProcess.SpawnTypes.TERM;
|
||||
this.httprequest.process = childProcess.execFile(sh, ['sh'], options); // Start as active user
|
||||
// Is child process the shell? Needed for resizing.
|
||||
this.httprequest.process.isChildShell = false;
|
||||
if (process.platform == 'linux') { this.httprequest.process.stdin.write(setupcommands + "PS1='$ '\n"); }
|
||||
} else {
|
||||
MeshServerLog("Failed to start remote terminal session, no shell found");
|
||||
|
|
@ -1797,15 +1790,8 @@ function createMeshCore(agent) {
|
|||
// TODO
|
||||
} else {
|
||||
if (ws.httprequest.process == null) return;
|
||||
// ILibDuktape_ChildProcess kill doesn't support sending signals
|
||||
if (fs.existsSync("/bin/kill"))
|
||||
{
|
||||
if (ws.httprequest.process.isChildShell)
|
||||
// We need to send signal to the child of the process, since the child is the shell
|
||||
childProcess.execFile('/bin/bash', ['bash', "-c", "kill -SIGWINCH $(pgrep -P " + ws.httprequest.process.pid + ")"]);
|
||||
else
|
||||
childProcess.execFile('/bin/bash', ['bash', "-c", "kill -SIGWINCH " + ws.httprequest.process.pid]);
|
||||
}
|
||||
//sendConsoleText('Linux-TermSize: ' + obj.cols + 'x' + obj.rows);
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -2239,7 +2225,8 @@ function createMeshCore(agent) {
|
|||
break;
|
||||
}
|
||||
case 'ps': {
|
||||
processManager.getProcesses(function (plist) {
|
||||
processManager.getProcesses(function (plist)
|
||||
{
|
||||
var x = '';
|
||||
for (var i in plist) { x += i + ((plist[i].user) ? (', ' + plist[i].user) : '') + ', ' + plist[i].cmd + '\r\n'; }
|
||||
sendConsoleText(x, sessionid);
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
/*jshint esversion: 6 */
|
||||
'use strict';
|
||||
|
||||
var globalLetsEncrypt = null;
|
||||
|
||||
module.exports.CreateLetsEncrypt = function (parent) {
|
||||
try {
|
||||
// Get the GreenLock version
|
||||
|
|
@ -40,6 +42,7 @@ module.exports.CreateLetsEncrypt = function (parent) {
|
|||
// Get GreenLock setup and running.
|
||||
const greenlock = require('greenlock');
|
||||
var obj = {};
|
||||
globalLetsEncrypt = obj;
|
||||
obj.parent = parent;
|
||||
obj.path = require('path');
|
||||
obj.redirWebServerHooked = false;
|
||||
|
|
@ -258,7 +261,7 @@ module.exports.CreateLetsEncrypt = function (parent) {
|
|||
|
||||
// GreenLock v3 Manager
|
||||
module.exports.create = function (options) {
|
||||
var manager = { parent: options.parent };
|
||||
var manager = { parent: globalLetsEncrypt };
|
||||
manager.find = async function (options) {
|
||||
//console.log('LE-FIND', options);
|
||||
return Promise.resolve([{ subject: options.servername, altnames: options.altnames }]);
|
||||
|
|
|
|||
|
|
@ -2256,7 +2256,7 @@ function mainStart() {
|
|||
var modules = ['ws', 'cbor', 'nedb', 'https', 'yauzl', 'xmldom', 'ipcheck', 'express', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'cookie-session', 'express-handlebars'];
|
||||
if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules
|
||||
if (ldap == true) { modules.push('ldapauth-fork'); }
|
||||
if (config.letsencrypt != null) { if ((nodeVersion < 10) || (require('crypto').generateKeyPair == null)) { addServerWarning("Let's Encrypt support requires Node v10.12 or higher.", !args.launch); } else { modules.push('greenlock@3.1.5'); } } // Add Greenlock Module
|
||||
if (config.letsencrypt != null) { if ((nodeVersion < 10) || (require('crypto').generateKeyPair == null)) { addServerWarning("Let's Encrypt support requires Node v10.12 or higher.", !args.launch); } else { modules.push('greenlock'); } } // Add Greenlock Module
|
||||
if (config.settings.mqtt != null) { modules.push('aedes'); } // Add MQTT Modules
|
||||
if (config.settings.mongodb != null) { modules.push('mongodb'); } // Add MongoDB, official driver.
|
||||
if (config.settings.vault != null) { modules.push('node-vault'); } // Add official HashiCorp's Vault module.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "meshcentral",
|
||||
"version": "0.4.7-u",
|
||||
"version": "0.4.7-v",
|
||||
"keywords": [
|
||||
"Remote Management",
|
||||
"Intel AMT",
|
||||
|
|
@ -37,6 +37,7 @@
|
|||
"express": "^4.17.0",
|
||||
"express-handlebars": "^3.1.0",
|
||||
"express-ws": "^4.0.0",
|
||||
"greenlock": "^4.0.4",
|
||||
"ipcheck": "^0.1.0",
|
||||
"meshcentral": "*",
|
||||
"minimist": "^1.2.0",
|
||||
|
|
|
|||
|
|
@ -180,7 +180,6 @@
|
|||
break;
|
||||
case 3:
|
||||
// Connected
|
||||
tunnel.sendText(`mcresize() { old=$(stty -g);stty raw -echo min 0 time 5;printf '\\0337\\033[r\\033[999;999H\\033[6n\\0338' > /dev/tty;IFS='[;R' read -r _ rows cols _ < /dev/tty;stty "$old";stty cols "$cols" rows "$rows"; };trap mcresize SIGWINCH;clear\n`);
|
||||
term.focus();
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -3403,7 +3403,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
|||
if (obj.tlsSniCredentials != null) { tlsOptions.SNICallback = TlsSniCallback; } // We have multiple web server certificate used depending on the domain name
|
||||
obj.tlsServer = require('https').createServer(tlsOptions, obj.app);
|
||||
obj.tlsServer.on('secureConnection', function () { /*console.log('tlsServer secureConnection');*/ });
|
||||
obj.tlsServer.on('error', function () { console.log('tlsServer error'); });
|
||||
obj.tlsServer.on('error', function (err) { console.log('tlsServer error', err); });
|
||||
//obj.tlsServer.on('tlsClientError', function (err) { console.log('tlsClientError', err); });
|
||||
obj.tlsServer.on('newSession', function (id, data, cb) { if (tlsSessionStoreCount > 1000) { tlsSessionStoreCount = 0; tlsSessionStore = {}; } tlsSessionStore[id.toString('hex')] = data; tlsSessionStoreCount++; cb(); });
|
||||
obj.tlsServer.on('resumeSession', function (id, cb) { cb(null, tlsSessionStore[id.toString('hex')] || null); });
|
||||
obj.expressWs = require('express-ws')(obj.app, obj.tlsServer);
|
||||
|
|
|
|||
Loading…
Reference in New Issue