Kill ssh-agent at end of job

s0 · Oct 20, 2019 · f7a5bca · f7a5bca
1 parent 4b2fbb7
commit f7a5bca
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/action/src/index.ts b/action/src/index.ts
@@ -80,6 +80,8 @@ const KNOWN_HOSTS_GITHUB = path.join(RESOURCES, 'known_hosts_github.com');
 const SSH_FOLDER = path.join(homedir(), '.ssh');
 const KNOWN_HOSTS_TARGET = path.join(SSH_FOLDER, 'known_hosts');
 
+const SSH_AGENT_PID_EXTRACT = /SSH_AGENT_PID=([0-9]+);/;
+
 interface BaseConfig {
   branch: string;
   folder: string;
@@ -221,7 +223,10 @@ const writeToProcess = (command: string, args: string[], opts: {env: { [id: stri
 
     // Setup ssh-agent with private key
     console.log(`Setting up ssh-agent on ${SSH_AUTH_SOCK}`);
-    await exec(`ssh-agent -a ${SSH_AUTH_SOCK}`, {env});
+    const sshAgentMatch = SSH_AGENT_PID_EXTRACT.exec((await exec(`ssh-agent -a ${SSH_AUTH_SOCK}`, {env})).stdout);
+    if (!sshAgentMatch)
+      throw new Error('Unexpected output from ssh-agent');
+    env.SSH_AGENT_PID = sshAgentMatch[1];
     console.log(`Adding private key to ssh-agent at ${SSH_AUTH_SOCK}`);
     await writeToProcess('ssh-add', ['-'], {
       data: config.privateKey + '\n',
@@ -290,6 +295,11 @@ const writeToProcess = (command: string, args: string[], opts: {env: { [id: stri
   console.log(push.stdout);
   console.log(`##[info] Deployment Successful`);
 
+  if (config.mode === 'ssh') {
+    console.log(`##[info] Killing ssh-agent`);
+    await exec(`ssh-agent -k`, { env });
+  }
+
 })().catch(err => {
   console.error(err);
   process.exit(1);