Merge pull request snyk#180 from snyk/feat/improve-system-check-error-messages

carlos-snyk · web-flow · commit b366f3e18b19 · 2019-07-16T14:38:35.000+01:00
feat: improve systemcheck 401 error messages
diff --git a/lib/client/index.js b/lib/client/index.js
@@ -41,7 +41,7 @@ module.exports = ({ port = null, config = {}, filters = {} }) => {
   });
 
   app.get(config.brokerSystemcheckPath || '/systemcheck', (req, res) => {
-    // Systemcheck is the broker client's ability to assert the network 
+    // Systemcheck is the broker client's ability to assert the network
     // reachability and some correctness of credentials for the service
     // being proxied by the broker client.
 
@@ -89,20 +89,26 @@ module.exports = ({ port = null, config = {}, filters = {} }) => {
         return res.status(500).json(data);
       }
 
-      data.brokerClientValidationUrlStatusCode = response && response.statusCode;
+      const responseStatusCode = response && response.statusCode;
+      data.brokerClientValidationUrlStatusCode = responseStatusCode;
+
       // check for 2xx status code
-      const goodStatusCode = /^2/.test(response && response.statusCode);
+      const goodStatusCode = /^2/.test(responseStatusCode);
       if (!goodStatusCode) {
         data.ok = false;
-        data.error = 'Status code is not 2xx';
+        data.error = (responseStatusCode === 401 || responseStatusCode === 403)
+          ? 'Failed due to invalid credentials'
+          : 'Status code is not 2xx';
+
+        logger.error(data, response && response.body, 'Systemcheck failed');
         return res.status(500).json(data);
       }
 
       data.ok = true;
       return res.status(200).json(data);
     });
   });
-  
+
   // relay all other URL paths
   app.all('/*', (req, res, next) => {
     res.locals.io = io;
