fix: use-ca-for-systemcheck

JackuB · JackuB · commit dc189e370e77 · 2019-11-21T14:11:49.000+01:00
CA_CERT option was ignored for /systemcheck endpoint
resulting in false negatives.
This fix applies CA_CERT to this endpoint as well
diff --git a/lib/client/index.js b/lib/client/index.js
@@ -75,6 +75,9 @@ module.exports = ({ port = null, config = {}, filters = {} }) => {
       method: brokerClientValidationMethod,
       timeout: brokerClientValidationTimeoutMs,
       json: true,
+      agentOptions: {
+        ca: config.caCert, // Optional CA cert
+      },
     }, (error, response) => {
       // test logic requires to surface internal data
       // which is best not exposed in production
diff --git a/test/functional/client-ca.test.js b/test/functional/client-ca.test.js
@@ -20,12 +20,13 @@ test('correctly use supplied CA cert on client for connections', t => {
    * 6. send request to the server and expect success
    */
 
-  t.plan(5);
+  t.plan(6);
 
   process.env.ACCEPT = 'filters.json';
 
   process.chdir(path.resolve(root, '../fixtures/server'));
   process.env.BROKER_TYPE = 'server';
+  let clientPort;
   const serverPort = port();
   const server = app.main({ port: serverPort });
 
@@ -62,7 +63,9 @@ test('correctly use supplied CA cert on client for connections', t => {
 
         // Specify CA file
         process.env.CA_CERT = '../certs/ca/my-root-ca.crt.pem';
-        client = app.main({ port: port() });
+        process.env.BROKER_CLIENT_VALIDATION_URL = `https://localhost:${echoServerPort}/test`;
+        clientPort = port();
+        client = app.main({ port: clientPort });
       });
 
       t.test('successfully broker POST with CA set', t => {
@@ -73,6 +76,14 @@ test('correctly use supplied CA cert on client for connections', t => {
         });
       });
 
+      t.test('successfully call systemcheck with CA set', t => {
+        const url = `http://localhost:${clientPort}/systemcheck`;
+        request({ url, json: true }, (err, res) => {
+          t.equal(res.statusCode, 200, '200 statusCode');
+          t.end();
+        });
+      });
+
       t.test('clean up', t => {
         client.close();
         setTimeout(() => {
diff --git a/test/utils.js b/test/utils.js
@@ -15,6 +15,11 @@ const { app: echoServer, server } = webserver({
   httpsCert: process.env.TEST_CERT, // Optional
 });
 
+echoServer.get('/test', (req, res) => {
+  res.status(200);
+  res.send('All good');
+});
+
 echoServer.get(
   '/test-blob/1',
   (req, res) => {
