Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-18 07:31:33 +03:00
Code Issues Projects Releases Wiki Activity

automatically reconnect without x11 forwarding if rejected (fixes #1880)

Browse Source
This commit is contained in:
Eugene Pankov 2019-12-11 16:31:05 +01:00
parent 5a9625424c
commit 0a451c5876
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
terminus-ssh/src/api.ts
View File

@ -1,6 +1,6 @@
import { BaseSession } from 'terminus-terminal' import { BaseSession } from 'terminus-terminal'
import { Server, Socket, createServer, createConnection } from 'net' import { Server, Socket, createServer, createConnection } from 'net'
import { Client, ClientChannel } from 'ssh2' import { Client, ClientChannel, Channel } from 'ssh2'
import { Logger } from 'terminus-core' import { Logger } from 'terminus-core'
import { Subject, Observable } from 'rxjs' import { Subject, Observable } from 'rxjs'
@ -84,19 +84,35 @@ export class SSHSession extends BaseSession {
this.scripts = connection.scripts || [] this.scripts = connection.scripts || []
} }
async start () { private openShellChannel (options): Promise<ClientChannel> {
this.open = true return new Promise<ClientChannel>((resolve, reject) => {
this.ssh.shell({ term: 'xterm-256color' }, options, (err, shell) => {
this.shell = await new Promise<ClientChannel>((resolve, reject) => {
this.ssh.shell({ term: 'xterm-256color' }, { x11: true }, (err, shell) => {
if (err) { if (err) {
this.emitServiceMessage(`Remote rejected opening a shell channel: ${err}`)
reject(err) reject(err)
} else { } else {
resolve(shell) resolve(shell)
} }
}) })
}) })
}
async start () {
this.open = true
try {
try {
this.shell = await this.openShellChannel({ x11: true })
} catch (e) {
if (e.toString().includes('Unable to request X11')) {
this.logger.debug('X11 forwarding rejected, trying without')
this.shell = await this.openShellChannel({})
} else {
throw e
}
}
} catch (err) {
this.emitServiceMessage(`Remote rejected opening a shell channel: ${err}`)
}
this.shell.on('greeting', greeting => { this.shell.on('greeting', greeting => {
this.emitServiceMessage(`Shell greeting: ${greeting}`) this.emitServiceMessage(`Shell greeting: ${greeting}`)