snyk-broker 4.176.9 → 4.177.0

package/dist/cli/exec.js

@@ -8,6 +8,9 @@ exports.default = async (args) => {
         throw new Error(`unknown command "${command}"`);
     }
     args.client = command === 'client';
+    if (!args.config) {
+        args.config = {};
+    }
     await (0, index_1.app)(args);
 };
 //# sourceMappingURL=exec.js.map

package/dist/cli/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.ts"],"names":[],"mappings":";;AAAA,wCAAmC;AAEnC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEtC,kBAAe,KAAK,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC;IACnC,MAAM,IAAA,WAAG,EAAC,IAAI,CAAC,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.ts"],"names":[],"mappings":";;AAAA,wCAAmC;AAEnC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEtC,kBAAe,KAAK,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;KAClB;IACD,MAAM,IAAA,WAAG,EAAC,IAAI,CAAC,CAAC;AAClB,CAAC,CAAC"}

package/dist/lib/client/checks/config/index.js

@@ -2,8 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigChecks = void 0;
 const brokerClientUrlCheck_1 = require("./brokerClientUrlCheck");
+const universalConnectionConfigCheck_1 = require("./universalConnectionConfigCheck");
 function getConfigChecks(config) {
-    return [brokerClientUrlCheck(config)];
+    return [
+        brokerClientUrlCheck(config),
+        universalBrokerConnectionsCheck(config),
+    ];
 }
 exports.getConfigChecks = getConfigChecks;
 const brokerClientUrlCheck = (config) => {
@@ -17,4 +21,14 @@ const brokerClientUrlCheck = (config) => {
         },
     };
 };
+const universalBrokerConnectionsCheck = (config) => {
+    return {
+        id: 'universal-broker-connections-config-validation',
+        name: 'Universal Broker Client Connections Configuration Check',
+        enabled: config.universalBrokerEnabled,
+        check: function () {
+            return (0, universalConnectionConfigCheck_1.validateUniversalConnectionsConfig)({ id: this.id, name: this.name }, config);
+        },
+    };
+};
 //# sourceMappingURL=index.js.map

package/dist/lib/client/checks/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/index.ts"],"names":[],"mappings":";;;AAEA,iEAAiE;AAEjE,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,0CAEC;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAS,EAAE;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACrC,OAAO;QACL,EAAE,EAAE,8BAA8B;QAClC,IAAI,EAAE,oCAAoC;QAC1C,OAAO,EAAE,GAAG,IAAI,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;QAC3C,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,8CAAuB,EAClC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,MAAM,CACP,CAAC;QACJ,CAAC;KACc,CAAC;AACpB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/index.ts"],"names":[],"mappings":";;;AAEA,iEAAiE;AACjE,qFAAsF;AAEtF,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO;QACL,oBAAoB,CAAC,MAAM,CAAC;QAC5B,+BAA+B,CAAC,MAAM,CAAC;KACxC,CAAC;AACJ,CAAC;AALD,0CAKC;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAS,EAAE;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACrC,OAAO;QACL,EAAE,EAAE,8BAA8B;QAClC,IAAI,EAAE,oCAAoC;QAC1C,OAAO,EAAE,GAAG,IAAI,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;QAC3C,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,8CAAuB,EAClC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,MAAM,CACP,CAAC;QACJ,CAAC;KACc,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CAAC,MAAc,EAAS,EAAE;IAChE,OAAO;QACL,EAAE,EAAE,gDAAgD;QACpD,IAAI,EAAE,yDAAyD;QAC/D,OAAO,EAAE,MAAM,CAAC,sBAAsB;QACtC,KAAK,EAAE;YACL,OAAO,IAAA,mEAAkC,EACvC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,MAAM,CACP,CAAC;QACJ,CAAC;KACc,CAAC;AACpB,CAAC,CAAC"}

