GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-14 16:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter out unsupported SSH algos - fixes #5942

Browse Source
This commit is contained in:
Eugene Pankov 2022-03-16 10:10:30 +01:00
parent 1f73cd11b2
commit 0560196546
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tabby-ssh/src/session/ssh.ts
View File

@ -16,9 +16,10 @@ import { PasswordStorageService } from '../services/passwordStorage.service'
import { SSHKnownHostsService } from '../services/sshKnownHosts.service' import { SSHKnownHostsService } from '../services/sshKnownHosts.service'
import { promisify } from 'util' import { promisify } from 'util'
import { SFTPSession } from './sftp' import { SFTPSession } from './sftp'
import { ALGORITHM_BLACKLIST, SSHAlgorithmType, PortForwardType, SSHProfile, SSHProxyStream, AutoPrivateKeyLocator } from '../api' import { SSHAlgorithmType, PortForwardType, SSHProfile, SSHProxyStream, AutoPrivateKeyLocator } from '../api'
import { ForwardedPort } from './forwards' import { ForwardedPort } from './forwards'
import { X11Socket } from './x11' import { X11Socket } from './x11'
import { supportedAlgorithms } from '../algorithms'
const WINDOWS_OPENSSH_AGENT_PIPE = '\\\\.\\pipe\\openssh-ssh-agent' const WINDOWS_OPENSSH_AGENT_PIPE = '\\\\.\\pipe\\openssh-ssh-agent'
@ -201,7 +202,7 @@ export class SSHSession {
let connected = false let connected = false
const algorithms = {} const algorithms = {}
for (const key of Object.values(SSHAlgorithmType)) { for (const key of Object.values(SSHAlgorithmType)) {
algorithms[key] = this.profile.options.algorithms![key].filter(x => !ALGORITHM_BLACKLIST.includes(x)) algorithms[key] = this.profile.options.algorithms![key].filter(x => supportedAlgorithms[key].includes(x))
} }
const hostVerifiedPromise: Promise<void> = new Promise((resolve, reject) => { const hostVerifiedPromise: Promise<void> = new Promise((resolve, reject) => {