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

Merge branch 'master' of github.com:Eugeny/tabby

Browse Source
This commit is contained in:
Eugene 2025-05-25 11:47:18 +02:00
commit ef59394b79
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tabby-ssh/src/algorithms.ts
View File

@ -6,6 +6,7 @@ export const supportedAlgorithms = {
[SSHAlgorithmType.HOSTKEY]: russh.getSupportedKeyTypes().filter(x => x !== 'none'), [SSHAlgorithmType.HOSTKEY]: russh.getSupportedKeyTypes().filter(x => x !== 'none'),
[SSHAlgorithmType.CIPHER]: russh.getSupportedCiphers().filter(x => x !== 'clear'), [SSHAlgorithmType.CIPHER]: russh.getSupportedCiphers().filter(x => x !== 'clear'),
[SSHAlgorithmType.HMAC]: russh.getSupportedMACs().filter(x => x !== 'none'), [SSHAlgorithmType.HMAC]: russh.getSupportedMACs().filter(x => x !== 'none'),
[SSHAlgorithmType.COMPRESSION]: russh.getSupportedCompressionAlgorithms().reverse(),
} }
export const defaultAlgorithms = { export const defaultAlgorithms = {
@ -42,4 +43,9 @@ export const defaultAlgorithms = {
'hmac-sha1-etm@openssh.com', 'hmac-sha1-etm@openssh.com',
'hmac-sha1', 'hmac-sha1',
], ],
[SSHAlgorithmType.COMPRESSION]: [
'zlib@openssh.com',
'zlib',
'none',
],
} }

2
tabby-ssh/src/api/interfaces.ts
View File

@ -5,6 +5,8 @@ export enum SSHAlgorithmType {
KEX = 'kex', KEX = 'kex',
CIPHER = 'cipher', CIPHER = 'cipher',
HOSTKEY = 'serverHostKey', HOSTKEY = 'serverHostKey',
COMPRESSION = 'compression',
} }
export interface SSHProfile extends ConnectableTerminalProfile { export interface SSHProfile extends ConnectableTerminalProfile {

6
tabby-ssh/src/components/sshProfileSettings.component.pug
View File

@ -286,6 +286,12 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
div(*ngFor='let alg of supportedAlgorithms.serverHostKey') div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]') checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')
.form-line.align-items-start
.header
.title Compression
.w-75
div(*ngFor='let alg of supportedAlgorithms.compression')
checkbox([text]='alg', [(ngModel)]='algorithms.compression[alg]')
li(ngbNavItem) li(ngbNavItem)
a(ngbNavLink, translate) Colors a(ngbNavLink, translate) Colors
ng-template(ngbNavContent) ng-template(ngbNavContent)

2
tabby-ssh/src/components/sshProfileSettings.component.ts
View File

@ -107,7 +107,7 @@ export class SSHProfileSettingsComponent {
this.profile.options.algorithms![k] = Object.entries(this.algorithms[k]) this.profile.options.algorithms![k] = Object.entries(this.algorithms[k])
.filter(([_, v]) => !!v) .filter(([_, v]) => !!v)
.map(([key, _]) => key) .map(([key, _]) => key)
this.profile.options.algorithms![k].sort() if(k !== SSHAlgorithmType.COMPRESSION) { this.profile.options.algorithms![k].sort() }
} }
if (this.connectionMode !== 'jumpHost') { if (this.connectionMode !== 'jumpHost') {

2
tabby-ssh/src/profiles.ts
View File

@ -55,7 +55,7 @@ export class SSHProfilesService extends QuickConnectProfileProvider<SSHProfile>
super() super()
for (const k of Object.values(SSHAlgorithmType)) { for (const k of Object.values(SSHAlgorithmType)) {
this.configDefaults.options.algorithms[k] = [...defaultAlgorithms[k]] this.configDefaults.options.algorithms[k] = [...defaultAlgorithms[k]]
this.configDefaults.options.algorithms[k].sort() if (k !== SSHAlgorithmType.COMPRESSION) { this.configDefaults.options.algorithms[k].sort() }
} }
} }

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

@ -315,6 +315,7 @@ export class SSHSession {
kex: this.profile.options.algorithms?.[SSHAlgorithmType.KEX]?.filter(x => supportedAlgorithms[SSHAlgorithmType.KEX].includes(x)), kex: this.profile.options.algorithms?.[SSHAlgorithmType.KEX]?.filter(x => supportedAlgorithms[SSHAlgorithmType.KEX].includes(x)),
mac: this.profile.options.algorithms?.[SSHAlgorithmType.HMAC]?.filter(x => supportedAlgorithms[SSHAlgorithmType.HMAC].includes(x)), mac: this.profile.options.algorithms?.[SSHAlgorithmType.HMAC]?.filter(x => supportedAlgorithms[SSHAlgorithmType.HMAC].includes(x)),
key: this.profile.options.algorithms?.[SSHAlgorithmType.HOSTKEY]?.filter(x => supportedAlgorithms[SSHAlgorithmType.HOSTKEY].includes(x)), key: this.profile.options.algorithms?.[SSHAlgorithmType.HOSTKEY]?.filter(x => supportedAlgorithms[SSHAlgorithmType.HOSTKEY].includes(x)),
compression: this.profile.options.algorithms?.[SSHAlgorithmType.COMPRESSION]?.filter(x => supportedAlgorithms[SSHAlgorithmType.COMPRESSION].includes(x)),
}, },
keepaliveIntervalSeconds: Math.round((this.profile.options.keepaliveInterval ?? 15000) / 1000), keepaliveIntervalSeconds: Math.round((this.profile.options.keepaliveInterval ?? 15000) / 1000),
keepaliveCountMax: this.profile.options.keepaliveCountMax, keepaliveCountMax: this.profile.options.keepaliveCountMax,