package/dist/lib/client/checks/config/universalConnectionConfigCheck.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateUniversalConnectionsConfig = void 0;
+const universal_1 = require("../../../common/config/universal");
+const validateUniversalConnectionsConfig = (checkOptions, config) => {
+    if (!config.connections) {
+        return {
+            id: checkOptions.id,
+            name: checkOptions.name,
+            status: 'error',
+            output: `Missing connections in config`,
+        };
+    }
+    for (const key in config.connections) {
+        const currentConnection = (0, universal_1.getConfigForIdentifier)(config.connections[key].identifier, config);
+        if (!currentConnection || !currentConnection.type) {
+            return {
+                id: checkOptions.id,
+                name: checkOptions.name,
+                status: 'error',
+                output: `Missing type in connection ${key} is unsupported`,
+            };
+        }
+        if (!config.supportedBrokerTypes.includes(currentConnection.type)) {
+            return {
+                id: checkOptions.id,
+                name: checkOptions.name,
+                status: 'error',
+                output: `${currentConnection.type} type in connection ${key} is unsupported`,
+            };
+        }
+        // Check all required elements are there
+        for (const requiredKey in config.brokerClientConfiguration[currentConnection.type].required) {
+            if (requiredKey != 'type' &&
+                !Object.keys(currentConnection).includes(requiredKey)) {
+                return {
+                    id: checkOptions.id,
+                    name: checkOptions.name,
+                    status: 'error',
+                    output: `Missing ${requiredKey} required in connection ${key}`,
+                };
+            }
+        }
+    }
+    return {
+        id: checkOptions.id,
+        name: checkOptions.name,
+        status: 'passing',
+        output: 'connections config check: ok',
+    };
+};
+exports.validateUniversalConnectionsConfig = validateUniversalConnectionsConfig;
+//# sourceMappingURL=universalConnectionConfigCheck.js.map

package/dist/lib/client/checks/config/universalConnectionConfigCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"universalConnectionConfigCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/universalConnectionConfigCheck.ts"],"names":[],"mappings":";;;AAAA,gEAA0E;AAInE,MAAM,kCAAkC,GAAG,CAChD,YAA0B,EAC1B,MAAc,EACD,EAAE;IACf,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO;YACL,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,+BAA+B;SAClB,CAAC;KACzB;IACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE;QACpC,MAAM,iBAAiB,GAAG,IAAA,kCAAsB,EAC9C,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAClC,MAAM,CACP,CAAC;QACF,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE;YACjD,OAAO;gBACL,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,8BAA8B,GAAG,iBAAiB;aACrC,CAAC;SACzB;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YACjE,OAAO;gBACL,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,uBAAuB,GAAG,iBAAiB;aACvD,CAAC;SACzB;QAED,wCAAwC;QACxC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,yBAAyB,CACxD,iBAAiB,CAAC,IAAI,CACvB,CAAC,QAAQ,EAAE;YACV,IACE,WAAW,IAAI,MAAM;gBACrB,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrD;gBACA,OAAO;oBACL,EAAE,EAAE,YAAY,CAAC,EAAE;oBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,MAAM,EAAE,OAAO;oBACf,MAAM,EAAE,WAAW,WAAW,2BAA2B,GAAG,EAAE;iBACzC,CAAC;aACzB;SACF;KACF;IAED,OAAO;QACL,EAAE,EAAE,YAAY,CAAC,EAAE;QACnB,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,8BAA8B;KACjB,CAAC;AAC1B,CAAC,CAAC;AA1DW,QAAA,kCAAkC,sCA0D7C"}

package/dist/lib/client/checks/http/index.js

