snyk-broker 4.208.0 → 4.208.1
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/dist/cli/init.js +1 -1
- package/dist/cli/init.js.map +1 -1
- package/dist/client-templates/bitbucket-server-bearer-auth/.env.sample +3 -0
- package/dist/lib/broker-workload/clientRequest.js +24 -3
- package/dist/lib/broker-workload/clientRequest.js.map +1 -1
- package/dist/lib/broker-workload/index.js +6 -4
- package/dist/lib/broker-workload/index.js.map +1 -1
- package/dist/lib/broker-workload/prepareRequest.js +5 -43
- package/dist/lib/broker-workload/prepareRequest.js.map +1 -1
- package/dist/lib/client/brokerClientPlugins/abstractBrokerPlugin.js +1 -1
- package/dist/lib/client/brokerClientPlugins/abstractBrokerPlugin.js.map +1 -1
- package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js +16 -16
- package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js.map +1 -1
- package/dist/lib/client/checks/index.js +2 -2
- package/dist/lib/client/checks/index.js.map +1 -1
- package/dist/lib/client/config/configHelpers.js +1 -1
- package/dist/lib/client/config/configHelpers.js.map +1 -1
- package/dist/lib/client/connectionsManager/mainWatcher.js +3 -3
- package/dist/lib/client/connectionsManager/mainWatcher.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 +7 -7
- package/dist/lib/client/hooks/startup/processHooks.js.map +1 -1
- package/dist/lib/client/index.js +6 -6
- package/dist/lib/client/index.js.map +1 -1
- package/dist/lib/client/retry/exponential-backoff.js +1 -1
- package/dist/lib/client/retry/exponential-backoff.js.map +1 -1
- package/dist/lib/client/routesHandler/systemCheckHandler.js +5 -5
- package/dist/lib/client/routesHandler/systemCheckHandler.js.map +1 -1
- package/dist/lib/client/routesHandler/websocketConnectionMiddlewares.js +1 -1
- package/dist/lib/client/routesHandler/websocketConnectionMiddlewares.js.map +1 -1
- package/dist/lib/client/socket.js +7 -7
- package/dist/lib/client/socket.js.map +1 -1
- package/dist/lib/client/socketHandlers/closeHandler.js +1 -8
- package/dist/lib/client/socketHandlers/closeHandler.js.map +1 -1
- package/dist/lib/client/socketHandlers/errorHandler.js +2 -2
- package/dist/lib/client/socketHandlers/errorHandler.js.map +1 -1
- package/dist/lib/client/socketHandlers/openHandler.js +1 -1
- package/dist/lib/client/socketHandlers/openHandler.js.map +1 -1
- package/dist/lib/client/socketHandlers/reconnectHandler.js +2 -2
- package/dist/lib/client/socketHandlers/reconnectHandler.js.map +1 -1
- package/dist/lib/client/utils/connectionValidation.js +1 -1
- package/dist/lib/client/utils/connectionValidation.js.map +1 -1
- package/dist/lib/common/config/config.js +9 -1
- package/dist/lib/common/config/config.js.map +1 -1
- package/dist/lib/common/config/universal.js +1 -1
- package/dist/lib/common/config/universal.js.map +1 -1
- package/dist/lib/common/filter/filter-rules-loading.js +11 -11
- package/dist/lib/common/filter/filter-rules-loading.js.map +1 -1
- package/dist/lib/common/filter/filtersAsync.js +10 -50
- package/dist/lib/common/filter/filtersAsync.js.map +1 -1
- package/dist/lib/common/http/webserver.js +1 -1
- package/dist/lib/common/http/webserver.js.map +1 -1
- package/dist/lib/common/utils/replace-vars.js +3 -1
- package/dist/lib/common/utils/replace-vars.js.map +1 -1
- package/dist/lib/hybrid-sdk/LegacyStreamResponseHandler.js +2 -2
- package/dist/lib/hybrid-sdk/LegacyStreamResponseHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js +7 -7
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/axios.js +1 -1
- package/dist/lib/hybrid-sdk/http/request.js +2 -2
- package/dist/lib/hybrid-sdk/http/request.js.map +1 -1
- package/dist/lib/hybrid-sdk/interpolateRequestWithConfigData.js +72 -0
- package/dist/lib/hybrid-sdk/interpolateRequestWithConfigData.js.map +1 -0
- package/dist/lib/hybrid-sdk/requestsHelper.js +2 -2
- package/dist/lib/hybrid-sdk/requestsHelper.js.map +1 -1
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/logs/log.js +2 -2
- package/dist/lib/logs/log.js.map +1 -1
- package/dist/lib/server/auth/connectionWatchdog.js +1 -1
- package/dist/lib/server/auth/connectionWatchdog.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/index.js +7 -7
- package/dist/lib/server/index.js.map +1 -1
- package/dist/lib/server/infra/dispatcher.js +6 -6
- package/dist/lib/server/infra/dispatcher.js.map +1 -1
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js +2 -2
- package/dist/lib/server/routesHandlers/connectionStatusHandler.js.map +1 -1
- package/dist/lib/server/routesHandlers/httpRequestHandler.js +1 -1
- package/dist/lib/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/lib/server/routesHandlers/postResponseHandler.js +19 -18
- package/dist/lib/server/routesHandlers/postResponseHandler.js.map +1 -1
- package/dist/lib/server/socket.js +6 -6
- package/dist/lib/server/socket.js.map +1 -1
- package/dist/lib/server/socketHandlers/closeHandler.js +3 -3
- package/dist/lib/server/socketHandlers/closeHandler.js.map +1 -1
- package/dist/lib/server/socketHandlers/connectionHandler.js +1 -1
- package/dist/lib/server/socketHandlers/connectionHandler.js.map +1 -1
- package/dist/lib/server/socketHandlers/errorHandler.js +1 -1
- package/dist/lib/server/socketHandlers/errorHandler.js.map +1 -1
- package/dist/lib/server/socketHandlers/identifyHandler.js +4 -4
- package/dist/lib/server/socketHandlers/identifyHandler.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/cli/init.js
CHANGED
|
@@ -40,6 +40,6 @@ exports.default = async (templateName) => {
|
|
|
40
40
|
const writer = (0, fs_1.createWriteStream)(path_1.default.resolve(process.cwd(), newfile));
|
|
41
41
|
reader.pipe(writer).on('finish', resolve).on('error', reject);
|
|
42
42
|
})));
|
|
43
|
-
logger_1.log.info({ templateName }, '
|
|
43
|
+
logger_1.log.info({ templateName }, 'Initialisation complete.');
|
|
44
44
|
};
|
|
45
45
|
//# sourceMappingURL=init.js.map
|
package/dist/cli/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.ts"],"names":[],"mappings":";;;;;AAAA,2BAA0E;AAC1E,gDAAwB;AACxB,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAC7D,+CAAmD;AAEnD,kBAAe,KAAK,EAAE,YAAY,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,8BAA8B,CAAC,CAAC;KAChE;IAED,MAAM,aAAa,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,qEAAqE;IACrE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,IAAI;YACF,MAAM,aAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEzE,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CACb,4EAA4E,iBAAiB,EAAE,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9C,YAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,qBAAgB,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAC9B,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CACL,CACF,CAAC;IAEF,YAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.ts"],"names":[],"mappings":";;;;;AAAA,2BAA0E;AAC1E,gDAAwB;AACxB,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAC7D,+CAAmD;AAEnD,kBAAe,KAAK,EAAE,YAAY,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,8BAA8B,CAAC,CAAC;KAChE;IAED,MAAM,aAAa,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,qEAAqE;IACrE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,IAAI;YACF,MAAM,aAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEzE,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CACb,4EAA4E,iBAAiB,EAAE,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9C,YAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,qBAAgB,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAC9B,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CACL,CACF,CAAC;IAEF,YAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,0BAA0B,CAAC,CAAC;AAC5D,CAAC,CAAC"}
|
|
@@ -15,6 +15,9 @@ BITBUCKET=bitbucket.yourdomain.com
|
|
|
15
15
|
# changed to "bitbucket.yourdomain.com/rest/api/1.0"
|
|
16
16
|
BITBUCKET_API=$BITBUCKET/rest/api/1.0
|
|
17
17
|
|
|
18
|
+
# GIT Endpoint to override if necessary
|
|
19
|
+
BITBUCKET_GIT=$BITBUCKET
|
|
20
|
+
|
|
18
21
|
# the url of your broker client (including scheme and port)
|
|
19
22
|
# BROKER_CLIENT_URL=
|
|
20
23
|
|
|
@@ -5,6 +5,9 @@ const clientRequestHelpers_1 = require("../hybrid-sdk/clientRequestHelpers");
|
|
|
5
5
|
const metrics_1 = require("../common/utils/metrics");
|
|
6
6
|
const requestFiltering_1 = require("./requestFiltering");
|
|
7
7
|
const logger_1 = require("../logs/logger");
|
|
8
|
+
const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateRequestWithConfigData");
|
|
9
|
+
const token_1 = require("../common/utils/token");
|
|
10
|
+
const node_crypto_1 = require("node:crypto");
|
|
8
11
|
class BrokerClientRequestWorkload {
|
|
9
12
|
constructor(req, res, options) {
|
|
10
13
|
this.req = req;
|
|
@@ -13,8 +16,26 @@ class BrokerClientRequestWorkload {
|
|
|
13
16
|
}
|
|
14
17
|
async handler(makeRequestOverHttp = false) {
|
|
15
18
|
const hybridClientRequestHandler = new clientRequestHelpers_1.HybridClientRequestHandler(this.req, this.res);
|
|
16
|
-
const
|
|
17
|
-
|
|
19
|
+
const matchedFilterRule = (0, requestFiltering_1.filterClientRequest)(this.req, this.options, this.res.locals.websocket);
|
|
20
|
+
const logContext = {
|
|
21
|
+
url: this.req.url,
|
|
22
|
+
connectionName: '',
|
|
23
|
+
requestMethod: this.req.method,
|
|
24
|
+
requestHeaders: this.req.headers,
|
|
25
|
+
streamingID: '',
|
|
26
|
+
maskedToken: this.res.locals.websocket.connectionIdentifier
|
|
27
|
+
? (0, token_1.maskToken)(this.res.locals.websocket.connectionIdentifier)
|
|
28
|
+
: '',
|
|
29
|
+
hashedToken: this.res.locals.websocket.connectionIdentifier
|
|
30
|
+
? (0, token_1.hashToken)(this.res.locals.websocket.connectionIdentifier)
|
|
31
|
+
: '',
|
|
32
|
+
transport: this.res.locals.websocket?.socket?.transport?.name ?? 'unknown',
|
|
33
|
+
responseMedium: this.req.headers['x-broker-ws-response']
|
|
34
|
+
? 'websocket'
|
|
35
|
+
: 'http',
|
|
36
|
+
requestId: (0, node_crypto_1.randomUUID)(),
|
|
37
|
+
};
|
|
38
|
+
if (!matchedFilterRule) {
|
|
18
39
|
(0, metrics_1.incrementHttpRequestsTotal)(true, 'inbound-request');
|
|
19
40
|
const reason = 'Request does not match any accept rule, blocking HTTP request';
|
|
20
41
|
hybridClientRequestHandler.logContext.error = 'blocked';
|
|
@@ -25,7 +46,7 @@ class BrokerClientRequestWorkload {
|
|
|
25
46
|
.send({ message: 'blocked', reason, url: this.req.url });
|
|
26
47
|
}
|
|
27
48
|
else {
|
|
28
|
-
hybridClientRequestHandler.makeRequest(
|
|
49
|
+
hybridClientRequestHandler.makeRequest((0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(null, matchedFilterRule, this.req, logContext, this.options.config, 'upstream'), makeRequestOverHttp);
|
|
29
50
|
(0, metrics_1.incrementHttpRequestsTotal)(false, 'inbound-request');
|
|
30
51
|
}
|
|
31
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientRequest.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAChF,qDAAqE;AACrE,yDAAyD;AACzD,2CAA+C;
|
|
1
|
+
{"version":3,"file":"clientRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientRequest.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAChF,qDAAqE;AACrE,yDAAyD;AACzD,2CAA+C;AAC/C,qGAAwF;AAExF,iDAA6D;AAC7D,6CAAyC;AAEzC,MAAa,2BAA2B;IAItC,YAAY,GAAG,EAAE,GAAG,EAAE,OAAO;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,mBAAmB,GAAG,KAAK;QACvC,MAAM,0BAA0B,GAAG,IAAI,iDAA0B,CAC/D,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAA,sCAAmB,EAC3C,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAC1B,CAAC;QAEF,MAAM,UAAU,GAAuB;YACrC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;YACjB,cAAc,EAAE,EAAE;YAClB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;YAC9B,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;YAChC,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB;gBACzD,CAAC,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC;gBAC3D,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB;gBACzD,CAAC,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC;gBAC3D,CAAC,CAAC,EAAE;YACN,SAAS,EACP,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,SAAS;YACjE,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBACtD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,MAAM;YACV,SAAS,EAAE,IAAA,wBAAU,GAAE;SACxB,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE;YACtB,IAAA,oCAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACpD,MAAM,MAAM,GACV,+DAA+D,CAAC;YAClE,0BAA0B,CAAC,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;YACxD,YAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC3D,iEAAiE;YACjE,OAAO,IAAI,CAAC,GAAG;iBACZ,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;SAC5D;aAAM;YACL,0BAA0B,CAAC,WAAW,CACpC,IAAA,yDAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,IAAI,CAAC,GAAG,EACR,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,CACX,EACD,mBAAmB,CACpB,CAAC;YACF,IAAA,oCAA0B,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SACtD;IACH,CAAC;CACF;AAlED,kEAkEC"}
|
|
@@ -13,6 +13,7 @@ const correlation_headers_1 = require("../common/utils/correlation-headers");
|
|
|
13
13
|
const requestFiltering_1 = require("./requestFiltering");
|
|
14
14
|
const request_1 = require("../hybrid-sdk/http/request");
|
|
15
15
|
const log_1 = require("../logs/log");
|
|
16
|
+
const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateRequestWithConfigData");
|
|
16
17
|
class BrokerWorkload {
|
|
17
18
|
constructor(connectionIdentifier, options, websocketConnectionHandler) {
|
|
18
19
|
this.options = options;
|
|
@@ -51,8 +52,8 @@ class BrokerWorkload {
|
|
|
51
52
|
const simplifiedContext = structuredClone(logContext);
|
|
52
53
|
delete simplifiedContext.requestHeaders;
|
|
53
54
|
logger_1.log.info(simplifiedContext, `[Websocket Flow] Received request from ${process.env.BROKER_TYPE == 'client' ? 'client' : 'server'}`);
|
|
54
|
-
const
|
|
55
|
-
if (!
|
|
55
|
+
const matchedFilterRule = (0, requestFiltering_1.filterRequest)(payload, this.options, this.websocketConnectionHandler);
|
|
56
|
+
if (!matchedFilterRule) {
|
|
56
57
|
(0, metrics_1.incrementWebSocketRequestsTotal)(true, 'inbound-request');
|
|
57
58
|
const reason = '[Websocket Flow][Blocked Request] Does not match any accept rule';
|
|
58
59
|
logContext.error = 'Blocked by filter rules';
|
|
@@ -68,8 +69,9 @@ class BrokerWorkload {
|
|
|
68
69
|
});
|
|
69
70
|
}
|
|
70
71
|
else {
|
|
72
|
+
const urlInterpolated = (0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(this.connectionIdentifier, matchedFilterRule, payload, logContext, this.options.config, 'downstream');
|
|
71
73
|
(0, metrics_1.incrementWebSocketRequestsTotal)(false, 'inbound-request');
|
|
72
|
-
const preparedRequest = await (0, prepareRequest_1.
|
|
74
|
+
const preparedRequest = await (0, prepareRequest_1.prepareRequest)(urlInterpolated, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
|
|
73
75
|
if (this.options.config.universalBrokerEnabled) {
|
|
74
76
|
preparedRequest.req = await (0, pluginManager_1.runPreRequestPlugins)(this.options, this.connectionIdentifier, preparedRequest.req);
|
|
75
77
|
payload.headers[headers_value_constants_1.contentLengthHeader] = (0, content_length_1.computeContentLength)(payload);
|
|
@@ -102,7 +104,7 @@ class BrokerWorkload {
|
|
|
102
104
|
statusCode: response.statusCode,
|
|
103
105
|
responseHeaders: response.headers,
|
|
104
106
|
url: preparedRequest.req.url,
|
|
105
|
-
}, `[Websocket Flow][Inbound] Unexpected status code for relayed request
|
|
107
|
+
}, `[Websocket Flow][Inbound] Unexpected status code for relayed request.`);
|
|
106
108
|
}
|
|
107
109
|
responseHandler.sendDataResponse(response, logContext);
|
|
108
110
|
}
|
|
@@ -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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"}
|
|
@@ -3,18 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.prepareRequest = void 0;
|
|
7
7
|
const url_1 = require("url");
|
|
8
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
|
-
const undefsafe_1 = __importDefault(require("undefsafe"));
|
|
12
9
|
const logger_1 = require("../logs/logger");
|
|
13
10
|
const scm_1 = require("../client/scm");
|
|
14
11
|
const universal_1 = require("../common/config/universal");
|
|
15
12
|
const content_length_1 = require("../common/utils/content-length");
|
|
16
13
|
const headers_value_constants_1 = require("../common/utils/headers-value-constants");
|
|
17
|
-
const
|
|
14
|
+
const prepareRequest = async (result, payload, logContext, options, brokerToken, socketType) => {
|
|
18
15
|
let errorPreparing = null;
|
|
19
16
|
if (result.url.startsWith('http') === false) {
|
|
20
17
|
result.url = 'https://' + result.url;
|
|
@@ -49,43 +46,6 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
49
46
|
logContext.authHeaderSetByRuleUrl = true;
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
|
-
// if the request is all good - and at this point it is, we'll check
|
|
53
|
-
// whether we want to do variable substitution on the body
|
|
54
|
-
//
|
|
55
|
-
// Variable substitution - for those who forgot - is substituting a part
|
|
56
|
-
// of a given string (e.g. "${SOME_ENV_VAR}/rest/of/string")
|
|
57
|
-
// with an env var of the same name (SOME_ENV_VAR).
|
|
58
|
-
// This is used (for example) to substitute the snyk url
|
|
59
|
-
// with the broker's url when defining the target for an incoming webhook.
|
|
60
|
-
if (!options.config.disableBodyVarsSubstitution && payload.body) {
|
|
61
|
-
const parsedBody = (0, try_json_parse_1.default)(payload.body);
|
|
62
|
-
if (parsedBody.BROKER_VAR_SUB) {
|
|
63
|
-
logContext.bodyVarsSubstitution = parsedBody.BROKER_VAR_SUB;
|
|
64
|
-
for (const path of parsedBody.BROKER_VAR_SUB) {
|
|
65
|
-
let source = (0, undefsafe_1.default)(parsedBody, path); // get the value
|
|
66
|
-
source = (0, replace_vars_1.replace)(source, options.config.universalBrokerEnabled
|
|
67
|
-
? (0, universal_1.getConfigForIdentifier)(brokerToken, options.config)
|
|
68
|
-
: options.config); // replace the variables
|
|
69
|
-
(0, undefsafe_1.default)(parsedBody, path, source); // put it back in
|
|
70
|
-
}
|
|
71
|
-
//Remove the BROKER_VAR_SUB for the request body
|
|
72
|
-
delete parsedBody.BROKER_VAR_SUB;
|
|
73
|
-
payload.body = JSON.stringify(parsedBody);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
if (!options.config.disableHeaderVarsSubstitution &&
|
|
77
|
-
payload.headers &&
|
|
78
|
-
payload.headers['x-broker-var-sub']) {
|
|
79
|
-
// check whether we want to do variable substitution on the headers
|
|
80
|
-
logContext.headerVarsSubstitution = payload.headers['x-broker-var-sub'];
|
|
81
|
-
for (const path of payload.headers['x-broker-var-sub'].split(',')) {
|
|
82
|
-
let source = (0, undefsafe_1.default)(payload.headers, path.trim()); // get the value
|
|
83
|
-
source = (0, replace_vars_1.replace)(source, options.config.universalBrokerEnabled
|
|
84
|
-
? (0, universal_1.getConfigForIdentifier)(brokerToken, options.config)
|
|
85
|
-
: options.config); // replace the variables
|
|
86
|
-
(0, undefsafe_1.default)(payload.headers, path.trim(), source); // put it back in
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
49
|
// remove headers that we don't want to relay
|
|
90
50
|
// (because they corrupt the request)
|
|
91
51
|
const headersToRemove = [
|
|
@@ -126,6 +86,7 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
126
86
|
// Unsure why - possibly Primus?
|
|
127
87
|
if (payload.body?.type === 'Buffer')
|
|
128
88
|
payload.body = Buffer.of(payload.body.data);
|
|
89
|
+
// TODO: Move github commit signing to a plugin
|
|
129
90
|
if ((0, scm_1.gitHubTreeCheckNeeded)(options.config, {
|
|
130
91
|
method: payload.method,
|
|
131
92
|
url: payload.url,
|
|
@@ -156,6 +117,7 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
156
117
|
logger_1.log.error({ error }, 'error while signing github commit');
|
|
157
118
|
}
|
|
158
119
|
}
|
|
120
|
+
// TODO: Move github commit signing to a plugin
|
|
159
121
|
payload.headers['connection'] = 'Keep-Alive';
|
|
160
122
|
payload.headers['Keep-Alive'] = 'timeout=60, max=1000';
|
|
161
123
|
if (payload.headers &&
|
|
@@ -192,5 +154,5 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
|
|
|
192
154
|
}
|
|
193
155
|
return { req, error: errorPreparing };
|
|
194
156
|
};
|
|
195
|
-
exports.
|
|
157
|
+
exports.prepareRequest = prepareRequest;
|
|
196
158
|
//# sourceMappingURL=prepareRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAoC;AAEpC,sEAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ class BrokerPlugin {
|
|
|
16
16
|
isDisabled(config) {
|
|
17
17
|
let isDisabled = false;
|
|
18
18
|
if (config[`DISABLE_${this.pluginCode}_PLUGIN`]) {
|
|
19
|
-
logger_1.log.info({ plugin: this.pluginName }, `Plugin disabled
|
|
19
|
+
logger_1.log.info({ plugin: this.pluginName }, `Plugin disabled.`);
|
|
20
20
|
isDisabled = true;
|
|
21
21
|
}
|
|
22
22
|
return isDisabled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,2DAGuC;AAEvC,8CAAkD;AAElD,MAA8B,YAAY;IAgBxC,YAAY,eAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,YAAM,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,eAAe,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,iCAAuB,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC1C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnE,CAAC;IACJ,CAAC;IACD,UAAU,CAAC,MAAM;QACf,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,UAAU,SAAS,CAAC,EAAE;YAC/C,YAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,2DAGuC;AAEvC,8CAAkD;AAElD,MAA8B,YAAY;IAgBxC,YAAY,eAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,YAAM,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,eAAe,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,iCAAuB,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC1C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnE,CAAC;IACJ,CAAC;IACD,UAAU,CAAC,MAAM;QACf,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,UAAU,SAAS,CAAC,EAAE;YAC/C,YAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,kBAAkB,CAAC,CAAC;YAC7D,UAAU,GAAG,IAAI,CAAC;SACnB;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAQD,KAAK,CAAC,UAAU,CACd,uBAA4C,EAC5C,yBAAoD,EACpD,aAAmC;QAEnC,YAAM,CAAC,KAAK,CACV;YACE,gBAAgB,EAAE,uBAAuB;YACzC,aAAa,EAAE,aAAa;SAC7B,EACD,4BAA4B,CAC7B,CAAC;QACF,OAAO,yBAAyB,CAAC;IACnC,CAAC;CACF;AAzDD,+BAyDC"}
|
|
@@ -38,7 +38,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
38
38
|
// Useful for credentials retrieval, initial setup, etc...
|
|
39
39
|
async startUp(connectionConfig, pluginsConfig) {
|
|
40
40
|
try {
|
|
41
|
-
this.logger.info({ plugin: this.pluginName }, 'Running Startup');
|
|
41
|
+
this.logger.info({ plugin: this.pluginName }, 'Running Startup.');
|
|
42
42
|
this.logger.trace({
|
|
43
43
|
plugin: this.pluginCode,
|
|
44
44
|
config: connectionConfig,
|
|
@@ -51,12 +51,12 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
51
51
|
!connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH ||
|
|
52
52
|
!connectionConfig.GITHUB_APP_INSTALLATION_ID ||
|
|
53
53
|
!connectionConfig.GITHUB_APP_ID)) {
|
|
54
|
-
throw new Error(`Missing environment variable(s) for plugin (GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_PEM_PATH, GITHUB_APP_INSTALLATION_ID)
|
|
54
|
+
throw new Error(`Missing environment variable(s) for plugin (GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_PEM_PATH, GITHUB_APP_INSTALLATION_ID).`);
|
|
55
55
|
}
|
|
56
56
|
if (connectionConfig &&
|
|
57
57
|
connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH &&
|
|
58
58
|
!(0, node_fs_1.existsSync)(connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH)) {
|
|
59
|
-
throw new Error(`
|
|
59
|
+
throw new Error(`PEM file path is invalid ${connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH}.`);
|
|
60
60
|
}
|
|
61
61
|
// Generate the JWT
|
|
62
62
|
const now = Date.now();
|
|
@@ -64,13 +64,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
64
64
|
this._getJWT(Math.floor(now / 1000), // Current time in seconds
|
|
65
65
|
connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH, connectionConfig.GITHUB_APP_ID);
|
|
66
66
|
if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN) {
|
|
67
|
-
throw new Error(`Github app
|
|
67
|
+
throw new Error(`Github app plugin error: could not get JWT.`);
|
|
68
68
|
}
|
|
69
69
|
this._setJWTLifecycleHandler(now, connectionConfig);
|
|
70
70
|
(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken =
|
|
71
71
|
await this._getAccessToken(connectionConfig.GITHUB_API, connectionConfig.GITHUB_APP_INSTALLATION_ID, (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN);
|
|
72
72
|
if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken) {
|
|
73
|
-
throw new Error(`Github app
|
|
73
|
+
throw new Error(`Github app plugin error: could not get access token.`);
|
|
74
74
|
}
|
|
75
75
|
(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].GHA_ACCESS_TOKEN =
|
|
76
76
|
JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken).token;
|
|
@@ -78,12 +78,12 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
78
78
|
this._setAccessTokenLifecycleHandler(connectionConfig);
|
|
79
79
|
}
|
|
80
80
|
else {
|
|
81
|
-
throw new Error(`Github app
|
|
81
|
+
throw new Error(`Github app plugin Error: could not extract access token.`);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
catch (err) {
|
|
85
85
|
this.logger.error({ err }, `Error in ${this.pluginName}-${this.pluginCode} startup.`);
|
|
86
|
-
throw new Error(`Error in ${this.pluginName}-${this.pluginCode} startup. ${err}
|
|
86
|
+
throw new Error(`Error in ${this.pluginName}-${this.pluginCode} startup. ${err}.`);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
_getJWT(nowInSeconds, privatePemPath, githubAppId) {
|
|
@@ -105,13 +105,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
105
105
|
let timeoutHandler = async () => { };
|
|
106
106
|
timeoutHandler = async () => {
|
|
107
107
|
try {
|
|
108
|
-
this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app JWT token');
|
|
108
|
+
this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app JWT token.');
|
|
109
109
|
clearTimeout(timeoutHandlerId);
|
|
110
110
|
const timeoutHandlerNow = Date.now();
|
|
111
111
|
(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN =
|
|
112
112
|
await this._getJWT(Math.floor(timeoutHandlerNow / 1000), connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH, connectionConfig.GITHUB_APP_ID);
|
|
113
113
|
if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN) {
|
|
114
|
-
throw new Error(`Github app
|
|
114
|
+
throw new Error(`Github app plugin error: could not refresh JWT.`);
|
|
115
115
|
}
|
|
116
116
|
if (process.env.NODE_ENV != 'test') {
|
|
117
117
|
timeoutHandlerId = setTimeout(timeoutHandler, this._getTimeDifferenceInMsToFutureDate(timeoutHandlerNow + this.JWT_TTL) - 10000);
|
|
@@ -119,7 +119,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
121
|
catch (err) {
|
|
122
|
-
this.logger.error({ plugin: this.pluginCode, err }, `Error refreshing JWT
|
|
122
|
+
this.logger.error({ plugin: this.pluginCode, err }, `Error refreshing JWT.`);
|
|
123
123
|
throw err;
|
|
124
124
|
}
|
|
125
125
|
};
|
|
@@ -152,7 +152,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
152
152
|
return accessToken;
|
|
153
153
|
}
|
|
154
154
|
catch (err) {
|
|
155
|
-
this.logger.error({ plugin: this.pluginCode, err }, `Error getting access token
|
|
155
|
+
this.logger.error({ plugin: this.pluginCode, err }, `Error getting access token.`);
|
|
156
156
|
throw err;
|
|
157
157
|
}
|
|
158
158
|
}
|
|
@@ -162,14 +162,14 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
162
162
|
let timeoutHandler = async () => { };
|
|
163
163
|
timeoutHandler = async () => {
|
|
164
164
|
try {
|
|
165
|
-
this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app access token');
|
|
165
|
+
this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app access token.');
|
|
166
166
|
clearTimeout(timeoutHandlerId);
|
|
167
167
|
(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken =
|
|
168
168
|
await this._getAccessToken(connectionConfig.GITHUB_API, connectionConfig.GITHUB_APP_INSTALLATION_ID, (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN);
|
|
169
169
|
(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].GHA_ACCESS_TOKEN =
|
|
170
170
|
JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken).token;
|
|
171
171
|
if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken) {
|
|
172
|
-
throw new Error(`Github app
|
|
172
|
+
throw new Error(`Github app plugin error: could not get refreshed access token.`);
|
|
173
173
|
}
|
|
174
174
|
else {
|
|
175
175
|
this.logger.debug({
|
|
@@ -178,7 +178,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
178
178
|
}, `Access token renewed!`);
|
|
179
179
|
}
|
|
180
180
|
this.logger.debug({ plugin: this.pluginCode }, `Refreshed access token expires at ${JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName]
|
|
181
|
-
.ghaAccessToken).expires_at}
|
|
181
|
+
.ghaAccessToken).expires_at}.`);
|
|
182
182
|
if (process.env.NODE_ENV != 'test') {
|
|
183
183
|
timeoutHandlerId = setTimeout(timeoutHandler, this._getTimeDifferenceInMsToFutureDate(JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName]
|
|
184
184
|
.ghaAccessToken).expires_at) - 10000);
|
|
@@ -186,7 +186,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
186
186
|
}
|
|
187
187
|
}
|
|
188
188
|
catch (err) {
|
|
189
|
-
this.logger.error({ plugin: this.pluginCode, err }, `Error setting
|
|
189
|
+
this.logger.error({ plugin: this.pluginCode, err }, `Error setting access token lifecycle handler.`);
|
|
190
190
|
throw err;
|
|
191
191
|
}
|
|
192
192
|
};
|
|
@@ -202,7 +202,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
202
202
|
}
|
|
203
203
|
// Hook to run pre requests operations - Optional. Uncomment to enable
|
|
204
204
|
async preRequest(connectionConfiguration, postFilterPreparedRequest) {
|
|
205
|
-
this.logger.debug({ plugin: this.pluginName, connection: connectionConfiguration }, 'Running prerequest plugin');
|
|
205
|
+
this.logger.debug({ plugin: this.pluginName, connection: connectionConfiguration }, 'Running prerequest plugin.');
|
|
206
206
|
const regexPattern = /\$[A-Za-z0-9_%]+/g;
|
|
207
207
|
const matches = postFilterPreparedRequest.url.match(regexPattern);
|
|
208
208
|
if (matches) {
|
|
@@ -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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"}
|
|
@@ -15,7 +15,7 @@ function preflightChecksEnabled(config) {
|
|
|
15
15
|
preflightChecksEnabledValue.toLowerCase() === 'true' ||
|
|
16
16
|
preflightChecksEnabledValue.toLowerCase() === 'yes';
|
|
17
17
|
}
|
|
18
|
-
logger_1.log.info({ enabled: preflightChecksEnabled }, '
|
|
18
|
+
logger_1.log.info({ enabled: preflightChecksEnabled }, 'Verifying if preflight checks are enabled.');
|
|
19
19
|
return preflightChecksEnabled;
|
|
20
20
|
}
|
|
21
21
|
exports.preflightChecksEnabled = preflightChecksEnabled;
|
|
@@ -32,7 +32,7 @@ async function executePreflightChecks(config) {
|
|
|
32
32
|
preflightCheckResults.push(r.value);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
|
-
logger_1.log.error({ error: r.reason }, 'Unexpected error when executing checks');
|
|
35
|
+
logger_1.log.error({ error: r.reason }, 'Unexpected error when executing checks.');
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
logPreflightCheckResults(preflightCheckResults);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/checks/index.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAClD,qCAA2C;AAC3C,iCAAuC;AAGvC,mCAA+C;AAE/C,SAAgB,sBAAsB,CAAC,MAAW;IAChD,2CAA2C;IAC3C,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAElC,MAAM,2BAA2B,GAAI,MAAiB;SACnD,wBAAwB,CAAC;IAC5B,IAAI,OAAO,2BAA2B,KAAK,WAAW,EAAE;QACtD,sBAAsB;YACpB,2BAA2B,CAAC,WAAW,EAAE,KAAK,MAAM;gBACpD,2BAA2B,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KACvD;IAED,YAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,sBAAsB,EAAE,EACnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/checks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ function highAvailabilityModeEnabled(config) {
|
|
|
58
58
|
highAvailabilityModeEnabledValue.toLowerCase() === 'true' ||
|
|
59
59
|
highAvailabilityModeEnabledValue.toLowerCase() === 'yes';
|
|
60
60
|
}
|
|
61
|
-
logger_1.log.
|
|
61
|
+
logger_1.log.debug({ enabled: highAvailabilityModeEnabled }, 'Checking for HA mode.');
|
|
62
62
|
return highAvailabilityModeEnabled;
|
|
63
63
|
}
|
|
64
64
|
exports.highAvailabilityModeEnabled = highAvailabilityModeEnabled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configHelpers.js","sourceRoot":"","sources":["../../../../lib/client/config/configHelpers.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAkD;AAClD,uDAAyE;AACzE,yEAAiD;AAGjD,IAAI,gBAAgB,GAAwB,EAAE,CAAC;AAExC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,UAAU,EAAE,EAAE;IAC/C,gCAAgC;IAChC,MAAM,IAAA,yBAAgB,GAAE,CAAC;IACzB,MAAM,YAAY,GAAG,EAAE,MAAM,EAAE,IAAA,kBAAS,GAAE,EAAE,CAAC;IAC7C,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAC/B,EAAE,EACF,UAAU,CAAC,MAAM,EACjB,YAAY,CAAC,MAAM,CACoB,CAAC;IAC1C,gBAAgB,GAAG,UAAU,CAAC;AAChC,CAAC,CAAC;AAVW,QAAA,YAAY,gBAUvB;AAEK,MAAM,uBAAuB,GAAG,CACrC,YAAiC,EACjB,EAAE;IAClB,MAAM,cAAc,GAAmB;QACrC,cAAc,EAAE,YAAY,CAAC,cAAc;QAC3C,OAAO,EAAE,GAAG,iBAAO,EAAE;QACrB,MAAM,EAAE,2BAA2B,CAAC,YAAY,CAAC;QACjD,SAAS,EAAE,YAAY,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QAC3D,WAAW,EAAE,YAAY,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACjE,WAAW,EAAE,iBAAiB,CAAC,YAAY,CAAC;QAC5C,SAAS,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACtD,SAAS,EACP,QAAQ,CAAC,YAAY,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACvE,KAAK,EAAE,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACvE,YAAY,EACV,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,IAAI,aAAa;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,KAAK;QACX,kBAAkB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QAClE,eAAe,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;KACpE,CAAC;IACF,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAtBW,QAAA,uBAAuB,2BAsBlC;AAEF,MAAM,iBAAiB,GAAG,CAAC,MAA2B,EAAW,EAAE;IACjE,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACxB,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACvD,OAAO,IAAI,CAAC,CAAC,iCAAiC;SAC/C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,SAAgB,2BAA2B,CAAC,MAAW;IACrD,iDAAiD;IACjD,IAAI,2BAA2B,GAAG,KAAK,CAAC;IACxC,MAAM,gCAAgC,GAAI,MAAiB;SACxD,sBAAsB,CAAC;IAE1B,IAAI,OAAO,gCAAgC,KAAK,WAAW,EAAE;QAC3D,2BAA2B;YACzB,gCAAgC,CAAC,WAAW,EAAE,KAAK,MAAM;gBACzD,gCAAgC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KAC5D;IAED,YAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"configHelpers.js","sourceRoot":"","sources":["../../../../lib/client/config/configHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const setMainWatcher = async (clientOpts, websocketConnections, globalIdentifyin
|
|
|
16
16
|
? Object.keys(clientOpts.config.connections)
|
|
17
17
|
: [];
|
|
18
18
|
if (integrationsKeys.length < 1) {
|
|
19
|
-
logger_1.log.info({}, `Found deployment ${clientOpts.config.deploymentId}. Waiting for connections
|
|
19
|
+
logger_1.log.info({}, `Found deployment ${clientOpts.config.deploymentId}. Waiting for connections (polling).`);
|
|
20
20
|
}
|
|
21
21
|
for (let i = 0; i < integrationsKeys.length; i++) {
|
|
22
22
|
const currentWebsocketConnectionIndex = websocketConnections.findIndex((websocketConnection) => websocketConnection.friendlyName == integrationsKeys[i]);
|
|
@@ -33,7 +33,7 @@ const setMainWatcher = async (clientOpts, websocketConnections, globalIdentifyin
|
|
|
33
33
|
id: clientOpts.config.connections[`${integrationsKeys[i]}`].id,
|
|
34
34
|
name: clientOpts.config.connections[`${integrationsKeys[i]}`]
|
|
35
35
|
.friendlyName,
|
|
36
|
-
}, `Shutting down unused connection
|
|
36
|
+
}, `Shutting down unused connection.`);
|
|
37
37
|
(0, connectionHelpers_1.shutDownConnectionPair)(websocketConnections, i);
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
@@ -72,7 +72,7 @@ const setMainWatcher = async (clientOpts, websocketConnections, globalIdentifyin
|
|
|
72
72
|
(0, signals_1.addTimerToTerminalHandlers)(setInterval(watcher, clientOpts.config.connectionsManager.watcher.interval));
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
console.log('Disabling main watcher interval for testing');
|
|
75
|
+
console.log('Disabling main watcher interval for testing.');
|
|
76
76
|
}
|
|
77
77
|
await watcher();
|
|
78
78
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mainWatcher.js","sourceRoot":"","sources":["../../../../lib/client/connectionsManager/mainWatcher.ts"],"names":[],"mappings":";;;AAEA,iEAAyE;AACzE,8CAAkD;AAClD,sCAA2D;AAC3D,wEAAyE;AACzE,wDAAwE;AACxE,2DAA6D;AACtD,MAAM,cAAc,GAAG,KAAK,EACjC,UAA4B,EAC5B,oBAA2C,EAC3C,yBAA8C,EAC9C,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YACnC,MAAM,IAAA,sDAA+B,EAAC,UAAU,CAAC,CAAC;SACnD;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW;YACpD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC;YAC5C,CAAC,CAAC,EAAE,CAAC;QACP,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,YAAM,CAAC,IAAI,CACT,EAAE,EACF,oBAAoB,UAAU,CAAC,MAAM,CAAC,YAAY,sCAAsC,CACzF,CAAC;SACH;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,+BAA+B,GAAG,oBAAoB,CAAC,SAAS,CACpE,CAAC,mBAAmB,EAAE,EAAE,CACtB,mBAAmB,CAAC,YAAY,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAC1D,CAAC;YACF,IAAI,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE;gBACtE,YAAM,CAAC,KAAK,CACV;oBACE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;oBAC9D,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;yBAC1D,YAAY;iBAChB,EACD,4HAA4H,CAC7H,CAAC;aACH;iBAAM,IACL,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,EACnE;gBACA,IAAI,+BAA+B,GAAG,CAAC,CAAC,EAAE;oBACxC,YAAM,CAAC,IAAI,CACT;wBACE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;wBAC9D,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;6BAC1D,YAAY;qBAChB,EACD,
|
|
1
|
+
{"version":3,"file":"mainWatcher.js","sourceRoot":"","sources":["../../../../lib/client/connectionsManager/mainWatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ async function getServerId(config, brokerToken, brokerClientId) {
|
|
|
27
27
|
}
|
|
28
28
|
catch (err) {
|
|
29
29
|
const timeout = 2 ** attempt * 30000;
|
|
30
|
-
logger_1.log.warn({ attempt, timeout }, `
|
|
30
|
+
logger_1.log.warn({ attempt, timeout }, `Waiting for ${timeout}ms before next Broker Dispatcher API call.`);
|
|
31
31
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, timeout);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAClD,oDAAqD;AACrD,sCAA2D;AAC3D,6DAA2E;AAEpE,KAAK,UAAU,WAAW,CAC/B,MAAW,EACX,WAAmB,EACnB,cAAsB;IAEtB,IAAI,CAAC,WAAW,EAAE;QAChB,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACpC,MAAM,KAAK,CAAC;KACb;IAED,MAAM,MAAM,GAAG,IAAI,iCAA2B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI;YACF,OAAO,MAAM,IAAA,8CAAyB,EACpC,MAAM,EACN;gBACE,cAAc,EAAE,cAAc;gBAC9B,iBAAiB,EAAE,WAAW;aAC/B,EACD;gBACE,mBAAmB,EAAE,GACnB,MAAM,CAAC,sBAAsB,IAAI,oBACnC,EAAE;gBACF,uBAAuB,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;aAC7C,EACD,MAAM,CACP,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,CAAC;YACrC,YAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,OAAO,EAAE,EACpB,eAAe,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAClD,oDAAqD;AACrD,sCAA2D;AAC3D,6DAA2E;AAEpE,KAAK,UAAU,WAAW,CAC/B,MAAW,EACX,WAAmB,EACnB,cAAsB;IAEtB,IAAI,CAAC,WAAW,EAAE;QAChB,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACpC,MAAM,KAAK,CAAC;KACb;IAED,MAAM,MAAM,GAAG,IAAI,iCAA2B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI;YACF,OAAO,MAAM,IAAA,8CAAyB,EACpC,MAAM,EACN;gBACE,cAAc,EAAE,cAAc;gBAC9B,iBAAiB,EAAE,WAAW;aAC/B,EACD;gBACE,mBAAmB,EAAE,GACnB,MAAM,CAAC,sBAAsB,IAAI,oBACnC,EAAE;gBACF,uBAAuB,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE;aAC7C,EACD,MAAM,CACP,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,CAAC;YACrC,YAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,OAAO,EAAE,EACpB,eAAe,OAAO,4CAA4C,CACnE,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;SACvE;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA7CD,kCA6CC"}
|