Enhance sftp interactiveAuth mode (fixes)

Natizyskunk · Nov 25, 2021 · 27c4fda · 27c4fda
1 parent 898346c
commit 27c4fda
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/core/remote-client/sshClient.ts b/src/core/remote-client/sshClient.ts
@@ -314,7 +314,7 @@ export default class SSHClient extends RemoteClient {
             // ? Math.max(10800 * 1000, connectTimeout || 0) // 180 mins
             : connectTimeout,
           ...option,
-          tryKeyboard: interactiveAuth,
+          tryKeyboard: !!interactiveAuth,
         });
     });
   }

diff --git a/src/modules/config.ts b/src/modules/config.ts
@@ -23,7 +23,11 @@ const configScheme = {
   agent: nullable(Joi.string()),
   privateKeyPath: nullable(Joi.string()),
   passphrase: nullable(Joi.string().allow(true)),
-  interactiveAuth: Joi.boolean(),
+  interactiveAuth: Joi.alternatives([
+    Joi.boolean(),
+    Joi.array()
+      .items(Joi.string()),
+  ]).optional(),
   algorithms: Joi.any(),
   sshConfigPath: Joi.string(),
   sshCustomParams: Joi.string(),

diff --git a/src/modules/serviceManager/index.ts b/src/modules/serviceManager/index.ts
@@ -20,14 +20,24 @@ const serviceManager = new Trie<FileService>(
 
 function maskConfig(config) {
   const copy = {};
-  const privated = ['username', 'password', 'passphrase'];
+  const MASK = '******';
   Object.keys(config).forEach(key => {
     const configValue = config[key];
-    // tslint:disable-next-line triple-equals
-    if (privated.indexOf(key) !== -1 && configValue != undefined) {
-      copy[key] = '******';
-    } else {
-      copy[key] = configValue;
+    switch (key) {
+      case 'username':
+      case 'password':
+      case 'passphrase':
+        copy[key] = MASK;
+        break;
+      case 'interactiveAuth':
+        if (Array.isArray(configValue)) {
+          copy[key] = configValue.map(phrase => MASK);
+        } else {
+          copy[key] = configValue;
+        }
+        break;
+      default:
+        copy[key] = configValue;
     }
   });
   return copy;

diff --git a/test/config.spec.js b/test/config.spec.js
@@ -17,7 +17,7 @@ const configScheme = {
   interactiveAuth: Joi.alternatives([
     Joi.boolean(),
     Joi.array()
-      .items(Joi.string())
+      .items(Joi.string()),
   ]).optional(),
 
   secure: Joi.any().valid(true, false, 'control', 'implicit').optional(),