minor fixes

mkloubert · Jan 3, 2018 · 5dc6fed · 5dc6fed
1 parent b973ca3
commit 5dc6fed
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/clients/sftp.ts b/src/clients/sftp.ts
@@ -385,9 +385,9 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         pwd = undefined;
     }
 
-    let privateKeyFile: string = deploy_helpers.toStringSafe(opts.privateKey);
+    let privateKeyFile: string | false = deploy_helpers.toStringSafe(opts.privateKey);
     if (deploy_helpers.isEmptyString(privateKeyFile)) {
-        privateKeyFile = undefined;
+        privateKeyFile = false;
     }
 
     let privateKeyPassphrase = deploy_helpers.toStringSafe(opts.privateKeyPassphrase);
@@ -400,6 +400,11 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         readyTimeout = 20000;
     }
 
+    let privateKey: Buffer;
+    if (false !== privateKeyFile) {
+        privateKey = await deploy_helpers.readFile(privateKeyFile);
+    }
+
     const DEBUG = deploy_helpers.toBooleanSafe(opts.debug);
 
     await CLIENT.client.connect({
@@ -418,7 +423,7 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         passphrase: privateKeyPassphrase,
         password: pwd,
         port: port,
-        privateKey: FS.readFileSync(privateKeyFile, {'encoding':'utf8'}),
+        privateKey: privateKey,
         readyTimeout: readyTimeout,
         tryKeyboard: deploy_helpers.toBooleanSafe(opts.tryKeyboard),
         username: user,