Merge pull request #250 from kmlucy/master

Add support for host checking

index.js

@@ -73,6 +73,12 @@ if (require.main === module) {
           type: 'boolean',
           default: process.env.FORCESSH || false
         },
+        knownhosts: {
+          demand: false,
+          description: 'path to known hosts file',
+          type: 'string',
+          default: process.env.KNOWNHOSTS || '/dev/null',
+        },
         base: {
           demand: false,
           alias: 'b',

src/server/cli/options.ts

@@ -5,6 +5,7 @@ export interface Options {
   sshauth: string;
   sshkey?: string;
   sshpass?: string;
+  knownhosts: string;
   sslkey?: string;
   sslcert?: string;
   base: string;

src/server/cli/parseArgs.ts

@@ -13,6 +13,7 @@ export function unWrapArgs(
       port: args.sshport,
       pass: args.sshpass,
       key: args.sshkey,
+      knownhosts: args.knownhosts,
     },
     server: {
       base: args.base,

src/server/command/index.ts

@@ -24,7 +24,7 @@ export default (
       conn: { remoteAddress },
     },
   }: Socket,
-  { user, host, port, auth, pass, key }: SSH,
+  { user, host, port, auth, pass, key, knownhosts }: SSH,
   command: string,
   forcessh: boolean
 ): { args: string[]; user: boolean } => ({
@@ -37,6 +37,7 @@ export default (
           pass: pass || '',
           command,
           auth,
+          knownhosts,
         }),
         key
       ),

src/server/command/ssh.ts

@@ -3,10 +3,11 @@ import parseCommand from './parse';
 import logger from '../utils/logger';
 
 export default function sshOptions(
-  { pass, path, command, host, port, auth }: { [s: string]: string },
+  { pass, path, command, host, port, auth, knownhosts }: { [s: string]: string },
   key?: string
 ): string[] {
   const cmd = parseCommand(command, path);
+  const hostChecking = (knownhosts !== '/dev/null') ? 'yes' : 'no'
   const sshRemoteOptsBase = [
     'ssh',
     host,
@@ -16,9 +17,9 @@ export default function sshOptions(
     '-o',
     `PreferredAuthentications=${auth}`,
     '-o',
-    'UserKnownHostsFile=/dev/null',
+    `UserKnownHostsFile=${knownhosts}`,
     '-o', 
-    'StrictHostKeyChecking=no',
+    `StrictHostKeyChecking=${hostChecking}`,
   ];
   logger.info(`Authentication Type: ${auth}`);
   if (!isUndefined(key)) {

src/server/interfaces.ts

@@ -3,6 +3,7 @@ export interface SSH {
   host: string;
   auth: string;
   port: number;
+  knownhosts: string;
   pass?: string;
   key?: string;
 }