Merge pull request #346 from snyk/feat/improved-observability

Feat/improved observability

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 defaults: &defaults
   docker:
-    - image: circleci/node:12
+    - image: circleci/node:12-buster
   working_directory: ~/broker
 
 commands:

lib/index.js

@@ -15,6 +15,8 @@ const app = (module.exports = {
   main: main,
 });
 
+require('@snyk/node-dump-stacks');
+
 function main({ port, client, config = {} } = {}) {
   // note: the config is loaded in the main function to allow us to mock in tests
   if (process.env.TAP) {

lib/metrics.js

@@ -0,0 +1,19 @@
+const { Gauge } = require('prom-client');
+
+const socketConnectionGauge = new Gauge({
+  name: 'broker_socket_connection_total',
+  help: 'Number of active socket connections',
+});
+
+function incrementSocketConnectionGauge() {
+  socketConnectionGauge.inc(1);
+}
+
+function decrementSocketConnectionGauge() {
+  socketConnectionGauge.dec(1);
+}
+
+module.exports = {
+  incrementSocketConnectionGauge,
+  decrementSocketConnectionGauge,
+};

lib/server/index.js

@@ -20,7 +20,7 @@ module.exports = ({ config = {}, port = null, filters = {} }) => {
 
   // basic prometheus metrics
   const metricsMiddleware = promBundle({
-    buckets: [0.1, 0.4, 0.7, 1, 1.5, 2, 2.5, 5, 10, 30],
+    buckets: [0.5, 1, 2, 5, 10, 30, 60, 120, 300],
     includeMethod: true,
     includePath: false,
     metricsPath: '/metrics',

lib/server/socket.js

@@ -3,6 +3,10 @@ const Emitter = require('primus-emitter');
 const logger = require('../log');
 const relay = require('../relay');
 const { maskToken } = require('../token');
+const {
+  incrementSocketConnectionGauge,
+  decrementSocketConnectionGauge,
+} = require('../metrics');
 
 module.exports = ({ server, filters, config }) => {
   const io = new Primus(server, {
@@ -44,6 +48,7 @@ module.exports = ({ server, filters, config }) => {
           logger.info({ maskedToken }, 'removing client');
           connections.delete(token);
         }
+        decrementSocketConnectionGauge();
       }
     };
 
@@ -81,6 +86,8 @@ module.exports = ({ server, filters, config }) => {
 
       socket.on('chunk', streamingResponse(token));
       socket.on('request', response(token));
+
+      incrementSocketConnectionGauge();
     });
 
     ['close', 'end', 'disconnect'].forEach((e) => socket.on(e, () => close(e)));

package.json

@@ -47,6 +47,7 @@
     "typescript": "^3.8.3"
   },
   "dependencies": {
+    "@snyk/node-dump-stacks": "^1.3.0",
     "@types/minimist": "^1.2.0",
     "@types/request": "^2.48.5",
     "body-parser": "^1.19.0",

test/fixtures/certs/ca/my-root-ca.crt.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi4CCQCM0p3yRoHvMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+MIIDRjCCAi4CCQCd9um3+t/FMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU1WhcNMjgwMjIzMTQ1NDU1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVybmFsIFNpZ25p
 bmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCottzRZJSCy0rHBVKCu/53bIrrCwOIMc9Dc6RxE0eG
-BMT10xJK8t57AvWrONyIXp7cKlwA2GLGrI4JURlxQ0x8BQCxG41D62+njYyfvowH
-g5tktGSsgTCfzqOdJDlj/QOIQ/cuU73oDsyuxKz5rGPorFuGpkhNMJFYk1AGaM0C
-SQGEZHxDLDNq5H77RHd6Ceyjcm4SkIQw7K+5npmxEQKOHdn2UZR18ZA44OiWgQuF
-IupTEcBGhRuRwHjK/F0qZyZsK5M+5TF752SXDTo0/qXAS3FrJ5+0oS0iRd25SkNC
-Nu50btNa8eNLbjDFfeLQhbFFafrxxJzwH4wKCGLv271TAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAAdrSCb8XZgEJWdmXab3dBhdQwG9T4hnr3pl2hu7S0WBC4F3bsEy
-IN0PCBzxV+hwbtyiMmJbsCppQ/UheFdfL4gjOivT5hlSLR7YEIpDZaQlNDtBTG+9
-FWk5txdkxs/JLae4hqVu7yt0vtc100dWPgN5biSkcDFTosn06yZroCnPiXP4BJjr
-yabPBuRLF9KzSAt1UISd5kwbS+uiJL2C0E/DwCLHiEYFe/AvyzEndBmAbZSQZ/ov
-XrCucH4Vm9Amoiq6V9Xn9Yw7KrYZb7iVntHdgEbRYGDDxdhpJyamqm//zeCv/Wsr
-XST74FCCWkLfgVBj0B/mc8WZjUxSMZgfMJA=
+AQUAA4IBDwAwggEKAoIBAQCxNN5MnbEPGRrVilntUsRx9b8kN5YH18F0E0APsT2o
+5LpD+Y5ZlkqqpD4q+LH485FZSNDEogWWvs70Me7yYEdhQJGnhh1JjFv5qvOToWxd
+O/YrsByDWkIHHVHW7FLz1+SWDbgdGqJ9fitD7zUdlakL2XbrIzTXOPM16ZFx8vt8
+Bf8Czd5hlFDYl+yuGP/2zglCrsbLZA+cX+DCO3waIrZNGuidHbcyMoQ2gySiGXiD
+r/FniwaPvYNgyZDn2BMkcTFjXTD+gRLcsAZ+s8vBragsSJ0PKA3QUN6UH73GCTVg
+qC5cuOr/pJiEeXWtrST/Vq0HWBR5CAmBD9JJDrwqmjn5AgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAHOCDHi/fz7RJxrzuqybibv1+AaosuFycDZzx39ZNTjSEYonh3DN
+tXKJB/l5D62raCyJDUZLh22x+A2mXkB9HvTLN41PnMIxzlF9CCFCBlJC4VkYVg3x
+4hqZy1Lq5o5AUw+A2xIsWTNQhwrv+fgpZ5EX8PRg1FkXtqgnewUYvSvbAwzcOKfC
+2aXYNHymqk5jWfzlJr6Yoq037CevKLHACMuwidMG7rCRBlrk9RHcAeHKuau/KNYX
+SmMuGZyk4pKUMK52isSBNs5vO3p7EISkhkbvqj3+e3plVe+yIDGDfZyO0LRltlYQ
+mRk+EsK19bD3PIXzcB/su44k7tPXxTwITbU=
 -----END CERTIFICATE-----

test/fixtures/certs/ca/my-root-ca.key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

test/fixtures/certs/client/chain.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi4CCQCM0p3yRoHvMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+MIIDRjCCAi4CCQCd9um3+t/FMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU1WhcNMjgwMjIzMTQ1NDU1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVybmFsIFNpZ25p
 bmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCottzRZJSCy0rHBVKCu/53bIrrCwOIMc9Dc6RxE0eG
-BMT10xJK8t57AvWrONyIXp7cKlwA2GLGrI4JURlxQ0x8BQCxG41D62+njYyfvowH
-g5tktGSsgTCfzqOdJDlj/QOIQ/cuU73oDsyuxKz5rGPorFuGpkhNMJFYk1AGaM0C
-SQGEZHxDLDNq5H77RHd6Ceyjcm4SkIQw7K+5npmxEQKOHdn2UZR18ZA44OiWgQuF
-IupTEcBGhRuRwHjK/F0qZyZsK5M+5TF752SXDTo0/qXAS3FrJ5+0oS0iRd25SkNC
-Nu50btNa8eNLbjDFfeLQhbFFafrxxJzwH4wKCGLv271TAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAAdrSCb8XZgEJWdmXab3dBhdQwG9T4hnr3pl2hu7S0WBC4F3bsEy
-IN0PCBzxV+hwbtyiMmJbsCppQ/UheFdfL4gjOivT5hlSLR7YEIpDZaQlNDtBTG+9
-FWk5txdkxs/JLae4hqVu7yt0vtc100dWPgN5biSkcDFTosn06yZroCnPiXP4BJjr
-yabPBuRLF9KzSAt1UISd5kwbS+uiJL2C0E/DwCLHiEYFe/AvyzEndBmAbZSQZ/ov
-XrCucH4Vm9Amoiq6V9Xn9Yw7KrYZb7iVntHdgEbRYGDDxdhpJyamqm//zeCv/Wsr
-XST74FCCWkLfgVBj0B/mc8WZjUxSMZgfMJA=
+AQUAA4IBDwAwggEKAoIBAQCxNN5MnbEPGRrVilntUsRx9b8kN5YH18F0E0APsT2o
+5LpD+Y5ZlkqqpD4q+LH485FZSNDEogWWvs70Me7yYEdhQJGnhh1JjFv5qvOToWxd
+O/YrsByDWkIHHVHW7FLz1+SWDbgdGqJ9fitD7zUdlakL2XbrIzTXOPM16ZFx8vt8
+Bf8Czd5hlFDYl+yuGP/2zglCrsbLZA+cX+DCO3waIrZNGuidHbcyMoQ2gySiGXiD
+r/FniwaPvYNgyZDn2BMkcTFjXTD+gRLcsAZ+s8vBragsSJ0PKA3QUN6UH73GCTVg
+qC5cuOr/pJiEeXWtrST/Vq0HWBR5CAmBD9JJDrwqmjn5AgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAHOCDHi/fz7RJxrzuqybibv1+AaosuFycDZzx39ZNTjSEYonh3DN
+tXKJB/l5D62raCyJDUZLh22x+A2mXkB9HvTLN41PnMIxzlF9CCFCBlJC4VkYVg3x
+4hqZy1Lq5o5AUw+A2xIsWTNQhwrv+fgpZ5EX8PRg1FkXtqgnewUYvSvbAwzcOKfC
+2aXYNHymqk5jWfzlJr6Yoq037CevKLHACMuwidMG7rCRBlrk9RHcAeHKuau/KNYX
+SmMuGZyk4pKUMK52isSBNs5vO3p7EISkhkbvqj3+e3plVe+yIDGDfZyO0LRltlYQ
+mRk+EsK19bD3PIXzcB/su44k7tPXxTwITbU=
 -----END CERTIFICATE-----

test/fixtures/certs/client/pubkey.pem

@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8j/Bw25w5WuaY26OzdqG
-OIeYmBhKLtm79dBAVAPqnz02uSHI2kyioIyqoJdt4AyudTVEOs5209HHEAYwWlEw
-rx034/MjXxd7iWf+gDfio0NSKVtMKc1f2Chi3wfeDa50Xro4BSSDemq6KUQk4grf
-FT8lH5aDcbCr2MZsGFYrNMwhEvDq944KZ5lyIcChrrOOT0JVDk7R+4x92ClFx4hu
-iDLjI1i0VllJodIcE2kBTeClV0HM/5tG/P643KOYa+gmjv99CKqfhhxQzMkSopRq
-bhR6UvIKG4dP4SlKegzGLy6lTp1bmsA/pIkRslAYCExgQiW90Snu6whc7XZZtm7v
-+wIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrxL1AhAiG6UR0Bj+Pgd
+TSclE3Ggu2vsh3hlqEFPmm8O0kHbhcZhi4vHcYUFJnE3BsbvAWjtj5N0smPPlo8/
+sXLhfGnugI+v1G/YyeCURkctw9pju7hIA/73QHzqN2+WBABoN6fogXL1WHucAiRY
+5uhGEfZPbXTk2o3Wme2EjHqlI2ONN8yLGVlzAxi2pSq71qwpUW99QaQeM0R04F/C
+N6sAlqLay26h0+Qb8QgCfO3yCWwxZByxQctap4f71Ja3mU0UCFIizy/xEe025Kkd
+/Oizg7WneSVTbUjrZ942WDTi+xHjaLc3Nkw+RsAHQtVz+0m/zHDpDEtLk5rg8ei3
+9wIDAQAB
 -----END PUBLIC KEY-----

test/fixtures/certs/generate-certs.sh

@@ -12,6 +12,7 @@ openssl genrsa \
 # Self-sign your Root Certificate Authority
 # Since this is private, the details can be as bogus as you like
 openssl req \
+  -sha256 \
   -x509 \
   -new \
   -nodes \
@@ -29,13 +30,15 @@ openssl genrsa \
 
 # Create a request from your Device, which your Root CA will sign
 openssl req -new \
+  -sha256 \
   -key server/privkey.pem \
   -out tmp/csr.pem \
   -subj "/C=US/ST=Utah/L=Provo/O=ACME Tech Inc/CN=${FQDN}"
 
 # Sign the request from Device with your Root CA
 # -CAserial ca/my-root-ca.srl
 openssl x509 \
+  -sha256 \
   -req -in tmp/csr.pem \
   -CA ca/my-root-ca.crt.pem \
   -CAkey ca/my-root-ca.key.pem \

test/fixtures/certs/server/cert.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDOTCCAiECCQC4S7lOdMSspzANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
+MIIDOTCCAiECCQDphbkaO8qs+TANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU3WhcNMjgwMjIzMTQ1NDU3WjBYMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBYMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xFjAUBgNVBAoMDUFDTUUgVGVjaCBJbmMx
 EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPI/wcNucOVrmmNujs3ahjiHmJgYSi7Zu/XQQFQD6p89NrkhyNpMoqCMqqCX
-beAMrnU1RDrOdtPRxxAGMFpRMK8dN+PzI18Xe4ln/oA34qNDUilbTCnNX9goYt8H
-3g2udF66OAUkg3pquilEJOIK3xU/JR+Wg3Gwq9jGbBhWKzTMIRLw6veOCmeZciHA
-oa6zjk9CVQ5O0fuMfdgpRceIbogy4yNYtFZZSaHSHBNpAU3gpVdBzP+bRvz+uNyj
-mGvoJo7/fQiqn4YcUMzJEqKUam4UelLyChuHT+EpSnoMxi8upU6dW5rAP6SJEbJQ
-GAhMYEIlvdEp7usIXO12WbZu7/sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAS+ek
-+g+GXsO7cJQR3A6LUzQTbpvUJmj9jkkggloB2gL3fcy09/QXadStYTaJltZaUJwO
-m+xQkdCtVDKIY429QmxSP9431AtzEocHiGJ2raZKoFpnTmXoep2mVsXAkqgX0Aso
-Xg1ae0nM9XmMl5Y2h+D0KxlDfNfkMAwbyIhZcVC2qtuS0IJcnJd7eY6SJlGBGq7x
-QixlwZr+3/k6IM9z+em8tMj9VL/iEPId0C/YMajNrBKfdVXYq6CLs3uGo8TqQdy8
-OQniaZ4YkCBJ1iwe3zn5vdx4eF3TC5ilvZmL6F4kL8a8G2bPFj0jRNiYTkvs12mv
-0nDAVhPg8iaepKxvYQ==
+ggEBALK8S9QIQIhulEdAY/j4HU0nJRNxoLtr7Id4ZahBT5pvDtJB24XGYYuLx3GF
+BSZxNwbG7wFo7Y+TdLJjz5aPP7Fy4Xxp7oCPr9Rv2MnglEZHLcPaY7u4SAP+90B8
+6jdvlgQAaDen6IFy9Vh7nAIkWOboRhH2T2105NqN1pnthIx6pSNjjTfMixlZcwMY
+tqUqu9asKVFvfUGkHjNEdOBfwjerAJai2stuodPkG/EIAnzt8glsMWQcsUHLWqeH
++9SWt5lNFAhSIs8v8RHtNuSpHfzos4O1p3klU21I62feNlg04vsR42i3NzZMPkbA
+B0LVc/tJv8xw6QxLS5Oa4PHot/cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAqCjb
+8FhPrtGuLWE5lpOSHsQlht3b5QYDQS6jBBrzCrF0O2UxO6DSDvYI2Rjl4frxc6is
++BxMR17aq1nBtzMHILZyOQ1wip3l91XBS3nMpOMOVNxh5YYVGWtmYRAeFCyeWGfx
+7cPMpTqKVRRrNipvtjsi+xLzZSo6voV137aM3Jj9KHo8i+nNQWH1liEEI4ls4zAG
+idZEdvmCR/G/fWY7uMvQt/FzApz2FcwvJwpSAcRN9jL7LRkg0jGEaQ4YVGaeDkmw
+oQj/QmxRvUwvOdVDTmNk5XvH6UYsjo0bm9DSZO1SPP3mxCrUknHaNAy/T2MhWPMF
+pS7F43HLoIzesDihtQ==
 -----END CERTIFICATE-----

test/fixtures/certs/server/chain.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi4CCQCM0p3yRoHvMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+MIIDRjCCAi4CCQCd9um3+t/FMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU1WhcNMjgwMjIzMTQ1NDU1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVybmFsIFNpZ25p
 bmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCottzRZJSCy0rHBVKCu/53bIrrCwOIMc9Dc6RxE0eG
-BMT10xJK8t57AvWrONyIXp7cKlwA2GLGrI4JURlxQ0x8BQCxG41D62+njYyfvowH
-g5tktGSsgTCfzqOdJDlj/QOIQ/cuU73oDsyuxKz5rGPorFuGpkhNMJFYk1AGaM0C
-SQGEZHxDLDNq5H77RHd6Ceyjcm4SkIQw7K+5npmxEQKOHdn2UZR18ZA44OiWgQuF
-IupTEcBGhRuRwHjK/F0qZyZsK5M+5TF752SXDTo0/qXAS3FrJ5+0oS0iRd25SkNC
-Nu50btNa8eNLbjDFfeLQhbFFafrxxJzwH4wKCGLv271TAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAAdrSCb8XZgEJWdmXab3dBhdQwG9T4hnr3pl2hu7S0WBC4F3bsEy
-IN0PCBzxV+hwbtyiMmJbsCppQ/UheFdfL4gjOivT5hlSLR7YEIpDZaQlNDtBTG+9
-FWk5txdkxs/JLae4hqVu7yt0vtc100dWPgN5biSkcDFTosn06yZroCnPiXP4BJjr
-yabPBuRLF9KzSAt1UISd5kwbS+uiJL2C0E/DwCLHiEYFe/AvyzEndBmAbZSQZ/ov
-XrCucH4Vm9Amoiq6V9Xn9Yw7KrYZb7iVntHdgEbRYGDDxdhpJyamqm//zeCv/Wsr
-XST74FCCWkLfgVBj0B/mc8WZjUxSMZgfMJA=
+AQUAA4IBDwAwggEKAoIBAQCxNN5MnbEPGRrVilntUsRx9b8kN5YH18F0E0APsT2o
+5LpD+Y5ZlkqqpD4q+LH485FZSNDEogWWvs70Me7yYEdhQJGnhh1JjFv5qvOToWxd
+O/YrsByDWkIHHVHW7FLz1+SWDbgdGqJ9fitD7zUdlakL2XbrIzTXOPM16ZFx8vt8
+Bf8Czd5hlFDYl+yuGP/2zglCrsbLZA+cX+DCO3waIrZNGuidHbcyMoQ2gySiGXiD
+r/FniwaPvYNgyZDn2BMkcTFjXTD+gRLcsAZ+s8vBragsSJ0PKA3QUN6UH73GCTVg
+qC5cuOr/pJiEeXWtrST/Vq0HWBR5CAmBD9JJDrwqmjn5AgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAHOCDHi/fz7RJxrzuqybibv1+AaosuFycDZzx39ZNTjSEYonh3DN
+tXKJB/l5D62raCyJDUZLh22x+A2mXkB9HvTLN41PnMIxzlF9CCFCBlJC4VkYVg3x
+4hqZy1Lq5o5AUw+A2xIsWTNQhwrv+fgpZ5EX8PRg1FkXtqgnewUYvSvbAwzcOKfC
+2aXYNHymqk5jWfzlJr6Yoq037CevKLHACMuwidMG7rCRBlrk9RHcAeHKuau/KNYX
+SmMuGZyk4pKUMK52isSBNs5vO3p7EISkhkbvqj3+e3plVe+yIDGDfZyO0LRltlYQ
+mRk+EsK19bD3PIXzcB/su44k7tPXxTwITbU=
 -----END CERTIFICATE-----

test/fixtures/certs/server/fullchain.pem

@@ -1,40 +1,40 @@
 -----BEGIN CERTIFICATE-----
-MIIDOTCCAiECCQC4S7lOdMSspzANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
+MIIDOTCCAiECCQDphbkaO8qs+TANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU3WhcNMjgwMjIzMTQ1NDU3WjBYMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBYMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xFjAUBgNVBAoMDUFDTUUgVGVjaCBJbmMx
 EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPI/wcNucOVrmmNujs3ahjiHmJgYSi7Zu/XQQFQD6p89NrkhyNpMoqCMqqCX
-beAMrnU1RDrOdtPRxxAGMFpRMK8dN+PzI18Xe4ln/oA34qNDUilbTCnNX9goYt8H
-3g2udF66OAUkg3pquilEJOIK3xU/JR+Wg3Gwq9jGbBhWKzTMIRLw6veOCmeZciHA
-oa6zjk9CVQ5O0fuMfdgpRceIbogy4yNYtFZZSaHSHBNpAU3gpVdBzP+bRvz+uNyj
-mGvoJo7/fQiqn4YcUMzJEqKUam4UelLyChuHT+EpSnoMxi8upU6dW5rAP6SJEbJQ
-GAhMYEIlvdEp7usIXO12WbZu7/sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAS+ek
-+g+GXsO7cJQR3A6LUzQTbpvUJmj9jkkggloB2gL3fcy09/QXadStYTaJltZaUJwO
-m+xQkdCtVDKIY429QmxSP9431AtzEocHiGJ2raZKoFpnTmXoep2mVsXAkqgX0Aso
-Xg1ae0nM9XmMl5Y2h+D0KxlDfNfkMAwbyIhZcVC2qtuS0IJcnJd7eY6SJlGBGq7x
-QixlwZr+3/k6IM9z+em8tMj9VL/iEPId0C/YMajNrBKfdVXYq6CLs3uGo8TqQdy8
-OQniaZ4YkCBJ1iwe3zn5vdx4eF3TC5ilvZmL6F4kL8a8G2bPFj0jRNiYTkvs12mv
-0nDAVhPg8iaepKxvYQ==
+ggEBALK8S9QIQIhulEdAY/j4HU0nJRNxoLtr7Id4ZahBT5pvDtJB24XGYYuLx3GF
+BSZxNwbG7wFo7Y+TdLJjz5aPP7Fy4Xxp7oCPr9Rv2MnglEZHLcPaY7u4SAP+90B8
+6jdvlgQAaDen6IFy9Vh7nAIkWOboRhH2T2105NqN1pnthIx6pSNjjTfMixlZcwMY
+tqUqu9asKVFvfUGkHjNEdOBfwjerAJai2stuodPkG/EIAnzt8glsMWQcsUHLWqeH
++9SWt5lNFAhSIs8v8RHtNuSpHfzos4O1p3klU21I62feNlg04vsR42i3NzZMPkbA
+B0LVc/tJv8xw6QxLS5Oa4PHot/cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAqCjb
+8FhPrtGuLWE5lpOSHsQlht3b5QYDQS6jBBrzCrF0O2UxO6DSDvYI2Rjl4frxc6is
++BxMR17aq1nBtzMHILZyOQ1wip3l91XBS3nMpOMOVNxh5YYVGWtmYRAeFCyeWGfx
+7cPMpTqKVRRrNipvtjsi+xLzZSo6voV137aM3Jj9KHo8i+nNQWH1liEEI4ls4zAG
+idZEdvmCR/G/fWY7uMvQt/FzApz2FcwvJwpSAcRN9jL7LRkg0jGEaQ4YVGaeDkmw
+oQj/QmxRvUwvOdVDTmNk5XvH6UYsjo0bm9DSZO1SPP3mxCrUknHaNAy/T2MhWPMF
+pS7F43HLoIzesDihtQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi4CCQCM0p3yRoHvMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+MIIDRjCCAi4CCQCd9um3+t/FMDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVy
-bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTgw
-MjI1MTQ1NDU1WhcNMjgwMjIzMTQ1NDU1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
+bmFsIFNpZ25pbmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjEw
+ODAyMTExNTA1WhcNMzEwNzMxMTExNTA1WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
 CAwEVXRhaDEOMAwGA1UEBwwFUHJvdm8xIzAhBgNVBAoMGkludGVybmFsIFNpZ25p
 bmcgQXV0aG9yaXR5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCottzRZJSCy0rHBVKCu/53bIrrCwOIMc9Dc6RxE0eG
-BMT10xJK8t57AvWrONyIXp7cKlwA2GLGrI4JURlxQ0x8BQCxG41D62+njYyfvowH
-g5tktGSsgTCfzqOdJDlj/QOIQ/cuU73oDsyuxKz5rGPorFuGpkhNMJFYk1AGaM0C
-SQGEZHxDLDNq5H77RHd6Ceyjcm4SkIQw7K+5npmxEQKOHdn2UZR18ZA44OiWgQuF
-IupTEcBGhRuRwHjK/F0qZyZsK5M+5TF752SXDTo0/qXAS3FrJ5+0oS0iRd25SkNC
-Nu50btNa8eNLbjDFfeLQhbFFafrxxJzwH4wKCGLv271TAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAAdrSCb8XZgEJWdmXab3dBhdQwG9T4hnr3pl2hu7S0WBC4F3bsEy
-IN0PCBzxV+hwbtyiMmJbsCppQ/UheFdfL4gjOivT5hlSLR7YEIpDZaQlNDtBTG+9
-FWk5txdkxs/JLae4hqVu7yt0vtc100dWPgN5biSkcDFTosn06yZroCnPiXP4BJjr
-yabPBuRLF9KzSAt1UISd5kwbS+uiJL2C0E/DwCLHiEYFe/AvyzEndBmAbZSQZ/ov
-XrCucH4Vm9Amoiq6V9Xn9Yw7KrYZb7iVntHdgEbRYGDDxdhpJyamqm//zeCv/Wsr
-XST74FCCWkLfgVBj0B/mc8WZjUxSMZgfMJA=
+AQUAA4IBDwAwggEKAoIBAQCxNN5MnbEPGRrVilntUsRx9b8kN5YH18F0E0APsT2o
+5LpD+Y5ZlkqqpD4q+LH485FZSNDEogWWvs70Me7yYEdhQJGnhh1JjFv5qvOToWxd
+O/YrsByDWkIHHVHW7FLz1+SWDbgdGqJ9fitD7zUdlakL2XbrIzTXOPM16ZFx8vt8
+Bf8Czd5hlFDYl+yuGP/2zglCrsbLZA+cX+DCO3waIrZNGuidHbcyMoQ2gySiGXiD
+r/FniwaPvYNgyZDn2BMkcTFjXTD+gRLcsAZ+s8vBragsSJ0PKA3QUN6UH73GCTVg
+qC5cuOr/pJiEeXWtrST/Vq0HWBR5CAmBD9JJDrwqmjn5AgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAHOCDHi/fz7RJxrzuqybibv1+AaosuFycDZzx39ZNTjSEYonh3DN
+tXKJB/l5D62raCyJDUZLh22x+A2mXkB9HvTLN41PnMIxzlF9CCFCBlJC4VkYVg3x
+4hqZy1Lq5o5AUw+A2xIsWTNQhwrv+fgpZ5EX8PRg1FkXtqgnewUYvSvbAwzcOKfC
+2aXYNHymqk5jWfzlJr6Yoq037CevKLHACMuwidMG7rCRBlrk9RHcAeHKuau/KNYX
+SmMuGZyk4pKUMK52isSBNs5vO3p7EISkhkbvqj3+e3plVe+yIDGDfZyO0LRltlYQ
+mRk+EsK19bD3PIXzcB/su44k7tPXxTwITbU=
 -----END CERTIFICATE-----