Merge branch 'master' into feature/sidetab

terminus-ssh/package.json

@@ -23,6 +23,7 @@
     "@types/ssh2": "^0.5.35",
     "ansi-colors": "^4.1.1",
     "cli-spinner": "^0.2.10",
+    "run-script-os": "^1.1.3",
     "ssh2": "^0.8.2",
     "ssh2-streams": "Eugeny/ssh2-streams#75f6d3425d071ac73a18fd46e2f5e738bfe897c5",
     "sshpk": "^1.16.1",

terminus-ssh/src/api.ts

@@ -246,7 +246,7 @@ export class SSHSession extends BaseSession {
                     fw.targetPort,
                     (err, stream) => {
                         if (err) {
-                            this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote has rejected the forwaded connection via ${fw}: ${err}`)
+                            this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote has rejected the forwarded connection via ${fw}: ${err}`)
                             socket.destroy()
                             return
                         }
@@ -263,7 +263,7 @@ export class SSHSession extends BaseSession {
                     }
                 )
             }).then(() => {
-                this.emitServiceMessage(colors.bgGreen.black(' -> ') + ` Forwaded ${fw}`)
+                this.emitServiceMessage(colors.bgGreen.black(' -> ') + ` Forwarded ${fw}`)
                 this.forwardedPorts.push(fw)
             }).catch(e => {
                 this.emitServiceMessage(colors.bgRed.black(' X ') + ` Failed to forward port ${fw}: ${e}`)
@@ -280,7 +280,7 @@ export class SSHSession extends BaseSession {
                     resolve()
                 })
             })
-            this.emitServiceMessage(colors.bgGreen.black(' <- ') + ` Forwaded ${fw}`)
+            this.emitServiceMessage(colors.bgGreen.black(' <- ') + ` Forwarded ${fw}`)
             this.forwardedPorts.push(fw)
         }
     }

terminus-ssh/src/services/ssh.service.ts

@@ -22,6 +22,11 @@ try {
     var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
+
+// eslint-disable-next-line @typescript-eslint/no-type-alias
+export type SSHLogCallback = (message: string) => void
+
+
 @Injectable({ providedIn: 'root' })
 export class SSHService {
     private logger: Logger
@@ -46,33 +51,24 @@ export class SSHService {
         return session
     }
 
-    async connectSession (session: SSHSession, logCallback?: (s: any) => void): Promise<void> {
+    async loadPrivateKeyForSession (session: SSHSession, logCallback?: SSHLogCallback): Promise<string|null> {
         let privateKey: string|null = null
         let privateKeyPath = session.connection.privateKey
 
-        if (!logCallback) {
-            logCallback = () => null
-        }
-
-        const log = (s: any) => {
-            logCallback!(s)
-            this.logger.info(s)
-        }
-
         if (!privateKeyPath) {
             const userKeyPath = path.join(process.env.HOME as string, '.ssh', 'id_rsa')
             if (await fs.exists(userKeyPath)) {
-                log('Using user\'s default private key')
+                logCallback?.('Using user\'s default private key')
                 privateKeyPath = userKeyPath
             }
         }
 
         if (privateKeyPath) {
-            log('Loading private key from ' + colors.bgWhite.blackBright(' ' + privateKeyPath + ' '))
+            logCallback?.('Loading private key from ' + colors.bgWhite.blackBright(' ' + privateKeyPath + ' '))
             try {
                 privateKey = (await fs.readFile(privateKeyPath)).toString()
             } catch (error) {
-                log(colors.bgRed.black(' X ') + 'Could not read the private key file')
+                logCallback?.(colors.bgRed.black(' X ') + 'Could not read the private key file')
                 this.toastr.error('Could not read the private key file')
             }
 
@@ -83,7 +79,7 @@ export class SSHService {
                 } catch (e) {
                     if (e instanceof sshpk.KeyEncryptedError) {
                         const modal = this.ngbModal.open(PromptModalComponent)
-                        log(colors.bgYellow.yellow.black(' ! ') + ' Key requires passphrase')
+                        logCallback?.(colors.bgYellow.yellow.black(' ! ') + ' Key requires passphrase')
                         modal.componentInstance.prompt = 'Private key passphrase'
                         modal.componentInstance.password = true
                         let passphrase = ''
@@ -131,6 +127,20 @@ export class SSHService {
                 fs.unlink(temp.path)
             }
         }
+        return privateKey
+    }
+
+    async connectSession (session: SSHSession, logCallback?: SSHLogCallback): Promise<void> {
+        if (!logCallback) {
+            logCallback = () => null
+        }
+
+        const log = (s: any) => {
+            logCallback!(s)
+            this.logger.info(s)
+        }
+
+        let privateKey: string|null = null
 
         const ssh = new Client()
         session.ssh = ssh
@@ -213,6 +223,7 @@ export class SSHService {
 
             const authMethodsLeft = ['none']
             if (!session.connection.auth || session.connection.auth === 'publicKey') {
+                privateKey = await this.loadPrivateKeyForSession(session, log)
                 if (!privateKey) {
                     log('\r\nPrivate key auth selected, but no key is loaded\r\n')
                 } else {

terminus-ssh/yarn.lock

@@ -157,6 +157,11 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
+run-script-os@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.3.tgz#1069b418307f4fd36ff056b5eda309c273fca8b0"
+  integrity sha512-xPlzE6533nvWVea5z7e5J7+JAIepfpxTu/HLGxcjJYlemVukOCWJBaRCod/DWXJFRIWEFOgSGbjd2m1QWTJi5w==
+
 safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"