snyk-broker 4.206.0 → 4.208.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/lib/broker-workload/index.js +5 -7
- package/dist/lib/broker-workload/index.js.map +1 -1
- package/dist/lib/{common/relay → broker-workload}/prepareRequest.js +9 -12
- package/dist/lib/broker-workload/prepareRequest.js.map +1 -0
- package/dist/lib/broker-workload/requestFiltering.js +5 -6
- package/dist/lib/broker-workload/requestFiltering.js.map +1 -1
- package/dist/lib/client/auth/brokerServerConnection.js +30 -0
- package/dist/lib/client/auth/brokerServerConnection.js.map +1 -0
- package/dist/lib/client/auth/oauth.js +49 -7
- package/dist/lib/client/auth/oauth.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 -3
- package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js.map +1 -1
- package/dist/lib/client/checks/config/brokerClientUrlCheck.js +0 -5
- package/dist/lib/client/checks/config/brokerClientUrlCheck.js.map +1 -1
- package/dist/lib/client/checks/http/http-executor.js +0 -5
- package/dist/lib/client/checks/http/http-executor.js.map +1 -1
- package/dist/lib/client/config/remoteConfig.js +5 -5
- package/dist/lib/client/config/remoteConfig.js.map +1 -1
- package/dist/lib/client/connectionsManager/manager.js +1 -1
- package/dist/lib/client/connectionsManager/manager.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 +7 -7
- package/dist/lib/client/dispatcher/client/api.js.map +1 -1
- package/dist/lib/client/dispatcher/dispatcher-service.js +2 -2
- package/dist/lib/client/dispatcher/dispatcher-service.js.map +1 -1
- package/dist/lib/client/dispatcher/index.js +1 -1
- package/dist/lib/client/dispatcher/index.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 +11 -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 +68 -30
- 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 -10
- package/dist/lib/client/utils/connectionValidation.js.map +1 -1
- package/dist/lib/client/utils/credentials.js +1 -18
- package/dist/lib/client/utils/credentials.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 +2 -4
- 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/utils/auth-header.js +1 -1
- package/dist/lib/common/utils/auth-header.js.map +1 -1
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js +3 -4
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js +15 -18
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/request.js +48 -10
- package/dist/lib/hybrid-sdk/http/request.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/server-post-stream-handler.js +8 -3
- package/dist/lib/hybrid-sdk/http/server-post-stream-handler.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/utils.js +12 -1
- package/dist/lib/hybrid-sdk/http/utils.js.map +1 -1
- package/dist/lib/hybrid-sdk/responseSenders.js +13 -17
- package/dist/lib/hybrid-sdk/responseSenders.js.map +1 -1
- package/dist/lib/server/auth/authHelpers.js +43 -0
- package/dist/lib/server/auth/authHelpers.js.map +1 -0
- package/dist/lib/server/auth/connectionWatchdog.js +30 -0
- package/dist/lib/server/auth/connectionWatchdog.js.map +1 -0
- package/dist/lib/server/broker-middleware.js +1 -1
- package/dist/lib/server/broker-middleware.js.map +1 -1
- package/dist/lib/server/index.js +11 -1
- package/dist/lib/server/index.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/authHandlers.js +54 -0
- package/dist/lib/server/routesHandlers/authHandlers.js.map +1 -0
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js +3 -3
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js.map +1 -1
- package/dist/lib/server/routesHandlers/httpRequestHandler.js +5 -3
- package/dist/lib/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/lib/server/routesHandlers/postResponseHandler.js +23 -0
- package/dist/lib/server/routesHandlers/postResponseHandler.js.map +1 -1
- package/dist/lib/server/socket.js +85 -48
- package/dist/lib/server/socket.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 +20 -7
- 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 +8 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +8 -2
- package/dist/lib/common/relay/prepareRequest.js.map +0 -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
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrokerWorkload = void 0;
|
|
4
4
|
const pluginManager_1 = require("../client/brokerClientPlugins/pluginManager");
|
|
5
|
-
const prepareRequest_1 = require("
|
|
5
|
+
const prepareRequest_1 = require("./prepareRequest");
|
|
6
6
|
const content_length_1 = require("../common/utils/content-length");
|
|
7
7
|
const headers_value_constants_1 = require("../common/utils/headers-value-constants");
|
|
8
8
|
const metrics_1 = require("../common/utils/metrics");
|
|
@@ -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',
|
|
@@ -48,8 +47,7 @@ class BrokerWorkload {
|
|
|
48
47
|
connectionIdentifier: this.connectionIdentifier,
|
|
49
48
|
payloadStreamingId: payload.streamingID,
|
|
50
49
|
...correlationHeaders,
|
|
51
|
-
|
|
52
|
-
}, this.websocketConnectionHandler, websocketResponseHandler, logContext);
|
|
50
|
+
}, this.websocketConnectionHandler, websocketResponseHandler, this.options.config, logContext);
|
|
53
51
|
const simplifiedContext = structuredClone(logContext);
|
|
54
52
|
delete simplifiedContext.requestHeaders;
|
|
55
53
|
logger_1.log.info(simplifiedContext, `[Websocket Flow] Received request from ${process.env.BROKER_TYPE == 'client' ? 'client' : 'server'}`);
|
|
@@ -71,7 +69,7 @@ class BrokerWorkload {
|
|
|
71
69
|
}
|
|
72
70
|
else {
|
|
73
71
|
(0, metrics_1.incrementWebSocketRequestsTotal)(false, 'inbound-request');
|
|
74
|
-
const preparedRequest = await (0, prepareRequest_1.prepareRequestFromFilterResult)(filterResponse, payload, logContext, this.options, this.connectionIdentifier,
|
|
72
|
+
const preparedRequest = await (0, prepareRequest_1.prepareRequestFromFilterResult)(filterResponse, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
|
|
75
73
|
if (this.options.config.universalBrokerEnabled) {
|
|
76
74
|
preparedRequest.req = await (0, pluginManager_1.runPreRequestPlugins)(this.options, this.connectionIdentifier, preparedRequest.req);
|
|
77
75
|
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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker-workload/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.prepareRequestFromFilterResult = void 0;
|
|
7
7
|
const url_1 = require("url");
|
|
8
|
-
const version_1 = __importDefault(require("../utils/version"));
|
|
9
|
-
const try_json_parse_1 = __importDefault(require("../utils/try-json-parse"));
|
|
10
|
-
const replace_vars_1 = require("../utils/replace-vars");
|
|
8
|
+
const version_1 = __importDefault(require("../common/utils/version"));
|
|
9
|
+
const try_json_parse_1 = __importDefault(require("../common/utils/try-json-parse"));
|
|
10
|
+
const replace_vars_1 = require("../common/utils/replace-vars");
|
|
11
11
|
const undefsafe_1 = __importDefault(require("undefsafe"));
|
|
12
|
-
const logger_1 = require("
|
|
13
|
-
const scm_1 = require("
|
|
14
|
-
const universal_1 = require("../config/universal");
|
|
15
|
-
const content_length_1 = require("../utils/content-length");
|
|
16
|
-
const headers_value_constants_1 = require("../utils/headers-value-constants");
|
|
12
|
+
const logger_1 = require("../logs/logger");
|
|
13
|
+
const scm_1 = require("../client/scm");
|
|
14
|
+
const universal_1 = require("../common/config/universal");
|
|
15
|
+
const content_length_1 = require("../common/utils/content-length");
|
|
16
|
+
const headers_value_constants_1 = require("../common/utils/headers-value-constants");
|
|
17
17
|
const prepareRequestFromFilterResult = async (result, payload, logContext, options, brokerToken, socketType) => {
|
|
18
|
-
var _a;
|
|
19
18
|
let errorPreparing = null;
|
|
20
19
|
if (result.url.startsWith('http') === false) {
|
|
21
20
|
result.url = 'https://' + result.url;
|
|
@@ -94,8 +93,6 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
94
93
|
'x-forwarded-proto',
|
|
95
94
|
'content-length',
|
|
96
95
|
'host',
|
|
97
|
-
'accept-encoding',
|
|
98
|
-
'content-encoding',
|
|
99
96
|
'x-forwarded-host',
|
|
100
97
|
'x-forwarded-port',
|
|
101
98
|
'snyk-acting-group-public-id',
|
|
@@ -127,7 +124,7 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
127
124
|
logger_1.log.debug(logContext, '[Relay] Preparing Downstream Request');
|
|
128
125
|
// Sometimes we receive the body as a {type, data} object
|
|
129
126
|
// Unsure why - possibly Primus?
|
|
130
|
-
if (
|
|
127
|
+
if (payload.body?.type === 'Buffer')
|
|
131
128
|
payload.body = Buffer.of(payload.body.data);
|
|
132
129
|
if ((0, scm_1.gitHubTreeCheckNeeded)(options.config, {
|
|
133
130
|
method: payload.method,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.renewBrokerServerConnection = void 0;
|
|
4
|
+
const request_1 = require("../../hybrid-sdk/http/request");
|
|
5
|
+
const utils_1 = require("../../hybrid-sdk/http/utils");
|
|
6
|
+
const renewBrokerServerConnection = async (brokerServerConnectionParams, clientConfig) => {
|
|
7
|
+
const apiHostname = clientConfig.API_BASE_URL;
|
|
8
|
+
const body = {
|
|
9
|
+
data: {
|
|
10
|
+
type: 'broker_connection',
|
|
11
|
+
attributes: {
|
|
12
|
+
broker_client_id: brokerServerConnectionParams.brokerClientId,
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
let url = new URL(`${apiHostname}/hidden/brokers/connections/${brokerServerConnectionParams.connectionIdentifier}/auth/refresh`);
|
|
17
|
+
url = (0, utils_1.addServerIdAndRoleQS)(url, brokerServerConnectionParams.serverId, brokerServerConnectionParams.role);
|
|
18
|
+
const req = {
|
|
19
|
+
url: url.toString(),
|
|
20
|
+
headers: {
|
|
21
|
+
Authorization: brokerServerConnectionParams.authorization,
|
|
22
|
+
'Content-type': 'application/vnd.api+json',
|
|
23
|
+
},
|
|
24
|
+
method: 'POST',
|
|
25
|
+
body: JSON.stringify(body),
|
|
26
|
+
};
|
|
27
|
+
return await (0, request_1.makeRequestToDownstream)(req);
|
|
28
|
+
};
|
|
29
|
+
exports.renewBrokerServerConnection = renewBrokerServerConnection;
|
|
30
|
+
//# sourceMappingURL=brokerServerConnection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"brokerServerConnection.js","sourceRoot":"","sources":["../../../../lib/client/auth/brokerServerConnection.ts"],"names":[],"mappings":";;;AAEA,2DAGuC;AACvC,uDAAmE;AAU5D,MAAM,2BAA2B,GAAG,KAAK,EAC9C,4BAA0D,EAC1D,YAA2B,EACJ,EAAE;IACzB,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC;IAC9C,MAAM,IAAI,GAAG;QACX,IAAI,EAAE;YACJ,IAAI,EAAE,mBAAmB;YACzB,UAAU,EAAE;gBACV,gBAAgB,EAAE,4BAA4B,CAAC,cAAc;aAC9D;SACF;KACF,CAAC;IACF,IAAI,GAAG,GAAG,IAAI,GAAG,CACf,GAAG,WAAW,+BAA+B,4BAA4B,CAAC,oBAAoB,eAAe,CAC9G,CAAC;IACF,GAAG,GAAG,IAAA,4BAAoB,EACxB,GAAG,EACH,4BAA4B,CAAC,QAAQ,EACrC,4BAA4B,CAAC,IAAI,CAClC,CAAC;IAEF,MAAM,GAAG,GAA8B;QACrC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;QACnB,OAAO,EAAE;YACP,aAAa,EAAE,4BAA4B,CAAC,aAAa;YACzD,cAAc,EAAE,0BAA0B;SAC3C;QACD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC;IACF,OAAO,MAAM,IAAA,iCAAuB,EAAC,GAAG,CAAC,CAAC;AAC5C,CAAC,CAAC;AAhCW,QAAA,2BAA2B,+BAgCtC"}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.setfetchAndUpdateJwt = exports.fetchAndUpdateJwt = exports.setAuthConfigKey = exports.getAuthConfig = void 0;
|
|
4
4
|
const request_1 = require("../../hybrid-sdk/http/request");
|
|
5
5
|
const logger_1 = require("../../logs/logger");
|
|
6
|
-
|
|
6
|
+
const authConfig = {};
|
|
7
|
+
const getAuthConfig = () => {
|
|
8
|
+
return authConfig;
|
|
9
|
+
};
|
|
10
|
+
exports.getAuthConfig = getAuthConfig;
|
|
11
|
+
const setAuthConfigKey = (key, value) => {
|
|
12
|
+
authConfig[key] = value;
|
|
13
|
+
};
|
|
14
|
+
exports.setAuthConfigKey = setAuthConfigKey;
|
|
15
|
+
async function fetchAndUpdateJwt(apiHostname, clientId, clientSecret) {
|
|
7
16
|
try {
|
|
8
17
|
const data = {
|
|
9
18
|
grant_type: 'client_credentials',
|
|
@@ -22,15 +31,48 @@ async function fetchJwt(apiHostname, clientId, clientSecret) {
|
|
|
22
31
|
const errorBody = JSON.parse(oauthResponse.body);
|
|
23
32
|
throw new Error(`${oauthResponse.statusCode}-${errorBody.error}:${errorBody.error_description}`);
|
|
24
33
|
}
|
|
25
|
-
const
|
|
26
|
-
const jwt =
|
|
27
|
-
const type =
|
|
28
|
-
const expiresIn =
|
|
34
|
+
const accessTokenJSON = JSON.parse(oauthResponse.body);
|
|
35
|
+
const jwt = accessTokenJSON.access_token;
|
|
36
|
+
const type = accessTokenJSON.token_type;
|
|
37
|
+
const expiresIn = accessTokenJSON.expires_in;
|
|
38
|
+
(0, exports.setAuthConfigKey)('accessToken', {
|
|
39
|
+
expiresIn: expiresIn,
|
|
40
|
+
authHeader: `${type} ${jwt}`,
|
|
41
|
+
});
|
|
29
42
|
return { expiresIn: expiresIn, authHeader: `${type} ${jwt}` };
|
|
30
43
|
}
|
|
31
44
|
catch (err) {
|
|
32
45
|
logger_1.log.error({ err }, 'Unable to retrieve JWT');
|
|
33
46
|
}
|
|
34
47
|
}
|
|
35
|
-
exports.
|
|
48
|
+
exports.fetchAndUpdateJwt = fetchAndUpdateJwt;
|
|
49
|
+
const refreshJwt = async (clientConfig, clientId, clientSecret) => {
|
|
50
|
+
logger_1.log.debug({}, 'Refreshing oauth access token');
|
|
51
|
+
try {
|
|
52
|
+
const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
|
|
53
|
+
if (!newJwt) {
|
|
54
|
+
throw new Error('Error retrieving new JWT:undefined.');
|
|
55
|
+
}
|
|
56
|
+
(0, exports.setAuthConfigKey)('accessToken', {
|
|
57
|
+
expiresIn: newJwt.expiresIn,
|
|
58
|
+
authHeader: newJwt.authHeader,
|
|
59
|
+
});
|
|
60
|
+
setTimeout(async () => {
|
|
61
|
+
refreshJwt(clientConfig, clientId, clientSecret);
|
|
62
|
+
}, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
|
|
63
|
+
}
|
|
64
|
+
catch (err) {
|
|
65
|
+
logger_1.log.error(`Error retrieving new JWT ${err}`);
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
const setfetchAndUpdateJwt = async (clientConfig, clientId, clientSecret) => {
|
|
69
|
+
const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
|
|
70
|
+
logger_1.log.debug({}, 'Setting auth updater.');
|
|
71
|
+
if (newJwt) {
|
|
72
|
+
setTimeout(async () => {
|
|
73
|
+
refreshJwt(clientConfig, clientId, clientSecret);
|
|
74
|
+
}, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
exports.setfetchAndUpdateJwt = setfetchAndUpdateJwt;
|
|
36
78
|
//# sourceMappingURL=oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../lib/client/auth/oauth.ts"],"names":[],"mappings":";;;AAAA,2DAAwE;AAExE,8CAAkD;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../lib/client/auth/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -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`,
|
|
@@ -142,7 +141,6 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
142
141
|
Accept: 'application/vnd.github+json',
|
|
143
142
|
'X-GitHub-Api-Version': '2022-11-28',
|
|
144
143
|
Authorization: `Bearer ${jwtToken}`,
|
|
145
|
-
'user-agent': 'Snyk Broker Github App Plugin',
|
|
146
144
|
},
|
|
147
145
|
method: 'POST',
|
|
148
146
|
};
|
|
@@ -150,7 +148,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
150
148
|
if (oauthResponse.statusCode && oauthResponse.statusCode > 299) {
|
|
151
149
|
throw new Error(`Unexpected error code ${oauthResponse.statusCode}: ${oauthResponse.body}`);
|
|
152
150
|
}
|
|
153
|
-
const accessToken =
|
|
151
|
+
const accessToken = oauthResponse.body ?? '';
|
|
154
152
|
return accessToken;
|
|
155
153
|
}
|
|
156
154
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAoF;AACpF,qCAAmD;AACnD,mFAAmD;AACnD,6CAA+C;AAC/C,+CAAoC;AAEpC,8DAA2E;AAC3E,uDAA2D;AAC3D,wEAAwE;AACxE,qEAA6D;AAE7D,MAAa,MAAO,SAAQ,8BAAY;IAAxC;;QACE,0DAA0D;QAC1D,eAAU,GAAG,0BAA0B,CAAC;QACxC,eAAU,GAAG,yCAAyC,CAAC;QACvD,gBAAW,GAAG;;KAEX,CAAC;QACJ,YAAO,GAAG,KAAK,CAAC;QAChB,0BAAqB,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CAAC,0BAA0B;QAC7F,YAAO,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.validateBrokerClientUrl = void 0;
|
|
7
4
|
const logger_1 = require("../../../logs/logger");
|
|
8
5
|
const urlValidator_1 = require("../../../common/utils/urlValidator");
|
|
9
6
|
const request_1 = require("../../../hybrid-sdk/http/request");
|
|
10
7
|
const exponential_backoff_1 = require("../../retry/exponential-backoff");
|
|
11
|
-
const version_1 = __importDefault(require("../../../common/utils/version"));
|
|
12
8
|
async function validateBrokerClientUrl(checkOptions, config) {
|
|
13
9
|
logger_1.log.debug({ checkId: checkOptions.id }, 'executing config check');
|
|
14
10
|
const brokerClientUrl = config.BROKER_CLIENT_URL;
|
|
@@ -81,7 +77,6 @@ async function isBrokerClientUrlTLSTerminated(config) {
|
|
|
81
77
|
headers: {
|
|
82
78
|
Accept: 'application/json',
|
|
83
79
|
'Content-Type': 'application/json',
|
|
84
|
-
'User-Agent': `broker client/${version_1.default} (config check service)`,
|
|
85
80
|
},
|
|
86
81
|
};
|
|
87
82
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brokerClientUrlCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/brokerClientUrlCheck.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"brokerClientUrlCheck.js","sourceRoot":"","sources":["../../../../../lib/client/checks/config/brokerClientUrlCheck.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AAGrD,qEAG4C;AAC5C,8DAG0C;AAC1C,yEAAwD;AAEjD,KAAK,UAAU,uBAAuB,CAC3C,YAA0B,EAC1B,MAAc;IAEd,YAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,wBAAwB,CAAC,CAAC;IAErE,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;QAED,IACE,0BAA0B,CAAC,MAAM,CAAC;YAClC,CAAC,CAAC,MAAM,8BAA8B,CAAC,MAAM,CAAC,CAAC,EAC/C;YACA,OAAO;gBACL,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,8CAA8C,eAAe,mEAAmE;aACnH,CAAC;SACzB;QAED,IAAI,eAAe,IAAI,mBAAmB,CAAC,eAAe,CAAC,EAAE;YAC3D,OAAO;gBACL,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,kDAAkD,eAAe,2BAA2B;aAC/E,CAAC;SACzB;QAED,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;AAjDD,0DAiDC;AAED,SAAS,0BAA0B,CAAC,MAAc;IAChD,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACjD,YAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,eAAe,EAAE,EACxB,2CAA2C,CAC5C,CAAC;IAEF,IAAI;QACF,IAAI,eAAe,IAAI,IAAA,kCAAmB,EAAC,eAAe,EAAE,QAAQ,CAAC,EAAE;YACrE,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;YACxC,YAAM,CAAC,KAAK,CACV,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAC5C,sCAAsC,CACvC,CAAC;YACF,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;SACxD;QACD,OAAO,KAAK,CAAC;KACd;IAAC,OAAO,KAAK,EAAE;QACd,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,qCAAqC,CAAC,CAAC;QAC/D,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,MAAc;IAEd,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,MAAM,CAAC,gCAAgC,EAAE;QAC3C,eAAe,GAAG,IAAI,CAAC;KACxB;SAAM;QACL,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,GAAG,MAAM,CAAC,iBAAiB,cAAc;YAC9C,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC;QACF,IAAI;YACF,MAAM,QAAQ,GAAiB,MAAM,IAAA,2BAAK,EACxC,GAAG,EAAE,CAAC,IAAA,0CAAgC,EAAC,OAAO,CAAC,EAC/C,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,2CAA2C,EAAE,CACvE,CAAC;YACF,YAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,gCAAgC,CAAC,CAAC;YACvE,eAAe,GAAG,IAAI,CAAC;SACxB;QAAC,OAAO,GAAG,EAAE;YACZ,YAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,EACP,+DAA+D,CAChE,CAAC;YACF,eAAe,GAAG,KAAK,CAAC;SACzB;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,mBAAmB,CAAC,eAAuB;IAClD,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,+BAA+B,CAAC,CAAC;IAExE,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC,QAAQ,KAAK,WAAW,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,wCAAwC,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.convertHttpResponseToCheckResult = exports.executeHttpRequest = void 0;
|
|
7
4
|
const logger_1 = require("../../../logs/logger");
|
|
8
|
-
const version_1 = __importDefault(require("../../../common/utils/version"));
|
|
9
5
|
const exponential_backoff_1 = require("../../retry/exponential-backoff");
|
|
10
6
|
const request_1 = require("../../../hybrid-sdk/http/request");
|
|
11
7
|
async function executeHttpRequest(checkOptions, httpOptions) {
|
|
@@ -17,7 +13,6 @@ async function executeHttpRequest(checkOptions, httpOptions) {
|
|
|
17
13
|
headers: {
|
|
18
14
|
Accept: 'application/json',
|
|
19
15
|
'Content-Type': 'application/json',
|
|
20
|
-
'User-Agent': `broker client/${version_1.default} (http check service)`,
|
|
21
16
|
},
|
|
22
17
|
timeoutMs: httpOptions.timeoutMs,
|
|
23
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AACrD,yEAAwD;AAExD,8DAG0C;AAEnC,KAAK,UAAU,kBAAkB,CACtC,YAGC,EACD,WAIC;IAED,YAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAEnE,IAAI;QACF,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;QACF,MAAM,QAAQ,GAAiB,MAAM,IAAA,2BAAK,EACxC,GAAG,EAAE,CAAC,IAAA,0CAAgC,EAAC,OAAO,CAAC,EAC/C,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,cAAc,YAAY,CAAC,EAAE,EAAE,EAAE,CAC3D,CAAC;QACF,YAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,8BAA8B,CAAC,CAAC;QAErE,MAAM,WAAW,GAAG,gCAAgC,CAClD;YACE,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,MAAM,EAAE,WAAW,CAAC,MAAM;SAC3B,EACD,QAAQ,CACT,CAAC;QAEF,YAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,EACxD,gCAAgC,CACjC,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACrC;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;AAjDD,gDAiDC;AAED,SAAgB,gCAAgC,CAC9C,KAAyE,EACzE,QAAsB;IAEtB,IAAI,MAAmB,CAAC;IACxB,IACE,QAAQ,CAAC,UAAU;QACnB,QAAQ,CAAC,UAAU,IAAI,GAAG;QAC1B,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B;QACA,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE;QACrC,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM;QACL,MAAM,GAAG,OAAO,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,QAAQ,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,UAAU,IACtE,QAAQ,CAAC,UACX,eAAe,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;IAEzD,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM;QACN,MAAM;KACe,CAAC;AAC1B,CAAC;AA3BD,4EA2BC;AAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE;IACxC,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,GAAG,aAAa,iBAAiB,CAAC;AAC3C,CAAC,CAAC"}
|
|
@@ -8,15 +8,15 @@ const fs_1 = require("fs");
|
|
|
8
8
|
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
|
+
const oauth_1 = require("../auth/oauth");
|
|
11
12
|
const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) => {
|
|
12
|
-
var _a, _b, _c, _d;
|
|
13
13
|
const deploymentId = clientOpts.config.deploymentId;
|
|
14
14
|
const apiVersion = clientOpts.config.apiVersion;
|
|
15
15
|
const request = {
|
|
16
16
|
url: `${clientOpts.config.API_BASE_URL}/hidden/brokers/deployments/${deploymentId}/connections?version=${apiVersion}`,
|
|
17
17
|
headers: {
|
|
18
18
|
'Content-Type': 'application/vnd.api+json',
|
|
19
|
-
Authorization: `${(
|
|
19
|
+
Authorization: `${(0, oauth_1.getAuthConfig)().accessToken?.authHeader}`,
|
|
20
20
|
'x-broker-client-id': `${clientOpts.config.brokerClientId}`,
|
|
21
21
|
'x-broker-client-version': `${version_1.default}`,
|
|
22
22
|
},
|
|
@@ -38,8 +38,8 @@ const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) =
|
|
|
38
38
|
for (let i = 0; i < connections.length; i++) {
|
|
39
39
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`] =
|
|
40
40
|
{
|
|
41
|
-
...(0, configurations_1.capitalizeKeys)(
|
|
42
|
-
...(0, configurations_1.capitalizeKeys)(
|
|
41
|
+
...(0, configurations_1.capitalizeKeys)(connections[i].attributes.configuration.default ?? {}),
|
|
42
|
+
...(0, configurations_1.capitalizeKeys)(connections[i].attributes.configuration.required ?? {}),
|
|
43
43
|
};
|
|
44
44
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].type = connections[i].attributes.configuration.type;
|
|
45
45
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].identifier = connections[i].attributes.identifier;
|
|
@@ -47,7 +47,7 @@ const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) =
|
|
|
47
47
|
connectionsObjectForFile.CONNECTIONS[`${connections[i].attributes.name}`].friendlyName = connections[i].attributes.name;
|
|
48
48
|
}
|
|
49
49
|
const universalConfigFileBuffer = (0, fs_1.readFileSync)(universalFilePath);
|
|
50
|
-
const universalConfigFile = JSON.parse(
|
|
50
|
+
const universalConfigFile = JSON.parse(universalConfigFileBuffer.toString() ?? { CONNECTIONS: {} });
|
|
51
51
|
universalConfigFile['CONNECTIONS'] = connectionsObjectForFile.CONNECTIONS;
|
|
52
52
|
(0, fs_1.writeFileSync)(universalFilePath, JSON.stringify(universalConfigFile));
|
|
53
53
|
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;
|
|
1
|
+
{"version":3,"file":"remoteConfig.js","sourceRoot":"","sources":["../../../../lib/client/config/remoteConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ const manageWebsocketConnections = async (clientOpts, globalIdentifyingMetadata)
|
|
|
29
29
|
}));
|
|
30
30
|
await (0, configHelpers_1.reloadConfig)(clientOpts);
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
await (0, oauth_1.setfetchAndUpdateJwt)(clientOpts.config, clientOpts.config.brokerClientConfiguration.common.oauth.clientId, clientOpts.config.brokerClientConfiguration.common.oauth.clientSecret);
|
|
33
33
|
await (0, remoteConfig_1.retrieveConnectionsForDeployment)(clientOpts, `${(0, config_1.findProjectRoot)(__dirname)}/config.universal.json`);
|
|
34
34
|
(0, validator_1.validateUniversalConnectionsRemoteConfig)(`${(0, config_1.findProjectRoot)(__dirname)}/config.universal.json`);
|
|
35
35
|
(0, signals_1.handleTerminationSignal)(cleanup_1.cleanUpUniversalFile);
|