Issue 365: allow host to be specified from http host headers

src/main.ts

@@ -92,6 +92,11 @@ const opts = yargs
       'Allow WeTTY to be embedded in an iframe, defaults to allowing same origin',
     type: 'boolean',
   })
+  .option('allow-remote-hosts', {
+    description:
+      'Allow WeTTY to use the `host` param in a url as ssh destination',
+    type: 'boolean',
+  })
   .option('help', {
     alias: 'h',
     type: 'boolean',

src/server/command.ts

@@ -22,29 +22,39 @@ export function getCommand(
       conn: { remoteAddress },
     },
   }: Socket,
-  { user, host, port, auth, pass, key, knownHosts, config }: SSH,
+  {
+    user,
+    host,
+    port,
+    auth,
+    pass,
+    key,
+    knownHosts,
+    config,
+    allowRemoteHosts,
+  }: SSH,
   command: string,
   forcessh: boolean,
 ): [string[], boolean] {
   const sshAddress = address(headers, user, host);
-  const localLogin = !forcessh && localhost(host);
-  return localLogin
-    ? [loginOptions(command, remoteAddress), localLogin]
-    : [
-        sshOptions(
-          {
-            ...urlArgs(headers.referer, {
-              port: `${port}`,
-              pass: pass || '',
-              command,
-              auth,
-              knownHosts,
-              config: config || '',
-            }),
-            host: sshAddress,
-          },
-          key,
-        ),
-        user !== '' || user.includes('@') || sshAddress.includes('@'),
-      ];
+  if (!forcessh && localhost(host)) {
+    return [loginOptions(command, remoteAddress), true];
+  }
+  const args = urlArgs(headers.referer, {
+    host: sshAddress,
+    port: `${port}`,
+    pass: pass || '',
+    command,
+    auth,
+    knownHosts,
+    config: config || '',
+  });
+  if (!allowRemoteHosts) {
+    args.host = sshAddress;
+  }
+
+  return [
+    sshOptions(args, key),
+    user !== '' || user.includes('@') || sshAddress.includes('@'),
+  ];
 }

src/shared/config.ts

@@ -115,6 +115,7 @@ export function mergeCliConf(opts: Arguments, config: Config): Config {
       port: opts['ssh-port'],
       pass: opts['ssh-pass'],
       key: opts['ssh-key'],
+      allowRemoteHosts: opts['allow-remote-hosts'],
       config: opts['ssh-config'],
       knownHosts: opts['known-hosts'],
     }) as SSH,

src/shared/defaults.ts

@@ -8,6 +8,7 @@ export const sshDefault: SSH = {
   key: process.env.SSHKEY || undefined,
   port: parseInt(process.env.SSHPORT || '22', 10),
   knownHosts: process.env.KNOWNHOSTS || '/dev/null',
+  allowRemoteHosts: false,
   config: process.env.SSHCONFIG || undefined,
 };
 

src/shared/interfaces.ts

@@ -5,6 +5,7 @@ export interface SSH {
   auth: string;
   port: number;
   knownHosts: string;
+  allowRemoteHosts: boolean;
   pass?: string;
   key?: string;
   config?: string;