Browse Source

allow command and sshadrress to be se by url

pull/126/head
butlerx 6 years ago
parent
commit
f3593eedec
No known key found for this signature in database GPG Key ID: B37CA765BAA89170
  1. 22
      src/server/command.ts
  2. 2
      src/server/term.ts
  3. 12
      src/server/wetty.ts

22
src/server/command.ts

@ -32,11 +32,13 @@ export default (
args: localhost(host)
? loginOptions(command, remoteAddress)
: sshOptions(
address(referer, user, host),
port,
auth,
command,
urlArgs(referer, { pass }),
urlArgs(referer, {
ssh: address(referer, user, host),
port: `${port}`,
pass,
command,
auth,
}),
key
),
user:
@ -47,19 +49,15 @@ export default (
});
function sshOptions(
sshAddress: string,
port: number,
auth: string,
command: string,
{ pass, path }: { [s: string]: string },
{ pass, path, command, ssh, port, auth }: { [s: string]: string },
key?: string
): string[] {
const sshRemoteOptsBase = [
'ssh',
sshAddress,
ssh,
'-t',
'-p',
`${port}`,
port,
'-o',
`PreferredAuthentications=${auth}`,
path !== undefined

2
src/server/term.ts

@ -37,7 +37,6 @@ export default class Term {
.on('disconnect', () => {
const { pid } = term;
term.kill();
term.destroy();
events.exited(0, pid);
});
}
@ -59,7 +58,6 @@ export default class Term {
})
.on('disconnect', () => {
term.kill();
term.destroy();
reject();
});
});

12
src/server/wetty.ts

@ -42,9 +42,6 @@ export default class WeTTy extends EventEmitter {
/**
* @event wetty#connection
* @name connection
* @type {object}
* @property {string} msg Message for logs
* @property {Date} date date and time of connection
*/
this.emit('connection', {
msg: `Connection accepted.`,
@ -80,9 +77,6 @@ export default class WeTTy extends EventEmitter {
* @event WeTTy#spawn
* @name spawn
* @type {object}
* @property {string} msg Message containing pid info and status
* @property {number} pid Pid of the terminal
* @property {string} address address of connecting user
*/
this.emit('spawn', {
msg: `PID=${pid} STARTED on behalf of ${address}`,
@ -101,9 +95,6 @@ export default class WeTTy extends EventEmitter {
* Terminal process exits
* @event WeTTy#exit
* @name exit
* @type {object}
* @property {number} code the exit code
* @property {string} msg Message containing pid info and status
*/
this.emit('exit', { code, msg: `PID=${pid} ENDED` });
}
@ -130,9 +121,6 @@ export default class WeTTy extends EventEmitter {
* @event WeTTy#server
* @type {object}
* @name server
* @property {string} msg Message for logging
* @property {number} port port sever is on
* @property {string} connection connection type for web traffic
*/
this.emit('server', {
msg: `${connection} on port ${port}`,

Loading…
Cancel
Save