feat: recognize pfx format for http2 options (#202)

Evalon · web-flow · commit 5a5971f08853 · 2021-01-17T15:44:02.000-05:00
* fix: recognize pfx format for http2 options

* test: add tests for https and http2 options with pfx and pem
diff --git a/lib/server.js b/lib/server.js
@@ -31,7 +31,7 @@ const select = (options, callback) => {
   if (http2) {
     if (http2 === true) {
       server = types.http2({}, callback);
-    } else if (http2.cert) {
+    } else if (http2.cert || http2.pfx) {
       secure = true;
       server = types.http2Secure(http2, callback);
     } else {
diff --git a/test/fixtures/https/app.js b/test/fixtures/https/app.js
@@ -0,0 +1 @@
+console.log('ok');
diff --git a/test/fixtures/https/index.html b/test/fixtures/https/index.html
@@ -0,0 +1,10 @@
+<!doctype>
+<html>
+<head>
+  <title>fixture: https</title>
+</head>
+<body>
+<main></main>
+<script src="/output/output.js"></script>
+</body>
+</html>
diff --git a/test/fixtures/https/localhost.crt b/test/fixtures/https/localhost.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE7DCCAtSgAwIBAgIJANATvy4nMEs0MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0yMTAxMTcxNzM2MjVaGA8yMDUxMDExMDE3MzYyNVow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEA6PovbbkZx+8LXTS9NDitCXII40WJ8qyyC38EMlnRsY8rZ3ptMacawZQa
+Q10Jvo6xswzM54bRvvTxHXrltNSW7G/9Qp+KkM99Ee1ZgO1NqVH5Z8RftXjUGvTW
+M6ZRNLoRtZNyoK4G2r/xvbMZhv/nW80/vvfXzXfqUWoqb/4hVeVC7cYPqWVXkyuy
+rB+BJmv7LMYSX1p8az9E+lP4tSQa8VzrlYWQhVr40jhZV/A/Ssxv6ENBvc9sRHbz
+GEqEHD0+rP7A0goLMSjHk0HZzaoC+mmgOzVUwbUvhuvzPBOrxkf0fy+p7zFH1ASN
+zC9pWggjJJJnMBd6ItZilZIvY9gprnu+buZGuHRhs4Byv90/34/r9o/eTdrYulzJ
+sXkmLp28YqwYXX8CxDtreQIzShjIPzQmGMnWE27xisL9rXWW3wI9lRyO6w+19aAL
+U+mpP30HGFETpefNHq/55dvZUGwe95oALVJaytoUheKChmw4uQlf8tY2U3h9TkD9
+3qtDVEKvUWnLY1SKEFN1iH42f+gU/IDnQPvCtD69XbYb/ivY/EsppiLXs0/kzQ9w
+8y+O0P70LPiaYg6hkCF+bgu3mPikrQEI9Ka9KRRICxh0yTRxOL0GHBNMxfUC4G+8
+k/MvENHAwQqK6oFF7TtIBYuW6gD10HUSGxDuPrQ5vjM78GYGAv0CAwEAAaM/MD0w
+CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwIwYDVR0RBBwwGoINd3d3LmxvY2FsaG9z
+dIIJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4ICAQDKvdg7NEWHBp/CKMr/Ombi
+AAJgDgjgMzhzz2aQqdskJfoU/AeKBYoQnh4tOHM3FKj+U4+pxHjbQMBshsDbwya9
+177HYG8A9cBbrlZEseR/bWzOwy1V+td5jUT5aYv+ajMloS27U2KEieaSiLhFYKQY
+HY+sR3wkLAiS5rapq61xvLMNC6xmqeMcnn9PZYV1B8rBBPR5PPUunGSzEE2zRpv6
+jO28d18B+zhqKiJr7TJunUKkPwYBVHm/OYhikyt3SB/a0KwYJmzfqJh0hP6vCOz5
+5CAkmPon6N33AEs73V5X7zpqR5d0jRGrD30Twx23KxJTdUeo+BQ5Fi5roxvnW1am
+5BP++KEyEvoJtzft5GY5wb5fBNv9Ek5n8O5HBACfDnZN3N+1RLIbAXrjTkBpL6vx
+bFf5ZM5LmQ3JvcMPvoZlxHonmgaB9GDNzCllxbMCaR9oW/5h9XYwk8MXAk/SLrn6
+MXgokarf2Ij2FkPx40ilcL9D5GoHi2A9eIYdRPxschG2HsZeIv8R2BQsnYa+WwGN
+vxHxCHroqoDVAylo1W1OxdOxMUYaH+nHp5JE1H52jIq7pafBE62EAZut24FyGU6M
+zopgCwxi+ARV/HO+nmc8smP4+X1FBCW8qUsmZWqoLztQmO3ZfBO8UPv+aY5dA2Hz
+nCwe6GqeCrfvOQNVdDrV3Q==
+-----END CERTIFICATE-----
diff --git a/test/fixtures/https/localhost.key b/test/fixtures/https/localhost.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+kyqwVw4XIqGsQkNCIfToMOEJ7Gpqef4=
+-----END PRIVATE KEY-----
diff --git a/test/fixtures/https/localhost.pfx b/test/fixtures/https/localhost.pfx
diff --git a/test/fixtures/https/webpack.config.js b/test/fixtures/https/webpack.config.js
@@ -0,0 +1,18 @@
+const { resolve } = require('path');
+
+module.exports = {
+  context: __dirname,
+  entry: ['./app.js', 'webpack-plugin-serve/client'],
+  mode: 'development',
+  output: {
+    filename: './output.js',
+    path: resolve(__dirname, './output'),
+    publicPath: 'output/'
+  },
+  resolve: {
+    alias: {
+      'webpack-plugin-serve/client': resolve(__dirname, '../../../client')
+    }
+  },
+  watch: true
+};
diff --git a/test/https.test.js b/test/https.test.js
@@ -0,0 +1,130 @@
+const https = require('https');
+
+const { readFileSync } = require('fs');
+
+const { resolve, join } = require('path');
+
+const http2 = require('http2');
+
+const webpack = require('webpack');
+const test = require('ava');
+const fetch = require('node-fetch');
+const defer = require('p-defer');
+const del = require('del');
+
+const { WebpackPluginServe } = require('../lib');
+
+const { getPort } = require('./helpers/port');
+const webpackDefaultConfig = require('./fixtures/https/webpack.config');
+
+const httpsFixturePath = resolve(__dirname, './fixtures/https');
+
+const startServe = async (serve) => {
+  const deferred = defer();
+  const compiler = webpack({
+    ...webpackDefaultConfig,
+    plugins: [serve]
+  });
+  const watcher = compiler.watch({}, () => {});
+  serve.on('listening', deferred.resolve);
+  await deferred.promise;
+  return watcher;
+};
+
+const checkHttpsServed = async (t, serve, port) => {
+  const watcher = await startServe(serve);
+  const agent = new https.Agent({
+    rejectUnauthorized: false
+  });
+  const response = await fetch(`https://localhost:${port}`, { agent });
+  watcher.close();
+  t.true(response.ok);
+};
+
+const checkHttp2Served = async (t, serve, port) => {
+  const watcher = await startServe(serve);
+  const deferred = defer();
+  const client = http2.connect(`https://localhost:${port}`, {
+    rejectUnauthorized: false
+  });
+  client.on('error', (err) => {
+    t.fail(err);
+    deferred.reject();
+  });
+
+  const req = client.request({ ':path': '/' });
+  req.on('response', () => {
+    t.pass();
+    watcher.close();
+    client.close();
+    deferred.resolve();
+  });
+  req.on('end', () => {
+    client.close();
+    deferred.resolve();
+  });
+
+  await deferred.promise;
+};
+
+test.after.always('remove build output', async () => {
+  await del('./test/fixtures/https/output');
+});
+
+test('should start https with pem', async (t) => {
+  const port = await getPort();
+  const key = readFileSync(join(httpsFixturePath, 'localhost.key'));
+  const cert = readFileSync(join(httpsFixturePath, 'localhost.crt'));
+  const serve = new WebpackPluginServe({
+    host: 'localhost',
+    allowMany: true,
+    port,
+    waitForBuild: true,
+    https: { key, cert }
+  });
+
+  await checkHttpsServed(t, serve, port);
+});
+
+test('should start http2 with pem', async (t) => {
+  const port = await getPort();
+  const key = readFileSync(join(httpsFixturePath, 'localhost.key'));
+  const cert = readFileSync(join(httpsFixturePath, 'localhost.crt'));
+  const serve = new WebpackPluginServe({
+    host: 'localhost',
+    allowMany: true,
+    port,
+    waitForBuild: true,
+    http2: { key, cert }
+  });
+
+  await checkHttp2Served(t, serve, port);
+});
+
+test('should start https with pfx', async (t) => {
+  const port = await getPort();
+  const pfx = readFileSync(join(httpsFixturePath, 'localhost.pfx'));
+  const serve = new WebpackPluginServe({
+    host: 'localhost',
+    allowMany: true,
+    port,
+    waitForBuild: true,
+    https: { pfx, passphrase: 'password' }
+  });
+
+  await checkHttpsServed(t, serve, port);
+});
+
+test('should start http2 with pfx', async (t) => {
+  const port = await getPort();
+  const pfx = readFileSync(join(httpsFixturePath, 'localhost.pfx'));
+  const serve = new WebpackPluginServe({
+    host: 'localhost',
+    allowMany: true,
+    port,
+    waitForBuild: true,
+    http2: { pfx, passphrase: 'password' }
+  });
+
+  await checkHttp2Served(t, serve, port);
+});
diff --git a/test/snapshots/plugin.test.js.md b/test/snapshots/plugin.test.js.md
@@ -2,7 +2,7 @@
 
 The actual snapshot is saved in `plugin.test.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
 ## allow https null
 
@@ -113,6 +113,7 @@ Generated by [AVA](https://ava.li).
 > Snapshot 1
 
     [
+      'test/fixtures/https',
       'test/fixtures/multi',
       'test/fixtures/proxy',
       'test/fixtures/ramdisk',
diff --git a/test/snapshots/plugin.test.js.snap b/test/snapshots/plugin.test.js.snap
