Merge pull request #6 from sourcetoad/pmw-41-add-ssh-port

Add ssh port option

Author: iBotPeaches

README.md

@@ -6,6 +6,11 @@ Setup an SSH socket with a private key.
 #### `host`
 **Required** Remote hostname
 
+#### `port`
+**Optional** SSH port
+
+This is only necessary if the SSH server does not listen on port 22. It is used to retrieve the host key so it can be trusted for host key verification.
+
 #### `socket-path`
 **Required** Path at which to create socket.
 
@@ -29,6 +34,7 @@ Path at which socket was created.
       uses: sourcetoad/[email protected]
       with:
         host: github.com
+        port: 22 # optional
         socket-path: /tmp/ssh_agent.sock
         key: {BASE64_SECRET_KEY}
 

action.yml

@@ -3,7 +3,10 @@ description: 'Setup an SSH socket with a private key'
 inputs:
   host:
     description: 'remote hostname'
-    require: true
+    required: true
+  port:
+    description: 'ssh port'
+    required: false
   socket-path:
     description: 'path at which to create socket'
     required: true

dist/index.js

@@ -301,27 +301,29 @@ const core = __webpack_require__(68);
 const { execSync } = __webpack_require__(129);
 
 const host = core.getInput('host');
+const port = core.getInput('port');
 const socketPath = core.getInput('socket-path');
 const key = core.getInput('key');
 
 console.log(`Attempting to create ${socketPath}...`);
 try {
     execSync(
         'mkdir ~/.ssh && ' +
-        `ssh-keyscan "${host}" >> ~/.ssh/known_hosts && ` +
+        `ssh-keyscan${port ? ` -p ${port}` : ''} "${host}" >> ~/.ssh/known_hosts && ` +
         `eval $(ssh-agent -a "${socketPath}") && ` +
         `echo "${key}" | base64 -d | ssh-add -`
     );
 } catch (e) {
     console.error(e.message);
-    process.exit();
+    process.exit(1);
 }
 
 console.log(`Created ${socketPath}`);
 core.setOutput('socket-path', socketPath);
 
 console.log('Done; exiting.');
 
+
 /***/ }),
 
 /***/ 955:

index.js

@@ -3,14 +3,15 @@ const core = require('@actions/core');
 const { execSync } = require('child_process');
 
 const host = core.getInput('host');
+const port = core.getInput('port');
 const socketPath = core.getInput('socket-path');
 const key = core.getInput('key');
 
 console.log(`Attempting to create ${socketPath}...`);
 try {
     execSync(
         'mkdir ~/.ssh && ' +
-        `ssh-keyscan "${host}" >> ~/.ssh/known_hosts && ` +
+        `ssh-keyscan${port ? ` -p ${port}` : ''} "${host}" >> ~/.ssh/known_hosts && ` +
         `eval $(ssh-agent -a "${socketPath}") && ` +
         `echo "${key}" | base64 -d | ssh-add -`
     );