GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-09-24 17:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh: fixed socks proxy connection race condition - fixes #5093, fixes #5060, fixes #5632

Browse Source
This commit is contained in:
Eugene Pankov
2022-01-29 15:26:26 +01:00
parent 3e8e3f7ccd
commit 02a3a8200b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tabby-ssh/src/services/ssh.service.ts
View File

@@ -74,7 +74,9 @@ export class SocksProxyStream extends Duplex {
}, s => { }, s => {
resolve(s) resolve(s)
this.header = s.read() this.header = s.read()
if (this.header) {
this.push(this.header) this.push(this.header)
}
}) })
connector.on('error', (err) => { connector.on('error', (err) => {
reject(err) reject(err)
@@ -82,7 +84,7 @@ export class SocksProxyStream extends Duplex {
}) })
}) })
this.client?.on('data', data => { this.client?.on('data', data => {
if (data !== this.header) { if (!this.header || data !== this.header) {
// socksv5 doesn't reliably emit the first data event // socksv5 doesn't reliably emit the first data event
this.push(data) this.push(data)
this.header = null this.header = null