@@ -22,14 +22,11 @@ const brokerServerStatusCheck = (config) => {
     };
 };
 const restApiStatusCheck = (config) => {
-    const url = config.API_BASE_URL || config.BROKER_SERVER_URL
-        ? config.BROKER_SERVER_URL.replace('//broker.', '//api.')
-        : 'https://api.snyk.io';
     return {
         id: 'rest-api-status',
         name: 'REST API Healthcheck',
         enabled: true,
-        url: `${url}/rest/openapi`,
+        url: `${config.API_BASE_URL}/rest/openapi`,
         method: 'GET',
         timeoutMs: defaultTimeoutMs,
         check: async function () {

package/dist/lib/client/checks/http/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/index.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAIrD,MAAM,gBAAgB,GAAG,KAAM,CAAC;AAEhC,SAAgB,aAAa,CAAC,MAAc;IAC1C,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;AACvE,CAAC;AAFD,sCAEC;AAED,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAa,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,IAAI,wBAAwB,CAAC;IACjE,OAAO;QACL,EAAE,EAAE,sBAAsB;QAC1B,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,IAAI;QAEb,GAAG,EAAE,GAAG,GAAG,cAAc;QACzB,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,gBAAgB;QAC3B,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,kCAAkB,EAC7B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAClE,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAa,EAAE;IACvD,MAAM,GAAG,GACP,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,iBAAiB;QAC7C,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC;QACzD,CAAC,CAAC,qBAAqB,CAAC;IAC5B,OAAO;QACL,EAAE,EAAE,iBAAiB;QACrB,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,IAAI;QAEb,GAAG,EAAE,GAAG,GAAG,eAAe;QAC1B,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,gBAAgB;QAC3B,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,kCAAkB,EAC7B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAClE,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/index.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAIrD,MAAM,gBAAgB,GAAG,KAAM,CAAC;AAEhC,SAAgB,aAAa,CAAC,MAAc;IAC1C,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;AACvE,CAAC;AAFD,sCAEC;AAED,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAa,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,IAAI,wBAAwB,CAAC;IACjE,OAAO;QACL,EAAE,EAAE,sBAAsB;QAC1B,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,IAAI;QAEb,GAAG,EAAE,GAAG,GAAG,cAAc;QACzB,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,gBAAgB;QAC3B,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,kCAAkB,EAC7B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAClE,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAa,EAAE;IACvD,OAAO;QACL,EAAE,EAAE,iBAAiB;QACrB,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,IAAI;QAEb,GAAG,EAAE,GAAG,MAAM,CAAC,YAAY,eAAe;QAC1C,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,gBAAgB;QAC3B,KAAK,EAAE,KAAK;YACV,OAAO,MAAM,IAAA,kCAAkB,EAC7B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAChC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAClE,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC,CAAC"}

package/dist/lib/client/dispatcher/index.js

@@ -19,20 +19,15 @@ function highAvailabilityModeEnabled(config) {
     return highAvailabilityModeEnabled;
 }
 exports.highAvailabilityModeEnabled = highAvailabilityModeEnabled;
-async function getServerId(config, brokerClientId) {
-    if (!config.BROKER_TOKEN) {
-        logger_1.log.error({ token: config.BROKER_TOKEN }, 'missing client token');
+async function getServerId(config, brokerToken, brokerClientId) {
+    if (!brokerToken) {
+        logger_1.log.error({ token: brokerToken }, 'missing client token');
         const error = new Error('BROKER_TOKEN is required to successfully identify itself to the server');
         error.name = 'MISSING_BROKER_TOKEN';
         throw error;
     }
-    const defaultBrokerDispatcherBaseUrl = config.API_BASE_URL || config.BROKER_SERVER_URL
-        ? config.BROKER_SERVER_URL.replace('//broker.', '//api.')
-        : 'https://api.snyk.io';
-    const haConfig = getHAConfig(config);
-    const baseUrl = haConfig.BROKER_DISPATCHER_BASE_URL || defaultBrokerDispatcherBaseUrl;
-    const client = new api_1.HttpDispatcherServiceClient(baseUrl);
-    const hashedToken = (0, token_1.hashToken)(config.BROKER_TOKEN);
+    const client = new api_1.HttpDispatcherServiceClient(config.API_BASE_URL);
+    const hashedToken = (0, token_1.hashToken)(brokerToken);
     const maxRetries = 10;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
         try {
@@ -41,7 +36,7 @@ async function getServerId(config, brokerClientId) {
                 hashedBrokerToken: hashedToken,
             }, {
                 deployment_location: `${config.BROKER_CLIENT_LOCATION || 'snyk-broker-client'}`,
-                broker_token_first_char: `${config.BROKER_TOKEN[0]}`,
+                broker_token_first_char: `${brokerToken[0]}`,
             });
         }
         catch (err) {
@@ -53,7 +48,4 @@ async function getServerId(config, brokerClientId) {
     return null;
 }
 exports.getServerId = getServerId;
-function getHAConfig(config) {
-    return config;
-}
 //# sourceMappingURL=index.js.map

package/dist/lib/client/dispatcher/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,oDAAqD;AACrD,sCAA2D;AAC3D,6DAA2E;AAE3E,SAAgB,2BAA2B,CAAC,MAAW;IACrD,iDAAiD;IACjD,IAAI,2BAA2B,GAAG,KAAK,CAAC;IAExC,MAAM,gCAAgC,GAAI,MAAiB;SACxD,sBAAsB,CAAC;IAE1B,IAAI,OAAO,gCAAgC,KAAK,WAAW,EAAE;QAC3D,2BAA2B;YACzB,gCAAgC,CAAC,WAAW,EAAE,KAAK,MAAM;gBACzD,gCAAgC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KAC5D;IAED,YAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAE9E,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAhBD,kEAgBC;AAEM,KAAK,UAAU,WAAW,CAC/B,MAAW,EACX,cAAsB;IAEtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,sBAAsB,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACpC,MAAM,KAAK,CAAC;KACb;IAED,MAAM,8BAA8B,GAClC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,iBAAiB;QAC7C,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC;QACzD,CAAC,CAAC,qBAAqB,CAAC;IAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,OAAO,GACX,QAAQ,CAAC,0BAA0B,IAAI,8BAA8B,CAAC;IACxE,MAAM,MAAM,GAAG,IAAI,iCAA2B,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI;YACF,OAAO,MAAM,IAAA,8CAAyB,EACpC,MAAM,EACN;gBACE,cAAc,EAAE,cAAc;gBAC9B,iBAAiB,EAAE,WAAW;aAC/B,EACD;gBACE,mBAAmB,EAAE,GACnB,MAAM,CAAC,sBAAsB,IAAI,oBACnC,EAAE;gBACF,uBAAuB,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;aACrD,CACF,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,CAAC;YACrC,YAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,OAAO,EAAE,EACpB,eAAe,OAAO,2CAA2C,CAClE,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;SACvE;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAlDD,kCAkDC;AAED,SAAS,WAAW,CAAC,MAAW;IAC9B,OAAO,MAAgB,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,oDAAqD;AACrD,sCAA2D;AAC3D,6DAA2E;AAE3E,SAAgB,2BAA2B,CAAC,MAAW;IACrD,iDAAiD;IACjD,IAAI,2BAA2B,GAAG,KAAK,CAAC;IAExC,MAAM,gCAAgC,GAAI,MAAiB;SACxD,sBAAsB,CAAC;IAE1B,IAAI,OAAO,gCAAgC,KAAK,WAAW,EAAE;QAC3D,2BAA2B;YACzB,gCAAgC,CAAC,WAAW,EAAE,KAAK,MAAM;gBACzD,gCAAgC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KAC5D;IAED,YAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAE9E,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAhBD,kEAgBC;AAEM,KAAK,UAAU,WAAW,CAC/B,MAAW,EACX,WAAmB,EACnB,cAAsB;IAEtB,IAAI,CAAC,WAAW,EAAE;QAChB,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACpC,MAAM,KAAK,CAAC;KACb;IAED,MAAM,MAAM,GAAG,IAAI,iCAA2B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI;YACF,OAAO,MAAM,IAAA,8CAAyB,EACpC,MAAM,EACN;gBACE,cAAc,EAAE,cAAc;gBAC9B,iBAAiB,EAAE,WAAW;aAC/B,EACD;gBACE,mBAAmB,EAAE,GACnB,MAAM,CAAC,sBAAsB,IAAI,oBACnC,EAAE;gBACF,uBAAuB,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;aAC7C,CACF,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,CAAC;YACrC,YAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,OAAO,EAAE,EACpB,eAAe,OAAO,2CAA2C,CAClE,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;SACvE;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA5CD,kCA4CC"}

package/dist/lib/client/hooks/startup/processHooks.js

@@ -6,9 +6,12 @@ const logger_1 = require("../../../logs/logger");
 const checks_1 = require("../../checks");
 const scm_1 = require("../../scm");
 const processStartUpHooks = async (clientOpts, brokerClientId) => {
-    var _a;
+    var _a, _b, _c, _d, _e, _f;
     try {
-        if (!clientOpts.config.brokerToken) {
+        clientOpts.config.API_BASE_URL =
+            (_d = (_b = (_a = clientOpts.config.BROKER_DISPATCHER_BASE_URL) !== null && _a !== void 0 ? _a : clientOpts.config.API_BASE_URL) !== null && _b !== void 0 ? _b : (_c = clientOpts.config.BROKER_SERVER_URL) === null || _c === void 0 ? void 0 : _c.replace('//broker.', '//api.').replace('//broker2.', '//api.')) !== null && _d !== void 0 ? _d : 'https://api.snyk.io';
+        if (!clientOpts.config.brokerToken &&
+            !clientOpts.config.universalBrokerEnabled) {
             const brokerToken = clientOpts.config.brokerToken;
             // null, undefined, empty, etc.
             logger_1.log.error({ brokerToken }, '[MISSING_BROKER_TOKEN] BROKER_TOKEN is required to successfully identify itself to the server');
@@ -24,22 +27,11 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
             error['code'] = 'MISSING_BROKER_SERVER_URL';
             throw error;
         }
-        if (!clientOpts.config.BROKER_CLIENT_URL) {
-            const proto = !clientOpts.config.key && !clientOpts.config.cert ? 'http' : 'https';
-            clientOpts.config.BROKER_CLIENT_URL = `${proto}://localhost:${clientOpts.port}`;
-        }
-        let serverId;
-        if ((0, dispatcher_1.highAvailabilityModeEnabled)(clientOpts.config)) {
-            serverId = await (0, dispatcher_1.getServerId)(clientOpts.config, brokerClientId);
-            if (serverId === null) {
-                logger_1.log.warn({}, 'could not receive server id from Broker Dispatcher');
-                serverId = '';
-            }
-            else {
-                logger_1.log.info({ serverId }, 'received server id');
-                clientOpts.config.serverId = serverId;
-            }
-        }
+        // if (!clientOpts.config.BROKER_CLIENT_URL) {
+        //   const proto =
+        //     !clientOpts.config.key && !clientOpts.config.cert ? 'http' : 'https';
+        //   clientOpts.config.BROKER_CLIENT_URL = `${proto}://localhost:${clientOpts.port}`;
+        // }
         let preflightCheckResults = [];
         if ((0, checks_1.preflightChecksEnabled)(clientOpts.config)) {
             // wrap preflight checks execution into try-catch, so the broker client
@@ -51,9 +43,48 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
                 logger_1.log.error({ error }, 'failed to execute preflight checks');
             }
         }
+        let serverId;
+        if ((0, dispatcher_1.highAvailabilityModeEnabled)(clientOpts.config)) {
+            if (clientOpts.config.universalBrokerEnabled) {
+                for (const key in clientOpts.config.connections) {
+                    serverId = await (0, dispatcher_1.getServerId)(clientOpts.config, clientOpts.config.connections[key].identifier, brokerClientId);
+                    if (serverId === null) {
+                        logger_1.log.warn({}, 'could not receive server id from Broker Dispatcher');
+                        serverId = '';
+                    }
+                    else {
+                        logger_1.log.info({ serverId }, 'received server id');
+                        clientOpts.config.connections[key].serverId = serverId;
+                    }
+                }
+            }
+            else {
+                serverId = await (0, dispatcher_1.getServerId)(clientOpts.config, clientOpts.config.brokerToken, brokerClientId);
+                if (serverId === null) {
+                    logger_1.log.warn({}, 'could not receive server id from Broker Dispatcher');
+                    serverId = '';
+                }
+                else {
+                    logger_1.log.info({ serverId }, 'received server id');
+                    clientOpts.config.serverId = serverId;
+                }
+            }
+        }
         if ((0, scm_1.commitSigningEnabled)(clientOpts.config)) {
             const commitSigningRules = (0, scm_1.commitSigningFilterRules)();
-            (_a = clientOpts.filters.private) === null || _a === void 0 ? void 0 : _a.push(...commitSigningRules);
+            if (clientOpts['universalBrokerEnabled']) {
+                (_e = clientOpts.filters['github'].private) === null || _e === void 0 ? void 0 : _e.push(...commitSigningRules);
+                (_f = clientOpts.filters['github-enterprise'].github.private) === null || _f === void 0 ? void 0 : _f.push(...commitSigningRules);
+            }
+            else {
+                if (clientOpts.filters instanceof Map) {
+                    logger_1.log.error({ clientOpts }, 'Error pushing commit signing rules, unexpected filters type');
+                    throw new Error('Error pushing commit signing rules, unexpected filters type');
+                }
+                else {
+                    clientOpts.filters.private.push(...commitSigningRules);
+                }
+            }
             logger_1.log.info({ enabled: true, rulesCount: commitSigningRules.length }, 'loading commit signing rules');
         }
         if (clientOpts.config.INSECURE_DOWNSTREAM) {

package/dist/lib/client/hooks/startup/processHooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"processHooks.js","sourceRoot":"","sources":["../../../../../lib/client/hooks/startup/processHooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"processHooks.js","sourceRoot":"","sources":["../../../../../lib/client/hooks/startup/processHooks.ts"],"names":[],"mappings":"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"}

package/dist/lib/client/index.js

@@ -16,6 +16,8 @@ const systemCheckHandler_1 = require("./routesHandler/systemCheckHandler");
 const processHooks_1 = require("./hooks/startup/processHooks");
 const forwardHttpRequestOverHttp_1 = require("../common/relay/forwardHttpRequestOverHttp");
 const socketHelpers_1 = require("./utils/socketHelpers");
+const filtersAsync_1 = require("../common/filter/filtersAsync");
+const websocketConnectionMiddlewares_1 = require("./routesHandler/websocketConnectionMiddlewares");
 process.on('uncaughtException', (error) => {
     if (error.message == 'read ECONNRESET') {
         logger_1.log.error({ msg: error.message, stackTrace: error.stack }, 'ECONNRESETs Catch all:', error.message);
@@ -26,40 +28,56 @@ process.on('uncaughtException', (error) => {
     }
 });
 const main = async (clientOpts) => {
-    var _a, _b;
     try {
         logger_1.log.info({ version: version_1.default }, 'running in client mode');
         const brokerClientId = (0, uuid_1.v4)();
         logger_1.log.info({ brokerClientId }, 'generated broker client id');
         const hookResults = await (0, processHooks_1.processStartUpHooks)(clientOpts, brokerClientId);
-        const identifyingMetadata = {
+        const loadedClientOpts = {
+            loadedFilters: (0, filtersAsync_1.loadAllFilters)(clientOpts.filters, clientOpts.config),
+            ...clientOpts,
+        };
+        if (!loadedClientOpts.loadedFilters) {
+            logger_1.log.error({ clientOpts }, 'Unable to load filters');
+            throw new Error('Unable to load filters');
+        }
+        const globalIdentifyingMetadata = {
             capabilities: ['post-streams'],
             clientId: brokerClientId,
             filters: clientOpts.filters,
             preflightChecks: hookResults.preflightCheckResults,
             version: version_1.default,
         };
-        const io = (0, socket_1.createWebSocket)(clientOpts, identifyingMetadata);
+        let websocketConnections = [];
+        if (clientOpts.config.universalBrokerEnabled) {
+            websocketConnections = (0, socket_1.createWebSockets)(loadedClientOpts, globalIdentifyingMetadata);
+        }
+        else {
+            websocketConnections.push((0, socket_1.createWebSocket)(loadedClientOpts, globalIdentifyingMetadata));
+        }
         // start the local webserver to listen for relay requests
         const { app, server } = (0, webserver_1.webserver)(clientOpts.config, clientOpts.port);
-        const httpToWsForwarder = (0, forwardHttpRequest_1.forwardHttpRequest)((_a = clientOpts.filters) === null || _a === void 0 ? void 0 : _a.public);
-        const httpToAPIForwarder = (0, forwardHttpRequestOverHttp_1.forwardHttpRequestOverHttp)((_b = clientOpts.filters) === null || _b === void 0 ? void 0 : _b.public, clientOpts.config);
+        const httpToWsForwarder = (0, forwardHttpRequest_1.forwardHttpRequest)(loadedClientOpts);
+        const httpToAPIForwarder = (0, forwardHttpRequestOverHttp_1.forwardHttpRequestOverHttp)(loadedClientOpts, clientOpts.config);
         // IMPORTANT: defined before relay (`app.all('/*', ...`)
         app.get('/health/checks', (0, checks_handler_1.handleChecksRoute)(clientOpts.config));
         app.get('/health/checks/:checkId', (0, checks_handler_1.handleCheckIdsRoutes)(clientOpts.config));
         app.get(clientOpts.config.brokerHealthcheckPath || '/healthcheck', (req, res, next) => {
-            res.locals.io = io;
+            res.locals.websocketConnections = websocketConnections;
             next();
         }, healthcheckHandler_1.healthCheckHandler);
+        app.get('/filters', (req, res) => {
+            res.send(loadedClientOpts.filters);
+        });
         app.get(clientOpts.config.brokerSystemcheckPath || '/systemcheck', (req, res, next) => {
-            res.locals.clientOpts = clientOpts;
+            res.locals.clientOpts = loadedClientOpts;
             next();
         }, systemCheckHandler_1.systemCheckHandler);
         app.post('/webhook/*', (req, res, next) => {
-            res.locals.io = io;
+            res.locals.websocketConnections = websocketConnections;
             next();
-        }, (req, res) => {
-            if ((0, socketHelpers_1.isWebsocketConnOpen)(res.locals.io)) {
+        }, websocketConnectionMiddlewares_1.websocketConnectionSelectorMiddleware, (req, res) => {
+            if ((0, socketHelpers_1.isWebsocketConnOpen)(res.locals.websocket)) {
                 httpToWsForwarder(req, res);
             }
             else {
@@ -69,20 +87,26 @@ const main = async (clientOpts) => {
         });
         // relay all other URL paths
         app.all('/*', (req, res, next) => {
-            res.locals.io = io;
+            // Middleware checks the request url for /webhook/scmType/ID, and from the scmType pick the relevant filter.
+            // Need to check what CRA agent requests look like so we don't mess that up.
+            // New hooks we want to inject the BROKER_CLIENT_URL with the integration ID so we can select based on the integration ID
+            // but doing so can't break the existing webhooks
+            res.locals.websocketConnections = websocketConnections;
             next();
-        }, httpToWsForwarder);
+        }, websocketConnectionMiddlewares_1.websocketConnectionSelectorMiddleware, httpToWsForwarder);
         return {
-            io,
+            websocketConnections,
             close: (done) => {
                 logger_1.log.info('client websocket is closing');
                 server.close();
-                io.destroy(function () {
-                    logger_1.log.info('client websocket is closed');
-                    if (done) {
-                        return done();
-                    }
-                });
+                for (let i = 0; i < websocketConnections.length; i++) {
+                    websocketConnections[i].destroy(function () {
+                        logger_1.log.info(`client websocket ${websocketConnections[i].identifier || ''} is closed`);
+                        if (done) {
+                            return done();
+                        }
+                    });
+                }
             },
         };
     }

package/dist/lib/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/client/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/client/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/client/routesHandler/healthcheckHandler.js

@@ -5,22 +5,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.healthCheckHandler = void 0;
 const version_1 = __importDefault(require("../../common/utils/version"));
+const token_1 = require("../../common/utils/token");
 const socketHelpers_1 = require("../utils/socketHelpers");
 const healthCheckHandler = 
-// io is available in res.locals.io
+// io is available in res.locals.websocket
 (req, res) => {
+    var _a, _b;
+    const websocketConnsArray = res.locals
+        .websocketConnections;
+    const data = [];
+    const statuses = [];
+    for (let i = 0; i < websocketConnsArray.length; i++) {
+        const isConnOpen = (0, socketHelpers_1.isWebsocketConnOpen)(websocketConnsArray[i]);
+        statuses.push(isConnOpen ? 200 : 500);
+        const tunnelData = {
+            ok: isConnOpen,
+            websocketConnectionOpen: isConnOpen,
+            brokerServerUrl: websocketConnsArray[i].url.href,
+            version: version_1.default,
+            transport: websocketConnsArray[i].socket.transport.name,
+        };
+        if (websocketConnsArray[i].identifier) {
+            tunnelData['identifier'] = (0, token_1.maskToken)((_a = websocketConnsArray[i].identifier) !== null && _a !== void 0 ? _a : '');
+            tunnelData['friendlyName'] = (_b = websocketConnsArray[i].friendlyName) !== null && _b !== void 0 ? _b : '';
+        }
+        data.push(tunnelData);
+    }
     // healthcheck state depends on websocket connection status
     // value of primus.Spark.OPEN means the websocket connection is open
-    const isConnOpen = (0, socketHelpers_1.isWebsocketConnOpen)(res.locals.io);
-    const status = isConnOpen ? 200 : 500;
-    const data = {
-        ok: isConnOpen,
-        websocketConnectionOpen: isConnOpen,
-        brokerServerUrl: res.locals.io.url.href,
-        version: version_1.default,
-        transport: res.locals.io.socket.transport.name,
-    };
-    return res.status(status).json(data);
+    return res
+        .status(statuses.some((status) => status == 500) ? 500 : 200)
+        .json(data.length == 1 ? data[0] : data); // So we don't break current
 };
 exports.healthCheckHandler = healthCheckHandler;
 //# sourceMappingURL=healthcheckHandler.js.map

package/dist/lib/client/routesHandler/healthcheckHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"healthcheckHandler.js","sourceRoot":"","sources":["../../../../lib/client/routesHandler/healthcheckHandler.ts"],"names":[],"mappings":";;;;;;AACA,yEAAiD;AACjD,0DAA6D;AAEtD,MAAM,kBAAkB;AAC7B,mCAAmC;AACnC,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;IAC9B,2DAA2D;IAC3D,oEAAoE;IACpE,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACtC,MAAM,IAAI,GAAG;QACX,EAAE,EAAE,UAAU;QACd,uBAAuB,EAAE,UAAU;QACnC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI;QACvC,OAAO,EAAP,iBAAO;QACP,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI;KAC/C,CAAC;IAEF,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AAhBS,QAAA,kBAAkB,sBAgB3B"}
+{"version":3,"file":"healthcheckHandler.js","sourceRoot":"","sources":["../../../../lib/client/routesHandler/healthcheckHandler.ts"],"names":[],"mappings":";;;;;;AACA,yEAAiD;AAEjD,oDAAqD;AAUrD,0DAA6D;AAEtD,MAAM,kBAAkB;AAC7B,0CAA0C;AAC1C,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;;IAC9B,MAAM,mBAAmB,GAAG,GAAG,CAAC,MAAM;SACnC,oBAA6C,CAAC;IACjD,MAAM,IAAI,GAAsB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAkB,EAAE,CAAC;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG;YACjB,EAAE,EAAE,UAAU;YACd,uBAAuB,EAAE,UAAU;YACnC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;YAChD,OAAO,EAAP,iBAAO;YACP,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI;SACxD,CAAC;QACF,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE;YACrC,UAAU,CAAC,YAAY,CAAC,GAAG,IAAA,iBAAS,EAClC,MAAA,mBAAmB,CAAC,CAAC,CAAC,CAAC,UAAU,mCAAI,EAAE,CACxC,CAAC;YACF,UAAU,CAAC,cAAc,CAAC,GAAG,MAAA,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,mCAAI,EAAE,CAAC;SACxE;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACvB;IACD,2DAA2D;IAC3D,oEAAoE;IACpE,OAAO,GAAG;SACP,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;SAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B;AAC1E,CAAC,CAAC;AA9BS,QAAA,kBAAkB,sBA8B3B"}

package/dist/lib/client/routesHandler/systemCheckHandler.js

@@ -3,45 +3,71 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.systemCheckHandler = void 0;
 const credentials_1 = require("../utils/credentials");
 const logger_1 = require("../../logs/logger");
+const config_1 = require("../../common/config/config");
+const connectionValidation_1 = require("../utils/connectionValidation");
+const universal_1 = require("../../common/config/universal");
 const systemCheckHandler = async (req, res) => {
     // 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.
     const clientOpts = res.locals.clientOpts;
-    const brokerClientValidationMethod = clientOpts.config.brokerClientValidationMethod || 'GET';
-    const brokerClientValidationTimeoutMs = clientOpts.config.brokerClientValidationTimeoutMs || 5000;
-    // set auth header according to config
-    const { auths, rawCreds } = (0, credentials_1.loadCredentialsFromConfig)(clientOpts.config);
-    // make the internal validation request
-    const validationResults = [];
-    let errorOccurred = true;
-    if (auths.length > 0) {
-        for (let i = 0; i < auths.length; i++) {
-            logger_1.log.info(`Checking if credentials at index ${i} are valid`);
-            const auth = auths[i];
-            const rawCred = rawCreds[i];
-            const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(auth, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
-            data['maskedCredentials'] =
-                rawCred.length <= 6
-                    ? '***'
-                    : `${rawCred.substring(0, 3)}***${rawCred.substring(rawCred.length - 3)}`;
-            validationResults.push(data);
-            errorOccurred = err;
-            logger_1.log.info('Credentials checked');
+    if (clientOpts.config.universalBrokerEnabled) {
+        const configForAllConnections = (0, universal_1.getConfigForConnections)();
+        const validationResults = [];
+        let isValidationPassing = true;
+        for (const [connectionName, config] of configForAllConnections.entries()) {
+            config.validations = (0, config_1.expandConfigObjectRecursively)(config.validations, config);
+            logger_1.log.info({ connectionName }, '[System Check] Validating connection');
+            const { passing, data } = await (0, connectionValidation_1.validateConnection)(config);
+            const result = {
+                connectionName: connectionName,
+                validated: passing,
+                results: data,
+            };
+            if (!passing) {
+                result['message'] = `Validation failed, please review connection details for ${connectionName}`;
+                isValidationPassing = false;
+            }
+            validationResults.push(result);
         }
+        res.status(isValidationPassing ? 200 : 500).send(validationResults);
     }
     else {
-        logger_1.log.info('No credentials specified - checking if target can be accessed without credentials');
-        const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(null, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
-        data['maskedCredentials'] = null;
-        validationResults.push(data);
-        errorOccurred = err;
-    }
-    if (errorOccurred) {
-        return res.status(500).json(validationResults);
-    }
-    else {
-        return res.status(200).json(validationResults);
+        const brokerClientValidationMethod = clientOpts.config.brokerClientValidationMethod || 'GET';
+        const brokerClientValidationTimeoutMs = clientOpts.config.brokerClientValidationTimeoutMs || 5000;
+        // set auth header according to config
+        const { auths, rawCreds } = (0, credentials_1.loadCredentialsFromConfig)(clientOpts.config);
+        // make the internal validation request
+        const validationResults = [];
+        let errorOccurred = true;
+        if (auths.length > 0) {
+            for (let i = 0; i < auths.length; i++) {
+                logger_1.log.info(`Checking if credentials at index ${i} are valid`);
+                const auth = auths[i];
+                const rawCred = rawCreds[i];
+                const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(auth, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
+                data['maskedCredentials'] =
+                    rawCred.length <= 6
+                        ? '***'
+                        : `${rawCred.substring(0, 3)}***${rawCred.substring(rawCred.length - 3)}`;
+                validationResults.push(data);
+                errorOccurred = err;
+                logger_1.log.info('Credentials checked');
+            }
+        }
+        else {
+            logger_1.log.info('No credentials specified - checking if target can be accessed without credentials');
+            const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(null, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
+            data['maskedCredentials'] = null;
+            validationResults.push(data);
+            errorOccurred = err;
+        }
+        if (errorOccurred) {
+            return res.status(500).json(validationResults);
+        }
+        else {
+            return res.status(200).json(validationResults);
+        }
     }
 };
 exports.systemCheckHandler = systemCheckHandler;