Add tests for --header option, accept empty header

- Change --help option output
- Accept empty header to conform to RFC 7230 (-H "empty-header" or
  -H "empty-header:")

Author: dxdxdt

bin/http-server

@@ -37,8 +37,8 @@ if (argv.h || argv.help) {
     '  --cors[=headers]   Enable CORS via the "Access-Control-Allow-Origin" header',
     '                     Optionally provide CORS headers list separated by commas',
     '  -H',
-    '  --header="key: val"',
-    '               Add an arbitrary header (repeatable)',
+    '  --header',
+    '               Add an extra response header (can be used several times)',
     '  -o [path]    Open browser window after starting the server.',
     '               Optionally provide a URL path to open the browser window to.',
     '  -c           Cache time (max-age) in seconds [3600], e.g. -c10 for 10 seconds.',
@@ -162,11 +162,11 @@ function listen(port) {
   };
 
   function setHeader(str) {
-    const m = /^(.+?)\s*:\s*(.*)$/.exec(str);
-    if (!m) {
-      options.headers[str] = true;
+    const m = /^(.+?)\s*(:\s*(.*))$/.exec(str);
+    if (!m || m.length < 4) {
+      options.headers[str] = '';
     } else {
-      options.headers[m[1]] = m[2];
+      options.headers[m[1]] = m[3];
     }
   }
 

test/cli.test.js

@@ -113,4 +113,67 @@ test('--proxy requires you to specify a protocol', (t) => {
   server.on('exit', (code) => {
     t.equal(code, 1);
   });
-});
+});
+
+function doHeaderOptionTest(t, argv, obj) {
+  const options = ['.', '--port', defaultPort].concat(argv);
+  const server = startServer(options);
+
+  tearDown(server, t);
+
+  server.stdout.on('data', (msg) => {
+    checkServerIsRunning(`http://localhost:${defaultPort}`, msg, t, (err, res) => {
+      t.error(err);
+
+      for (const [k, v] of Object.entries(obj)) {
+        t.equal(res.headers[k], v, 'expected header value matches in response');
+      }
+    });
+  });
+}
+
+test('single --header option is applied', (t) => {
+  t.plan(4);
+
+  doHeaderOptionTest(t,
+    ['--header=X-http-server-test-A: hello'],
+    { 'x-http-server-test-a': 'hello' }
+  );
+});
+
+test('single -H option is applied', (t) => {
+  t.plan(4);
+
+  doHeaderOptionTest(t,
+    ['-H', 'X-http-server-test-A: hello'],
+    { 'x-http-server-test-a': 'hello' }
+  );
+});
+
+test('mix of multiple --header and -H options are applied', (t) => {
+  t.plan(7);
+
+  doHeaderOptionTest(t,
+    [
+      '--header=X-http-server-test-A: Lorem ipsum dolor sit amet',
+      '-H', 'X-http-server-test-B: consectetur=adipiscing; elit',
+      '-H', 'X-http-server-test-C: c',
+      '--header=X-http-server-test-D: d'
+    ],
+    {
+      'x-http-server-test-a': 'Lorem ipsum dolor sit amet',
+      'x-http-server-test-b': 'consectetur=adipiscing; elit',
+      'x-http-server-test-c': 'c',
+      'x-http-server-test-d': 'd'
+    }
+  );
+});
+
+test('empty header value is allowed (RFC 7230)', (t) => {
+  t.plan(5);
+
+  doHeaderOptionTest(t,
+    ['-H', 'X-http-server-test-empty-a:', '-H', 'X-http-server-test-empty-b'],
+    { 'x-http-server-test-empty-a': '', 'x-http-server-test-empty-b': '' }
+  );
+});