snyk-broker 4.205.3 → 4.207.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.npm.md +1 -1
- package/dist/client-templates/bitbucket-server/accept.json.sample +22 -0
- package/dist/client-templates/bitbucket-server-bearer-auth/accept.json.sample +20 -0
- package/dist/client-templates/gitlab/accept.json.sample +12 -0
- package/dist/lib/broker-workload/index.js +3 -4
- package/dist/lib/broker-workload/index.js.map +1 -1
- package/dist/lib/broker-workload/requestFiltering.js +5 -6
- package/dist/lib/broker-workload/requestFiltering.js.map +1 -1
- package/dist/lib/client/brokerClientPlugins/pluginManager.js +3 -5
- package/dist/lib/client/brokerClientPlugins/pluginManager.js.map +1 -1
- package/dist/lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js +1 -2
- package/dist/lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js.map +1 -1
- package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js +1 -2
- package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js.map +1 -1
- package/dist/lib/client/checks/config/brokerClientUrlCheck.js +1 -12
- package/dist/lib/client/checks/config/brokerClientUrlCheck.js.map +1 -1
- package/dist/lib/client/checks/config/brokerServerUrlCheck.js +32 -0
- package/dist/lib/client/checks/config/brokerServerUrlCheck.js.map +1 -0
- package/dist/lib/client/config/remoteConfig.js +4 -5
- package/dist/lib/client/config/remoteConfig.js.map +1 -1
- package/dist/lib/client/connectionsManager/validator.js +1 -2
- package/dist/lib/client/connectionsManager/validator.js.map +1 -1
- package/dist/lib/client/dispatcher/client/api.js +2 -3
- package/dist/lib/client/dispatcher/client/api.js.map +1 -1
- package/dist/lib/client/hooks/startup/processHooks.js +2 -3
- package/dist/lib/client/hooks/startup/processHooks.js.map +1 -1
- package/dist/lib/client/index.js +6 -4
- package/dist/lib/client/index.js.map +1 -1
- package/dist/lib/client/routesHandler/healthcheckHandler.js +2 -3
- package/dist/lib/client/routesHandler/healthcheckHandler.js.map +1 -1
- package/dist/lib/client/routesHandler/websocketConnectionMiddlewares.js +1 -2
- package/dist/lib/client/routesHandler/websocketConnectionMiddlewares.js.map +1 -1
- package/dist/lib/client/scm/github/commit.js +1 -2
- package/dist/lib/client/scm/github/commit.js.map +1 -1
- package/dist/lib/client/socket.js +8 -10
- package/dist/lib/client/socket.js.map +1 -1
- package/dist/lib/client/socketHandlers/openHandler.js +2 -3
- package/dist/lib/client/socketHandlers/openHandler.js.map +1 -1
- package/dist/lib/client/utils/connectionValidation.js +4 -5
- package/dist/lib/client/utils/connectionValidation.js.map +1 -1
- package/dist/lib/common/config/config.js +1 -2
- package/dist/lib/common/config/config.js.map +1 -1
- package/dist/lib/common/config/pluginsConfig.js +1 -2
- package/dist/lib/common/config/pluginsConfig.js.map +1 -1
- package/dist/lib/common/config/universal.js +3 -4
- package/dist/lib/common/config/universal.js.map +1 -1
- package/dist/lib/common/filter/filter-rules-loading.js +18 -28
- package/dist/lib/common/filter/filter-rules-loading.js.map +1 -1
- package/dist/lib/common/filter/filtersAsync.js +5 -6
- package/dist/lib/common/filter/filtersAsync.js.map +1 -1
- package/dist/lib/common/filter/utils.js +1 -2
- package/dist/lib/common/filter/utils.js.map +1 -1
- package/dist/lib/common/http/webserver.js +1 -2
- package/dist/lib/common/http/webserver.js.map +1 -1
- package/dist/lib/common/relay/prepareRequest.js +1 -2
- package/dist/lib/common/relay/prepareRequest.js.map +1 -1
- package/dist/lib/common/utils/auth-header.js +1 -1
- package/dist/lib/common/utils/auth-header.js.map +1 -1
- package/dist/lib/common/utils/urlValidator.js +13 -1
- package/dist/lib/common/utils/urlValidator.js.map +1 -1
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js +2 -4
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js +4 -7
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/request.js +44 -10
- package/dist/lib/hybrid-sdk/http/request.js.map +1 -1
- package/dist/lib/hybrid-sdk/responseSenders.js +6 -9
- package/dist/lib/hybrid-sdk/responseSenders.js.map +1 -1
- package/dist/lib/server/broker-middleware.js +1 -1
- package/dist/lib/server/broker-middleware.js.map +1 -1
- package/dist/lib/server/infra/dispatcher.js +1 -2
- package/dist/lib/server/infra/dispatcher.js.map +1 -1
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js +1 -2
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js.map +1 -1
- package/dist/lib/server/routesHandlers/httpRequestHandler.js +1 -2
- package/dist/lib/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/lib/server/socketHandlers/closeHandler.js +6 -6
- package/dist/lib/server/socketHandlers/closeHandler.js.map +1 -1
- package/dist/lib/server/socketHandlers/identifyHandler.js +2 -3
- package/dist/lib/server/socketHandlers/identifyHandler.js.map +1 -1
- package/dist/lib/server/utils/socket.js +1 -2
- package/dist/lib/server/utils/socket.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/README.npm.md
CHANGED
|
@@ -293,7 +293,7 @@ Public filters are for requests that are received on your broker client and are
|
|
|
293
293
|
|
|
294
294
|
- The broker requires at least node@4.latest
|
|
295
295
|
- Broker clients are *uniquely* identified (i.e. the same ID can't be used twice)
|
|
296
|
-
- If your private service is using an unrecognized certificate, you will need to supply a Certificate Authority file and add the following environment value when
|
|
296
|
+
- If your private service is using an unrecognized certificate, you will need to supply a Certificate Authority file and add the following environment value when running the client: `CA_CERT=ca.cert.pem` - Client will load your CA certificate and use it for requests to your internal service
|
|
297
297
|
|
|
298
298
|
## License
|
|
299
299
|
|
|
@@ -887,6 +887,28 @@
|
|
|
887
887
|
"password": "${BITBUCKET_PASSWORD}"
|
|
888
888
|
}
|
|
889
889
|
},
|
|
890
|
+
{
|
|
891
|
+
"//": "allow webhooks to be fetched",
|
|
892
|
+
"method": "GET",
|
|
893
|
+
"path": "/rest/api/1.0/projects/:project/repos/:repo/webhooks/:webhookId",
|
|
894
|
+
"origin": "https://${BITBUCKET}",
|
|
895
|
+
"auth": {
|
|
896
|
+
"scheme": "basic",
|
|
897
|
+
"username": "${BITBUCKET_USERNAME}",
|
|
898
|
+
"password": "${BITBUCKET_PASSWORD}"
|
|
899
|
+
}
|
|
900
|
+
},
|
|
901
|
+
{
|
|
902
|
+
"//": "allow webhooks to be updated",
|
|
903
|
+
"method": "PUT",
|
|
904
|
+
"path": "/rest/api/1.0/projects/:project/repos/:repo/webhooks/:webhookId",
|
|
905
|
+
"origin": "https://${BITBUCKET}",
|
|
906
|
+
"auth": {
|
|
907
|
+
"scheme": "basic",
|
|
908
|
+
"username": "${BITBUCKET_USERNAME}",
|
|
909
|
+
"password": "${BITBUCKET_PASSWORD}"
|
|
910
|
+
}
|
|
911
|
+
},
|
|
890
912
|
{
|
|
891
913
|
"//": "used to create commit status messages",
|
|
892
914
|
"method": "POST",
|
|
@@ -807,6 +807,26 @@
|
|
|
807
807
|
"token": "${BITBUCKET_PAT}"
|
|
808
808
|
}
|
|
809
809
|
},
|
|
810
|
+
{
|
|
811
|
+
"//": "allow webhooks to be fetched",
|
|
812
|
+
"method": "GET",
|
|
813
|
+
"path": "/rest/api/1.0/projects/:project/repos/:repo/webhooks/:webhookId",
|
|
814
|
+
"origin": "https://${BITBUCKET}",
|
|
815
|
+
"auth": {
|
|
816
|
+
"scheme": "bearer",
|
|
817
|
+
"token": "${BITBUCKET_PAT}"
|
|
818
|
+
}
|
|
819
|
+
},
|
|
820
|
+
{
|
|
821
|
+
"//": "allow webhooks to be updated",
|
|
822
|
+
"method": "PUT",
|
|
823
|
+
"path": "/rest/api/1.0/projects/:project/repos/:repo/webhooks/:webhookId",
|
|
824
|
+
"origin": "https://${BITBUCKET}",
|
|
825
|
+
"auth": {
|
|
826
|
+
"scheme": "bearer",
|
|
827
|
+
"token": "${BITBUCKET_PAT}"
|
|
828
|
+
}
|
|
829
|
+
},
|
|
810
830
|
{
|
|
811
831
|
"//": "used to create commit status messages",
|
|
812
832
|
"method": "POST",
|
|
@@ -1498,6 +1498,18 @@
|
|
|
1498
1498
|
"path": "/api/v4/projects/:project/hooks/:id",
|
|
1499
1499
|
"origin": "https://${GITLAB}"
|
|
1500
1500
|
},
|
|
1501
|
+
{
|
|
1502
|
+
"//": "allow webhooks to be updated",
|
|
1503
|
+
"method": "PUT",
|
|
1504
|
+
"path": "/api/v4/projects/:project/hooks/:id",
|
|
1505
|
+
"origin": "https://${GITLAB}"
|
|
1506
|
+
},
|
|
1507
|
+
{
|
|
1508
|
+
"//": "allow webhooks to be fetched, used to facilitate patch upgrades",
|
|
1509
|
+
"method": "GET",
|
|
1510
|
+
"path": "/api/v4/projects/:project/hooks/:id",
|
|
1511
|
+
"origin": "https://${GITLAB}"
|
|
1512
|
+
},
|
|
1501
1513
|
{
|
|
1502
1514
|
"//": "used to create commit status messages",
|
|
1503
1515
|
"method": "POST",
|
|
@@ -20,20 +20,19 @@ class BrokerWorkload {
|
|
|
20
20
|
this.websocketConnectionHandler = websocketConnectionHandler;
|
|
21
21
|
}
|
|
22
22
|
async handler(payload, websocketResponseHandler) {
|
|
23
|
-
var _a, _b, _c, _d, _e, _f;
|
|
24
23
|
if (this.options.config.universalBrokerEnabled) {
|
|
25
24
|
payload.connectionIdentifier = this.connectionIdentifier;
|
|
26
25
|
}
|
|
27
26
|
const correlationHeaders = (0, correlation_headers_1.getCorrelationDataFromHeaders)(payload.headers);
|
|
28
27
|
const logContext = {
|
|
29
28
|
url: payload.url,
|
|
30
|
-
connectionName:
|
|
29
|
+
connectionName: this.websocketConnectionHandler.friendlyName ?? '',
|
|
31
30
|
requestMethod: payload.method,
|
|
32
31
|
requestHeaders: payload.headers,
|
|
33
32
|
streamingID: payload.streamingID,
|
|
34
33
|
maskedToken: (0, token_1.maskToken)(this.connectionIdentifier),
|
|
35
34
|
hashedToken: (0, token_1.hashToken)(this.connectionIdentifier),
|
|
36
|
-
transport:
|
|
35
|
+
transport: this.websocketConnectionHandler?.socket?.transport?.name ?? 'unknown',
|
|
37
36
|
responseMedium: payload.headers['x-broker-ws-response']
|
|
38
37
|
? 'websocket'
|
|
39
38
|
: 'http',
|
|
@@ -71,7 +70,7 @@ class BrokerWorkload {
|
|
|
71
70
|
}
|
|
72
71
|
else {
|
|
73
72
|
(0, metrics_1.incrementWebSocketRequestsTotal)(false, 'inbound-request');
|
|
74
|
-
const preparedRequest = await (0, prepareRequest_1.prepareRequestFromFilterResult)(filterResponse, payload, logContext, this.options, this.connectionIdentifier,
|
|
73
|
+
const preparedRequest = await (0, prepareRequest_1.prepareRequestFromFilterResult)(filterResponse, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
|
|
75
74
|
if (this.options.config.universalBrokerEnabled) {
|
|
76
75
|
preparedRequest.req = await (0, pluginManager_1.runPreRequestPlugins)(this.options, this.connectionIdentifier, preparedRequest.req);
|
|
77
76
|
payload.headers[headers_value_constants_1.contentLengthHeader] = (0, content_length_1.computeContentLength)(payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker-workload/index.ts"],"names":[],"mappings":";;;AAAA,+EAAmF;AACnF,mEAAgF;AAEhF,mEAAsE;AACtE,qFAA8E;AAC9E,qDAGiC;AACjC,iDAA6D;AAC7D,2CAA+C;AAC/C,mEAAsE;AACtE,6EAAoF;AACpF,yDAAmD;AACnD,wDAGoC;AACpC,qCAAuC;AAEvC,MAAa,cAAc;IAIzB,YACE,oBAA4B,EAC5B,OAAO,EACP,0BAA0B;QAE1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker-workload/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.filterClientRequest = exports.filterRequest = void 0;
|
|
4
4
|
const filters_1 = require("../client/config/filters");
|
|
5
5
|
const filterRequest = (payload, options, websocketConnectionHandler) => {
|
|
6
|
-
var _a;
|
|
7
6
|
let filterResponse;
|
|
8
7
|
if (options.config.brokerType == 'client' &&
|
|
9
8
|
options.config.universalBrokerEnabled) {
|
|
10
9
|
const loadedFilters = (0, filters_1.getFilterConfig)().loadedFilters;
|
|
11
10
|
filterResponse =
|
|
12
|
-
|
|
13
|
-
.get(websocketConnectionHandler.supportedIntegrationType)
|
|
11
|
+
loadedFilters
|
|
12
|
+
.get(websocketConnectionHandler.supportedIntegrationType)
|
|
13
|
+
?.private(payload) || false;
|
|
14
14
|
}
|
|
15
15
|
else if (options.config.brokerType == 'client') {
|
|
16
16
|
const loadedFilters = (0, filters_1.getFilterConfig)().loadedFilters;
|
|
@@ -24,15 +24,14 @@ const filterRequest = (payload, options, websocketConnectionHandler) => {
|
|
|
24
24
|
};
|
|
25
25
|
exports.filterRequest = filterRequest;
|
|
26
26
|
const filterClientRequest = (payload, options, websocketConnectionHandler) => {
|
|
27
|
-
var _a;
|
|
28
27
|
let filterResponse;
|
|
29
28
|
if (options.config.brokerType == 'client' &&
|
|
30
29
|
options.config.universalBrokerEnabled) {
|
|
31
30
|
const loadedFilters = (0, filters_1.getFilterConfig)().loadedFilters;
|
|
32
31
|
filterResponse =
|
|
33
|
-
|
|
32
|
+
loadedFilters
|
|
34
33
|
.get(websocketConnectionHandler.supportedIntegrationType) // The chosen type is determined by websocket connect middlwr
|
|
35
|
-
|
|
34
|
+
?.public(payload) || false;
|
|
36
35
|
}
|
|
37
36
|
else if (options.config.brokerType == 'client') {
|
|
38
37
|
const loadedFilters = (0, filters_1.getFilterConfig)().loadedFilters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestFiltering.js","sourceRoot":"","sources":["../../../lib/broker-workload/requestFiltering.ts"],"names":[],"mappings":";;;AAAA,sDAA2D;AAGpD,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,0BAA0B,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"requestFiltering.js","sourceRoot":"","sources":["../../../lib/broker-workload/requestFiltering.ts"],"names":[],"mappings":";;;AAAA,sDAA2D;AAGpD,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,0BAA0B,EAAE,EAAE;IAC5E,IAAI,cAAc,CAAC;IACnB,IACE,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ;QACrC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EACrC;QACA,MAAM,aAAa,GAAG,IAAA,yBAAe,GAAE,CAAC,aAGvC,CAAC;QACF,cAAc;YACZ,aAAa;iBACV,GAAG,CAAC,0BAA0B,CAAC,wBAAwB,CAAC;gBACzD,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;KACjC;SAAM,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,yBAAe,GAAE,CAAC,aAAgC,CAAC;QACzE,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACjD;SAAM;QACL,MAAM,aAAa,GAAG,OAAO,CAAC,aAAgC,CAAC;QAC/D,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACjD;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAtBW,QAAA,aAAa,iBAsBxB;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAAO,EACP,OAAO,EACP,0BAA0B,EAC1B,EAAE;IACF,IAAI,cAAc,CAAC;IACnB,IACE,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ;QACrC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EACrC;QACA,MAAM,aAAa,GAAG,IAAA,yBAAe,GAAE,CAAC,aAGvC,CAAC;QACF,cAAc;YACZ,aAAa;iBACV,GAAG,CAAC,0BAA0B,CAAC,wBAAwB,CAAC,CAAC,6DAA6D;gBACvH,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;KAChC;SAAM,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,yBAAe,GAAE,CAAC,aAAgC,CAAC;QACzE,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAChD;SAAM;QACL,MAAM,aAAa,GAAG,OAAO,CAAC,aAAgC,CAAC;QAC/D,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAChD;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AA1BW,QAAA,mBAAmB,uBA0B9B"}
|
|
@@ -72,11 +72,10 @@ const loadPlugins = async (pluginsFolderPath, clientOpts) => {
|
|
|
72
72
|
};
|
|
73
73
|
exports.loadPlugins = loadPlugins;
|
|
74
74
|
const runStartupPlugins = async (clientOpts, connectionKey) => {
|
|
75
|
-
var _a;
|
|
76
75
|
const loadedPlugins = clientOpts.config.plugins;
|
|
77
76
|
const pluginsConfig = (0, pluginsConfig_1.getPluginsConfig)();
|
|
78
77
|
if (loadedPlugins.has(`${clientOpts.config.connections[connectionKey].type}`)) {
|
|
79
|
-
const pluginInstances =
|
|
78
|
+
const pluginInstances = loadedPlugins.get(`${clientOpts.config.connections[connectionKey].type}`) ?? [];
|
|
80
79
|
for (let i = 0; i < pluginInstances.length; i++) {
|
|
81
80
|
pluginsConfig[connectionKey] = {};
|
|
82
81
|
await pluginInstances[i].startUp(clientOpts.config.connections[connectionKey], pluginsConfig[connectionKey]);
|
|
@@ -85,7 +84,6 @@ const runStartupPlugins = async (clientOpts, connectionKey) => {
|
|
|
85
84
|
};
|
|
86
85
|
exports.runStartupPlugins = runStartupPlugins;
|
|
87
86
|
const runPreRequestPlugins = async (clientOpts, connectionIdentifier, pristinePreRequest) => {
|
|
88
|
-
var _a, _b;
|
|
89
87
|
let preRequest = pristinePreRequest;
|
|
90
88
|
const loadedPlugins = clientOpts.config.plugins;
|
|
91
89
|
const pluginsConfig = (0, pluginsConfig_1.getPluginsConfig)();
|
|
@@ -104,9 +102,9 @@ const runPreRequestPlugins = async (clientOpts, connectionIdentifier, pristinePr
|
|
|
104
102
|
throw new Error(errMsg);
|
|
105
103
|
}
|
|
106
104
|
if (loadedPlugins.has(`${clientOpts.config.connections[connectionKey].type}`)) {
|
|
107
|
-
const pluginInstances =
|
|
105
|
+
const pluginInstances = loadedPlugins.get(`${clientOpts.config.connections[connectionKey].type}`) ?? [];
|
|
108
106
|
for (let i = 0; i < pluginInstances.length; i++) {
|
|
109
|
-
preRequest = await pluginInstances[i].preRequest(clientOpts.config.connections[connectionKey], preRequest,
|
|
107
|
+
preRequest = await pluginInstances[i].preRequest(clientOpts.config.connections[connectionKey], preRequest, pluginsConfig[connectionKey] ?? {});
|
|
110
108
|
}
|
|
111
109
|
}
|
|
112
110
|
return preRequest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginManager.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/pluginManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAsC;AACtC,8CAAkD;AAElD,2BAAgC;AAEhC,qEAAqE;AAE9D,MAAM,WAAW,GAAG,KAAK,EAAE,iBAAyB,EAAE,UAAU,EAAE,EAAE;;IACzE,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC1D,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACtD,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,IAAI;QACF,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;QAC9D,IAAI,IAAA,eAAU,EAAC,iBAAiB,CAAC,EAAE;YACjC,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,CAAC;YACtD,KAAK,MAAM,UAAU,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACxD,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CACzB,EAAE;gBACD,MAAM,MAAM,GAAG,YAAa,GAAG,iBAAiB,IAAI,UAAU,EAAE,0DAAC,CAAC;gBAClE,qFAAqF;gBACrF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,qBAAqB,GAAG,cAAc,CAAC,kBAAkB,EAAE,CAAC;gBAClE,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;oBACrD,IACE,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;wBAC7C,cAAc,CAAC,cAAc,EAAE,EAC/B;wBACA,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,kBAAkB,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;wBAChE,MAAM,0BAA0B,GAC9B,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;wBACtD,IACE,0BAA0B,CAAC,IAAI,CAC7B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,UAAU,KAAK,cAAc,CAAC,UAAU;4BAC1C,CAAC,CAAC,UAAU,KAAK,cAAc,CAAC,UAAU,CAC7C,EACD;4BACA,MAAM,MAAM,GAAG,2CAA2C,CAAC;4BAC3D,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;4BACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;yBACzB;wBACD,0BAA0B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;qBACjD;yBAAM;wBACL,YAAM,CAAC,KAAK,CACV,EAAE,EACF,mBAAmB,cAAc,CAAC,UAAU,eAAe,CAC5D,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;KACrC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,MAAM,GAAG,8BAA8B,iBAAiB,EAAE,CAAC;QACjE,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,8BAA8B,iBAAiB,EAAE,CAAC,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KACzB;AACH,CAAC,CAAC;AAnDW,QAAA,WAAW,eAmDtB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"pluginManager.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/pluginManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAsC;AACtC,8CAAkD;AAElD,2BAAgC;AAEhC,qEAAqE;AAE9D,MAAM,WAAW,GAAG,KAAK,EAAE,iBAAyB,EAAE,UAAU,EAAE,EAAE;;IACzE,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC1D,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACtD,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,IAAI;QACF,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;QAC9D,IAAI,IAAA,eAAU,EAAC,iBAAiB,CAAC,EAAE;YACjC,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,CAAC;YACtD,KAAK,MAAM,UAAU,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACxD,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CACzB,EAAE;gBACD,MAAM,MAAM,GAAG,YAAa,GAAG,iBAAiB,IAAI,UAAU,EAAE,0DAAC,CAAC;gBAClE,qFAAqF;gBACrF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,qBAAqB,GAAG,cAAc,CAAC,kBAAkB,EAAE,CAAC;gBAClE,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;oBACrD,IACE,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;wBAC7C,cAAc,CAAC,cAAc,EAAE,EAC/B;wBACA,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,kBAAkB,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;wBAChE,MAAM,0BAA0B,GAC9B,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;wBACtD,IACE,0BAA0B,CAAC,IAAI,CAC7B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,UAAU,KAAK,cAAc,CAAC,UAAU;4BAC1C,CAAC,CAAC,UAAU,KAAK,cAAc,CAAC,UAAU,CAC7C,EACD;4BACA,MAAM,MAAM,GAAG,2CAA2C,CAAC;4BAC3D,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;4BACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;yBACzB;wBACD,0BAA0B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;qBACjD;yBAAM;wBACL,YAAM,CAAC,KAAK,CACV,EAAE,EACF,mBAAmB,cAAc,CAAC,UAAU,eAAe,CAC5D,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;KACrC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,MAAM,GAAG,8BAA8B,iBAAiB,EAAE,CAAC;QACjE,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,8BAA8B,iBAAiB,EAAE,CAAC,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KACzB;AACH,CAAC,CAAC;AAnDW,QAAA,WAAW,eAmDtB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE;IACnE,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,OAGvC,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IACzC,IACE,aAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,EACzE;QACA,MAAM,eAAe,GACnB,aAAa,CAAC,GAAG,CACf,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CACvD,IAAI,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,aAAa,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;YAClC,MAAM,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAC9B,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAC5C,aAAa,CAAC,aAAa,CAAC,CAC7B,CAAC;SACH;KACF;AACH,CAAC,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACvC,UAAU,EACV,oBAAoB,EACpB,kBAA6C,EAC7C,EAAE;IACF,IAAI,UAAU,GAAG,kBAAkB,CAAC;IACpC,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,OAGvC,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IACzC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,aAAa,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/C,IACE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;YAC5D,oBAAoB,EACpB;YACA,aAAa,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM;SACP;KACF;IACD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QAC5C,MAAM,MAAM,GAAG,iCAAiC,aAAa,YAAY,CAAC;QAC1E,YAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KACzB;IAED,IACE,aAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,EACzE;QACA,MAAM,eAAe,GACnB,aAAa,CAAC,GAAG,CACf,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CACvD,IAAI,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,UAAU,GAAG,MAAM,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAC9C,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAC5C,UAAU,EACV,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,CACnC,CAAC;SACH;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA7CW,QAAA,oBAAoB,wBA6C/B"}
|
package/dist/lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js
CHANGED
|
@@ -31,10 +31,9 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
31
31
|
return true;
|
|
32
32
|
}
|
|
33
33
|
async startUp(connectionConfiguration) {
|
|
34
|
-
var _a;
|
|
35
34
|
if (!connectionConfiguration.type ||
|
|
36
35
|
!this.applicableBrokerTypes.includes(connectionConfiguration.type)) {
|
|
37
|
-
throw new Error(`Plugin ${this.pluginCode} startup failure: unknown container registry type: ${
|
|
36
|
+
throw new Error(`Plugin ${this.pluginCode} startup failure: unknown container registry type: ${connectionConfiguration.type ?? '<not provided>'}.`);
|
|
38
37
|
}
|
|
39
38
|
let credentials;
|
|
40
39
|
switch (connectionConfiguration.type) {
|
package/dist/lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRegistryCredentialsFormatting.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.ts"],"names":[],"mappings":";;;;;;AAAA,mFAAmD;AAEnD,MAAa,MAAO,SAAQ,8BAAY;IAAxC;;QACE,eAAU,GAAG,8CAA8C,CAAC;QAC5D,eAAU,GAAG,kDAAkD,CAAC;QAChE,gBAAW,GACT,uFAAuF,CAAC;QAC1F,YAAO,GAAG,KAAK,CAAC;QAChB,0BAAqB,GAAG;YACtB,YAAY;YACZ,KAAK;YACL,KAAK;YACL,KAAK;YACL,gBAAgB;YAChB,WAAW;YACX,SAAS;YACT,WAAW;YACX,UAAU;YACV,iBAAiB;YACjB,WAAW;YACX,oBAAoB;SACrB,CAAC;IA2DJ,CAAC;IA1DC,cAAc;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,uBAA4C
|
|
1
|
+
{"version":3,"file":"containerRegistryCredentialsFormatting.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.ts"],"names":[],"mappings":";;;;;;AAAA,mFAAmD;AAEnD,MAAa,MAAO,SAAQ,8BAAY;IAAxC;;QACE,eAAU,GAAG,8CAA8C,CAAC;QAC5D,eAAU,GAAG,kDAAkD,CAAC;QAChE,gBAAW,GACT,uFAAuF,CAAC;QAC1F,YAAO,GAAG,KAAK,CAAC;QAChB,0BAAqB,GAAG;YACtB,YAAY;YACZ,KAAK;YACL,KAAK;YACL,KAAK;YACL,gBAAgB;YAChB,WAAW;YACX,SAAS;YACT,WAAW;YACX,UAAU;YACV,iBAAiB;YACjB,WAAW;YACX,oBAAoB;SACrB,CAAC;IA2DJ,CAAC;IA1DC,cAAc;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,uBAA4C;QACxD,IACE,CAAC,uBAAuB,CAAC,IAAI;YAC7B,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAClE;YACA,MAAM,IAAI,KAAK,CACb,UACE,IAAI,CAAC,UACP,sDACE,uBAAuB,CAAC,IAAI,IAAI,gBAClC,GAAG,CACJ,CAAC;SACH;QACD,IAAI,WAAW,CAAC;QAChB,QAAQ,uBAAuB,CAAC,IAAI,EAAE;YACpC,KAAK,KAAK;gBACR,IACE,CAAC,uBAAuB,CAAC,WAAW;oBACpC,CAAC,uBAAuB,CAAC,SAAS;oBAClC,CAAC,uBAAuB,CAAC,cAAc,EACvC;oBACA,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,uBAAuB,CAAC,IAAI,gFAAgF,CAC3J,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,uBAAuB,CAAC,IAAI,gBAAgB,uBAAuB,CAAC,WAAW,wBAAwB,uBAAuB,CAAC,SAAS,mBAAmB,uBAAuB,CAAC,cAAc,OAAO,CAAC;gBACnO,MAAM;YACR,KAAK,iBAAiB;gBACpB,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE;oBACrC,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,uBAAuB,CAAC,IAAI,+CAA+C,CAC1H,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,uBAAuB,CAAC,IAAI,kBAAkB,uBAAuB,CAAC,QAAQ,kBAAkB,uBAAuB,CAAC,QAAQ,sBAAsB,uBAAuB,CAAC,OAAO,MAAM,CAAC;gBACtN,MAAM;YACR;gBACE,IACE,CAAC,uBAAuB,CAAC,WAAW;oBACpC,CAAC,uBAAuB,CAAC,WAAW,EACpC;oBACA,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,uBAAuB,CAAC,IAAI,8DAA8D,CACzI,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,uBAAuB,CAAC,IAAI,kBAAkB,uBAAuB,CAAC,WAAW,kBAAkB,uBAAuB,CAAC,WAAW,sBAAsB,uBAAuB,CAAC,OAAO,MAAM,CAAC;SAC/N;QACD,uBAAuB,CAAC,cAAc;YACpC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9C,uBAAuB,CAAC,aAAa,GAAG,IAAI,CAAC;QAE7C,IAAI,uBAAuB,CAAC,4BAA4B,EAAE;YACxD,uBAAuB,CAAC,4BAA4B;gBAClD,uBAAuB,CAAC,cAAc,CAAC;SAC1C;IACH,CAAC;CACF;AA9ED,wBA8EC"}
|
|
@@ -134,7 +134,6 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
async _getAccessToken(endpointHostname, githubAppInstallationId, jwtToken) {
|
|
137
|
-
var _a;
|
|
138
137
|
try {
|
|
139
138
|
const request = {
|
|
140
139
|
url: `https://${endpointHostname}/app/installations/${githubAppInstallationId}/access_tokens`,
|
|
@@ -150,7 +149,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
150
149
|
if (oauthResponse.statusCode && oauthResponse.statusCode > 299) {
|
|
151
150
|
throw new Error(`Unexpected error code ${oauthResponse.statusCode}: ${oauthResponse.body}`);
|
|
152
151
|
}
|
|
153
|
-
const accessToken =
|
|
152
|
+
const accessToken = oauthResponse.body ?? '';
|
|
154
153
|
return accessToken;
|
|
155
154
|
}
|
|
156
155
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ async function validateBrokerClientUrl(checkOptions, config) {
|
|
|
13
13
|
logger_1.log.debug({ checkId: checkOptions.id }, 'executing config check');
|
|
14
14
|
const brokerClientUrl = config.BROKER_CLIENT_URL;
|
|
15
15
|
try {
|
|
16
|
-
if (brokerClientUrl && !isHttpUrl(brokerClientUrl)) {
|
|
16
|
+
if (brokerClientUrl && !(0, urlValidator_1.isHttpUrl)(brokerClientUrl)) {
|
|
17
17
|
return {
|
|
18
18
|
id: checkOptions.id,
|
|
19
19
|
name: checkOptions.name,
|
|
@@ -52,17 +52,6 @@ async function validateBrokerClientUrl(checkOptions, config) {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
exports.validateBrokerClientUrl = validateBrokerClientUrl;
|
|
55
|
-
function isHttpUrl(brokerClientUrl) {
|
|
56
|
-
logger_1.log.trace({ url: brokerClientUrl }, 'checking if URL is correctly configured');
|
|
57
|
-
try {
|
|
58
|
-
return ((0, urlValidator_1.urlContainsProtocol)(brokerClientUrl, 'http:') ||
|
|
59
|
-
(0, urlValidator_1.urlContainsProtocol)(brokerClientUrl, 'https:'));
|
|
60
|
-
}
|
|
61
|
-
catch (error) {
|
|
62
|
-
logger_1.log.error({ error }, 'Error checking URL HTTP protocol');
|
|
63
|
-
return false;
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
55
|
function isHttpsWithoutCertificates(config) {
|
|
67
56
|
const brokerClientUrl = config.BROKER_CLIENT_URL;
|
|
68
57
|
logger_1.log.trace({ url: brokerClientUrl }, 'checking if HTTPS is correctly configured');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brokerClientUrlCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/brokerClientUrlCheck.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqD;AAGrD,
|
|
1
|
+
{"version":3,"file":"brokerClientUrlCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/brokerClientUrlCheck.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateBrokerServerUrl = void 0;
|
|
4
|
+
const logger_1 = require("../../../logs/logger");
|
|
5
|
+
const urlValidator_1 = require("../../../common/utils/urlValidator");
|
|
6
|
+
async function validateBrokerServerUrl(checkOptions, config) {
|
|
7
|
+
logger_1.log.debug({ checkId: checkOptions.id }, 'executing config check');
|
|
8
|
+
const brokerServerUrl = config.BROKER_SERVER_URL;
|
|
9
|
+
try {
|
|
10
|
+
if (brokerServerUrl && !(0, urlValidator_1.isHttpUrl)(brokerServerUrl)) {
|
|
11
|
+
return {
|
|
12
|
+
id: checkOptions.id,
|
|
13
|
+
name: checkOptions.name,
|
|
14
|
+
status: 'error',
|
|
15
|
+
output: `Broker Server URL must use the HTTP or HTTPS protocols. Configured URL: ${brokerServerUrl}`,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
return {
|
|
19
|
+
id: checkOptions.id,
|
|
20
|
+
name: checkOptions.name,
|
|
21
|
+
status: 'passing',
|
|
22
|
+
output: 'config check: ok',
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
const errorMessage = `Error executing check with checkId ${checkOptions.id}`;
|
|
27
|
+
logger_1.log.debug({ error }, errorMessage);
|
|
28
|
+
throw new Error(errorMessage);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.validateBrokerServerUrl = validateBrokerServerUrl;
|
|
32
|
+
//# sourceMappingURL=brokerServerUrlCheck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"brokerServerUrlCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/brokerServerUrlCheck.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AAGrD,qEAA+D;AAExD,KAAK,UAAU,uBAAuB,CAC3C,YAA0B,EAC1B,MAAc;IAEd,YAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,wBAAwB,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACjD,IAAI;QACF,IAAI,eAAe,IAAI,CAAC,IAAA,wBAAS,EAAC,eAAe,CAAC,EAAE;YAClD,OAAO;gBACL,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,2EAA2E,eAAe,EAAE;aAC/E,CAAC;SACzB;QACD,OAAO;YACL,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,kBAAkB;SACL,CAAC;KACzB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,sCAAsC,YAAY,CAAC,EAAE,EAAE,CAAC;QAC7E,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;AACH,CAAC;AA1BD,0DA0BC"}
|
|
@@ -9,14 +9,13 @@ const request_1 = require("../../hybrid-sdk/http/request");
|
|
|
9
9
|
const configurations_1 = require("../utils/configurations");
|
|
10
10
|
const version_1 = __importDefault(require("../../common/utils/version"));
|
|
11
11
|
const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) => {
|
|
12
|
-
var _a, _b, _c, _d;
|
|
13
12
|
const deploymentId = clientOpts.config.deploymentId;
|
|
14
13
|
const apiVersion = clientOpts.config.apiVersion;
|
|
15
14
|
const request = {
|
|
16
15
|
url: `${clientOpts.config.API_BASE_URL}/hidden/brokers/deployments/${deploymentId}/connections?version=${apiVersion}`,
|
|
17
16
|
headers: {
|
|
18
17
|
'Content-Type': 'application/vnd.api+json',
|
|
19
|
-
Authorization: `${
|
|
18
|
+
Authorization: `${clientOpts.accessToken?.authHeader}`,
|
|
20
19
|
'x-broker-client-id': `${clientOpts.config.brokerClientId}`,
|
|
21
20
|
'x-broker-client-version': `${version_1.default}`,
|
|
22
21
|
},
|
|
@@ -38,8 +37,8 @@ const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) =
|
|
|
38
37
|
for (let i = 0; i < connections.length; i++) {
|
|
39
38
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`] =
|
|
40
39
|
{
|
|
41
|
-
...(0, configurations_1.capitalizeKeys)(
|
|
42
|
-
...(0, configurations_1.capitalizeKeys)(
|
|
40
|
+
...(0, configurations_1.capitalizeKeys)(connections[i].attributes.configuration.default ?? {}),
|
|
41
|
+
...(0, configurations_1.capitalizeKeys)(connections[i].attributes.configuration.required ?? {}),
|
|
43
42
|
};
|
|
44
43
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].type = connections[i].attributes.configuration.type;
|
|
45
44
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].identifier = connections[i].attributes.identifier;
|
|
@@ -47,7 +46,7 @@ const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) =
|
|
|
47
46
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].friendlyName = connections[i].attributes.name;
|
|
48
47
|
}
|
|
49
48
|
const universalConfigFileBuffer = (0, fs_1.readFileSync)(universalFilePath);
|
|
50
|
-
const universalConfigFile = JSON.parse(
|
|
49
|
+
const universalConfigFile = JSON.parse(universalConfigFileBuffer.toString() ?? { CONNECTIONS: {} });
|
|
51
50
|
universalConfigFile['CONNECTIONS'] = connectionsObjectForFile.CONNECTIONS;
|
|
52
51
|
(0, fs_1.writeFileSync)(universalFilePath, JSON.stringify(universalConfigFile));
|
|
53
52
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remoteConfig.js","sourceRoot":"","sources":["../../../../lib/client/config/remoteConfig.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAiD;AACjD,2DAAwE;AAIxE,4DAAyD;AACzD,yEAAiD;AAE1C,MAAM,gCAAgC,GAAG,KAAK,EACnD,UAAsB,EACtB,iBAAyB,EACzB,EAAE
|
|
1
|
+
{"version":3,"file":"remoteConfig.js","sourceRoot":"","sources":["../../../../lib/client/config/remoteConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,8 @@ exports.validateUniversalConnectionsRemoteConfig = void 0;
|
|
|
4
4
|
const node_fs_1 = require("node:fs");
|
|
5
5
|
const logger_1 = require("../../logs/logger");
|
|
6
6
|
const validateUniversalConnectionsRemoteConfig = (universalCfgFilePath) => {
|
|
7
|
-
var _a;
|
|
8
7
|
const universalConfigFileBuffer = (0, node_fs_1.readFileSync)(universalCfgFilePath);
|
|
9
|
-
const universalConfigFile = JSON.parse(
|
|
8
|
+
const universalConfigFile = JSON.parse(universalConfigFileBuffer.toString() ?? { CONNECTIONS: {} });
|
|
10
9
|
const connections = universalConfigFile['CONNECTIONS'];
|
|
11
10
|
const connectionsKeys = Object.keys(connections);
|
|
12
11
|
for (let i = 0; i < connectionsKeys.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../lib/client/connectionsManager/validator.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AACtD,8CAAkD;AAC3C,MAAM,wCAAwC,GAAG,CACtD,oBAA4B,EAC5B,EAAE
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../lib/client/connectionsManager/validator.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AACtD,8CAAkD;AAC3C,MAAM,wCAAwC,GAAG,CACtD,oBAA4B,EAC5B,EAAE;IACF,MAAM,yBAAyB,GAAG,IAAA,sBAAY,EAAC,oBAAoB,CAAC,CAAC;IACrE,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CACpC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAC5D,CAAC;IAEF,MAAM,WAAW,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,WAAW,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CACpB,CAAC;QACnB,MAAM,iBAAiB,GACrB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC;iBACpC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;iBACjB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACpB,IACE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,kBAAkB,EAC7C;gBACA,MAAM;aACP;YACD,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,kBAAkB,CAAC;YAC7C,WAAW,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;YACvD,YAAM,CAAC,KAAK,CACV,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,EAClC,oDAAoD,UAAU,6EAA6E,CAC5I,CAAC;SACH;KACF;IAED,mBAAmB,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC;IACjD,IAAA,uBAAa,EAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAC3E,CAAC,CAAC;AArCW,QAAA,wCAAwC,4CAqCnD"}
|
|
@@ -10,14 +10,13 @@ class HttpDispatcherServiceClient {
|
|
|
10
10
|
this.baseUrl = baseUrl;
|
|
11
11
|
}
|
|
12
12
|
async createConnection(params, data) {
|
|
13
|
-
var _a;
|
|
14
13
|
try {
|
|
15
14
|
const path = `/hidden/broker/${params.hashedBrokerToken}/connections/${params.brokerClientId}`;
|
|
16
15
|
const url = new URL(path, this.baseUrl);
|
|
17
16
|
url.searchParams.append('version', this.version);
|
|
18
17
|
const headers = { 'Content-type': 'application/vnd.api+json' };
|
|
19
18
|
if ((0, configHelpers_1.getClientOpts)().accessToken) {
|
|
20
|
-
headers['Authorization'] = (
|
|
19
|
+
headers['Authorization'] = (0, configHelpers_1.getClientOpts)().accessToken?.authHeader;
|
|
21
20
|
}
|
|
22
21
|
const req = {
|
|
23
22
|
url: url.toString(),
|
|
@@ -34,7 +33,7 @@ class HttpDispatcherServiceClient {
|
|
|
34
33
|
};
|
|
35
34
|
const response = await (0, request_1.makeRequestToDownstream)(req);
|
|
36
35
|
const apiResponse = JSON.parse(response.body).data;
|
|
37
|
-
if (!
|
|
36
|
+
if (!apiResponse?.attributes) {
|
|
38
37
|
logger_1.log.trace({ apiResponse }, 'Unexpected Connection Allocation Server response');
|
|
39
38
|
throw new Error('Unexpected connection allocation server response');
|
|
40
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../lib/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,8DAA2E;AAE3E,iDAAqD;AAOrD,8DAA2D;AAE3D,MAAa,2BAA2B;IAItC,YAAY,OAAe;QAHV,YAAO,GAAG,yBAAyB,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAqC,EACrC,IAAiC
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../lib/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,8DAA2E;AAE3E,iDAAqD;AAOrD,8DAA2D;AAE3D,MAAa,2BAA2B;IAItC,YAAY,OAAe;QAHV,YAAO,GAAG,yBAAyB,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAqC,EACrC,IAAiC;QAEjC,IAAI;YACF,MAAM,IAAI,GAAG,kBAAkB,MAAM,CAAC,iBAAiB,gBAAgB,MAAM,CAAC,cAAc,EAAE,CAAC;YAC/F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACxC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,EAAE,cAAc,EAAE,0BAA0B,EAAE,CAAC;YAC/D,IAAI,IAAA,6BAAa,GAAE,CAAC,WAAW,EAAE;gBAC/B,OAAO,CAAC,eAAe,CAAC,GAAG,IAAA,6BAAa,GAAE,CAAC,WAAW,EAAE,UAAU,CAAC;aACpE;YACD,MAAM,GAAG,GAA8B;gBACrC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,IAAI,EAAE;wBACJ,UAAU,EAAE;4BACV,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;4BAC7C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;yBACtD;qBACF;iBACF,CAAC;aACH,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAuB,EAAC,GAAG,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;YACnD,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE;gBAC5B,YAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,kDAAkD,CACnD,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YACD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChE,YAAM,CAAC,KAAK,CACV,EAAE,aAAa,EAAE,WAAW,EAAE,EAC9B,+BAA+B,CAChC,CAAC;YAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;YAClD,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,GAAG,EAAE;YACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,sCAAsC,CAAC,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;IACH,CAAC;CACF;AAvDD,kEAuDC"}
|
|
@@ -35,7 +35,6 @@ const validateMinimalConfig = async (clientOpts) => {
|
|
|
35
35
|
};
|
|
36
36
|
exports.validateMinimalConfig = validateMinimalConfig;
|
|
37
37
|
const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
38
|
-
var _a, _b;
|
|
39
38
|
try {
|
|
40
39
|
// if (!clientOpts.config.BROKER_CLIENT_URL) {
|
|
41
40
|
// const proto =
|
|
@@ -73,8 +72,8 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
|
73
72
|
}
|
|
74
73
|
const commitSigningRules = (0, scm_1.commitSigningFilterRules)();
|
|
75
74
|
if (clientOpts['universalBrokerEnabled']) {
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
clientOpts.filters['github'].private?.push(...commitSigningRules);
|
|
76
|
+
clientOpts.filters['github-enterprise'].github.private?.push(...commitSigningRules);
|
|
78
77
|
}
|
|
79
78
|
else {
|
|
80
79
|
if (clientOpts.filters instanceof Map) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processHooks.js","sourceRoot":"","sources":["../../../../../lib/client/hooks/startup/processHooks.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAC/C,iDAAqD;AACrD,yCAA8E;AAC9E,mCAA2E;AAI3E,8DAAyE;AAElE,MAAM,qBAAqB,GAAG,KAAK,EACxC,UAAsB,EACP,EAAE;IACjB,IACE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW;QAC9B,CAAC,UAAU,CAAC,MAAM,CAAC,sBAAsB,EACzC;QACA,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC;QAClD,+BAA+B;QAC/B,YAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,+FAA+F,CAChG,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC;QACvC,MAAM,KAAK,CAAC;KACb;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE;QACtC,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC;QAC1D,+BAA+B;QAC/B,YAAM,CAAC,KAAK,CACV,EAAE,eAAe,EAAE,EACnB,2FAA2F,CAC5F,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,+DAA+D,CAChE,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,GAAG,2BAA2B,CAAC;QAC5C,MAAM,KAAK,CAAC;KACb;IACD,IACE,UAAU,CAAC,MAAM,CAAC,sBAAsB;QACxC,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB;QACrC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,EAChE;QACA,YAAM,CAAC,KAAK,CACV,EAAE,EACF,0FAA0F,CAC3F,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,kEAAkE,CACnE,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,GAAG,qBAAqB,CAAC;QACtC,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC;AAEK,MAAM,mBAAmB,GAAG,KAAK,EACtC,UAAsB,EACtB,cAAsB,EACA,EAAE
|
|
1
|
+
{"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
CHANGED
|
@@ -33,7 +33,6 @@ process.on('uncaughtException', (error) => {
|
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
35
|
const main = async (clientOpts) => {
|
|
36
|
-
var _a, _b, _c, _d, _e;
|
|
37
36
|
try {
|
|
38
37
|
logger_1.log.info({ version: version_1.default }, 'Broker starting in client mode');
|
|
39
38
|
let hookResults = {};
|
|
@@ -42,10 +41,13 @@ const main = async (clientOpts) => {
|
|
|
42
41
|
clientOpts.config.LOG_ENABLE_BODY = 'false';
|
|
43
42
|
logger_1.log.info({ brokerClientId: clientOpts.config.brokerClientId }, 'generated broker client id');
|
|
44
43
|
clientOpts.config.API_BASE_URL =
|
|
45
|
-
|
|
44
|
+
clientOpts.config.API_BASE_URL ??
|
|
45
|
+
clientOpts.config.BROKER_DISPATCHER_BASE_URL ??
|
|
46
|
+
clientOpts.config.BROKER_SERVER_URL?.replace('//broker.', '//api.').replace('//broker2.', '//api.') ??
|
|
47
|
+
'https://api.snyk.io';
|
|
46
48
|
await (0, processHooks_1.validateMinimalConfig)(clientOpts);
|
|
47
49
|
if (clientOpts.config.universalBrokerEnabled) {
|
|
48
|
-
const pluginsFolderPath = await (0, config_1.findPluginFolder)(__dirname
|
|
50
|
+
const pluginsFolderPath = await (0, config_1.findPluginFolder)(__dirname ?? process.cwd(), 'brokerClientPlugins');
|
|
49
51
|
if (!pluginsFolderPath) {
|
|
50
52
|
throw new Error('Unable to load plugins - plugins folder not found.');
|
|
51
53
|
}
|
|
@@ -64,7 +66,7 @@ const main = async (clientOpts) => {
|
|
|
64
66
|
const globalIdentifyingMetadata = {
|
|
65
67
|
capabilities: ['post-streams'],
|
|
66
68
|
clientId: clientOpts.config.brokerClientId,
|
|
67
|
-
filters:
|
|
69
|
+
filters: clientOpts.filters ?? new Map(),
|
|
68
70
|
preflightChecks: hookResults.preflightCheckResults,
|
|
69
71
|
version: version_1.default,
|
|
70
72
|
clientConfig: (0, configHelpers_1.getClientConfigMetadata)(clientOpts.config),
|