mirror of https://github.com/mthenw/frontail.git
[#42] Follow doSecure approach for SSH connections
parent
3909011c1c
commit
1d8fb184c3
21
index.js
21
index.js
|
@ -26,25 +26,17 @@ if (program.args.length === 0) {
|
|||
*/
|
||||
var doAuthorization = !!(program.user && program.password);
|
||||
var doSecure = !!(program.key && program.certificate);
|
||||
var doSSH = (program.remoteHost);
|
||||
var sessionSecret = String(+new Date()) + Math.random();
|
||||
var sessionKey = 'sid';
|
||||
var files = program.args.join(' ');
|
||||
var filesNamespace = crypto.createHash('md5').update(files).digest('hex');
|
||||
|
||||
/**
|
||||
* When connected send starting data
|
||||
*/
|
||||
var sshOptions = {
|
||||
remoteHost: program.remoteHost,
|
||||
remoteUser: program.remoteUser,
|
||||
remotePort: program.remotePort
|
||||
};
|
||||
|
||||
if (program.daemonize) {
|
||||
daemonize(__filename, program, {
|
||||
doAuthorization: doAuthorization,
|
||||
doSecure: doSecure,
|
||||
sshOptions: sshOptions
|
||||
doSSH: doSSH
|
||||
});
|
||||
} else {
|
||||
/**
|
||||
|
@ -98,6 +90,15 @@ if (program.daemonize) {
|
|||
highlightConfig = require(path.resolve(configPath));
|
||||
}
|
||||
|
||||
/**
|
||||
* When connected send starting data
|
||||
*/
|
||||
var sshOptions = {
|
||||
remoteHost: program.remoteHost,
|
||||
remoteUser: program.remoteUser,
|
||||
remotePort: program.remotePort
|
||||
};
|
||||
|
||||
var tailer = tail(program.args, {buffer: program.number, sshOptions:sshOptions});
|
||||
var filesSocket = io.of('/' + filesNamespace).on('connection', function (socket) {
|
||||
socket.emit('options:lines', program.lines);
|
||||
|
|
|
@ -35,7 +35,7 @@ module.exports = function (script, params, options) {
|
|||
);
|
||||
}
|
||||
|
||||
if (options.sshOptions) {
|
||||
if (options.doSSH) {
|
||||
args.push(
|
||||
'--remote-host', params.remoteHost,
|
||||
'--remote-user', params.remoteUser,
|
||||
|
|
Loading…
Reference in New Issue