From cce60629ec1c8065eaeda157b969c376f5089f22 Mon Sep 17 00:00:00 2001
From: Anthony Jund <antonyjund@gmail.com>
Date: Tue, 11 Jun 2019 09:28:32 -0400
Subject: [PATCH] Renamed option from --no-helmet to --bypasshelmet

---
 index.js                 |  2 +-
 src/server/index.ts      |  4 ++--
 src/server/interfaces.ts |  2 +-
 src/server/server.ts     | 13 ++++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index 55beed2..3caa5f9 100755
--- a/index.js
+++ b/index.js
@@ -94,7 +94,7 @@ if (require.main === module) {
           type: 'string',
           default: process.env.COMMAND || 'login',
         },
-        'no-helmet': {
+        bypasshelmet: {
           demand: false,
           description: 'disable helmet from placing security restrictions',
           type: 'boolean',
diff --git a/src/server/index.ts b/src/server/index.ts
index 41dbc46..af96308 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -39,7 +39,7 @@ export default class Server {
     command,
     sslkey,
     sslcert,
-    disableHelmet,
+    bypasshelmet,
   }: Options): Promise<void> {
     wetty
       .on('exit', ({ code, msg }: { code: number; msg: string }) => {
@@ -62,7 +62,7 @@ export default class Server {
         pass: sshpass,
         key: sshkey,
       },
-      { base, host, port, title, disableHelmet },
+      { base, host, port, title, bypasshelmet },
       command,
       { key: sslkey, cert: sslcert }
     );
diff --git a/src/server/interfaces.ts b/src/server/interfaces.ts
index adcda37..05b391c 100644
--- a/src/server/interfaces.ts
+++ b/src/server/interfaces.ts
@@ -21,5 +21,5 @@ export interface Server {
   port: number;
   host: string;
   base: string;
-  disableHelmet: boolean;
+  bypasshelmet: boolean;
 }
diff --git a/src/server/server.ts b/src/server/server.ts
index f53e0c2..1462586 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -17,7 +17,7 @@ const distDir = path.join(__dirname, 'client');
 const trim = (str: string): string => str.replace(/\/*$/, '');
 
 export default function createServer(
-  { base, port, host, title, disableHelmet }: Server,
+  { base, port, host, title, bypasshelmet }: Server,
   { key, cert }: SSLBuffer
 ): SocketIO.Server {
   const basePath = trim(base);
@@ -72,14 +72,17 @@ export default function createServer(
       )
         res.redirect(301, req.url.slice(0, -1));
       else next();
-    })
-    .get(basePath, html)
-    .get(`${basePath}/ssh/:user`, html);
+    });
 
-  if (!disableHelmet) {
+  // Allow helmet to be bypassed.
+  // Unfortunately, order matters with middleware
+  // which is why this is thrown in the middle
+  if (!bypasshelmet) {
     app.use(helmet());
   }
 
+  app.get(basePath, html).get(`${basePath}/ssh/:user`, html);
+
   return socket(
     !isUndefined(key) && !isUndefined(cert)
       ? https.createServer({ key, cert }, app).listen(port, host, () => {