Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-12-12 14:22:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

use winSCP.com utility to convert private key to ppk to launch winSCP

Browse source 
drop node-forge dependency
This commit is contained in:
Artur 2022-10-31 19:18:54 +02:00 committed by Eugene
parent 8b408bdcbc
commit 688b9de26c
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tabby-ssh/package.json
View file

@ -29,7 +29,6 @@
}, },
"dependencies": { "dependencies": {
"@luminati-io/socksv5": "^0.0.7", "@luminati-io/socksv5": "^0.0.7",
"node-forge": "^1.3.1",
"run-script-os": "^1.1.3", "run-script-os": "^1.1.3",
"tmp-promise": "^3.0.3" "tmp-promise": "^3.0.3"
}, },

9
tabby-ssh/src/services/ssh.service.ts
View file

@ -2,8 +2,6 @@ import * as shellQuote from 'shell-quote'
import * as net from 'net' import * as net from 'net'
import * as fs from 'fs/promises' import * as fs from 'fs/promises'
import * as tmp from 'tmp-promise' import * as tmp from 'tmp-promise'
import * as sshpk from 'sshpk'
import * as forge from 'node-forge'
import socksv5 from '@luminati-io/socksv5' import socksv5 from '@luminati-io/socksv5'
import { Duplex } from 'stream' import { Duplex } from 'stream'
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
@ -53,10 +51,9 @@ export class SSHService {
let tmpFile: tmp.FileResult|null = null let tmpFile: tmp.FileResult|null = null
if (session.activePrivateKey) { if (session.activePrivateKey) {
tmpFile = await tmp.file() tmpFile = await tmp.file()
const privateKey = await sshpk.parsePrivateKey(session.activePrivateKey, 'auto')/* .toString('putty') */ await fs.writeFile(tmpFile.path, session.activePrivateKey)
const forgePrivateKey = forge.pki.decryptRsaPrivateKey(privateKey.toString('pem')) const winSCPcom = path.slice(0, -3) + 'com'
const ppk = forge.ssh.privateKeyToPutty(forgePrivateKey) await this.platform.exec(winSCPcom, ['/keygen', tmpFile.path, `/output=${tmpFile.path}`])
await fs.writeFile(tmpFile.path, ppk)
args.push(`/privatekey=${tmpFile.path}`) args.push(`/privatekey=${tmpFile.path}`)
} }
await this.platform.exec(path, args) await this.platform.exec(path, args)

5
tabby-ssh/yarn.lock
View file

@ -214,11 +214,6 @@ minimatch@^3.1.1:
dependencies: dependencies:
brace-expansion "^1.1.7" brace-expansion "^1.1.7"
node-forge@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
once@^1.3.0: once@^1.3.0:
version "1.4.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"