Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Resolve SSH X11 Forwarding Repeated Handshake and Key Confirmation Issue #9544

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix: Resolve SSH X11 Forwarding Repeated Handshake and Key Confirmation Issue #9544

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ddd1f
Fix SSH X11 Repeated Handshake Issue
Mar 22, 2024
31e3554
Fix SSH X11 Repeated Handshake Issue
Mar 22, 2024
10c974f
Fix SSH X11 Repeated Handshake Issue
Mar 22, 2024
5356085
Fix SSH X11 Repeated Handshake Issue
Mar 26, 2024
7114e41
Merge branch 'Eugeny:master' into master
cfs4819 Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions tabby-ssh/src/session/ssh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,22 @@ export class SSHSession {
}

const hostVerifiedPromise: Promise<void> = new Promise((resolve, reject) => {
let hostkeyOld = ''
let isKeyVerified = false
ssh.on('handshake', async handshake => {
if (!await this.verifyHostKey(handshake)) {
this.ssh.end()
reject(new Error('Host key verification failed'))
if (isKeyVerified) {
resolve()
return
}
if (hostkeyOld !== handshake.serverHostKey) {
hostkeyOld = handshake.serverHostKey
if (!await this.verifyHostKey(handshake)) {
this.ssh.end()
reject(new Error('Host key verification failed'))
isKeyVerified = false
}else {
isKeyVerified = true
}
}
this.logger.info('Handshake complete:', handshake)
resolve()
Expand Down