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

defer tempfile cleanup

Browse Source
This commit is contained in:
Eugene Pankov 2022-09-27 23:12:59 +02:00 committed by Eugene
parent 5f86e101df
commit 4675b7521e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,18 +50,17 @@ export class SSHService {
} }
const args = [await this.getWinSCPURI(session.profile, undefined, session.authUsername ?? undefined)] const args = [await this.getWinSCPURI(session.profile, undefined, session.authUsername ?? undefined)]
let tmpFile: tmp.FileResult|null = null
if (session.activePrivateKey) { if (session.activePrivateKey) {
const tmpFile = await tmp.file() tmpFile = await tmp.file()
const privateKey = await sshpk.parsePrivateKey(session.activePrivateKey, 'auto')/* .toString('putty') */ const privateKey = await sshpk.parsePrivateKey(session.activePrivateKey, 'auto')/* .toString('putty') */
const forgePrivateKey = forge.pki.decryptRsaPrivateKey(privateKey.toString('pem')) const forgePrivateKey = forge.pki.decryptRsaPrivateKey(privateKey.toString('pem'))
const ppk = forge.ssh.privateKeyToPutty(forgePrivateKey) const ppk = forge.ssh.privateKeyToPutty(forgePrivateKey)
await fs.writeFile(tmpFile.path, ppk) await fs.writeFile(tmpFile.path, ppk)
args.push(`/privatekey=${tmpFile.path}`) args.push(`/privatekey=${tmpFile.path}`)
setTimeout(() => {
tmpFile.cleanup()
}, 5000)
} }
this.platform.exec(path, args) await this.platform.exec(path, args)
tmpFile?.cleanup()
} }
} }

3
web/polyfills.ts
View File

@ -48,7 +48,7 @@ Tabby.registerMock('fs', {
appendFile: () => null, appendFile: () => null,
constants: {}, constants: {},
}) })
Tabby.registerMock('any-promise', Promise) Tabby.registerMock('fs/promises', {})
Tabby.registerMock('tls', {}) Tabby.registerMock('tls', {})
Tabby.registerMock('module', { Tabby.registerMock('module', {
globalPaths: [], globalPaths: [],
@ -92,6 +92,7 @@ Tabby.registerMock('keytar', {
}) })
Tabby.registerMock('@serialport/bindings', {}) Tabby.registerMock('@serialport/bindings', {})
Tabby.registerMock('@serialport/bindings-cpp', {}) Tabby.registerMock('@serialport/bindings-cpp', {})
Tabby.registerMock('tmp', {})
Tabby.registerModule('net', { Tabby.registerModule('net', {
Socket: SocketProxy, Socket: SocketProxy,