snyk-broker 5.16.3 → 5.17.5
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/client-templates/gitlab/accept.json.sample +6 -0
- package/dist/lib/broker-workload/clientLocalRequests.js +1 -2
- package/dist/lib/broker-workload/clientLocalRequests.js.map +1 -1
- package/dist/lib/broker-workload/prepareRequest.js +6 -0
- package/dist/lib/broker-workload/prepareRequest.js.map +1 -1
- package/dist/lib/broker-workload/websocketRequests.js +8 -8
- package/dist/lib/broker-workload/websocketRequests.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/auth/oauth.js +6 -5
- package/dist/lib/hybrid-sdk/client/auth/oauth.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/abstractBrokerPlugin.js +9 -4
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/abstractBrokerPlugin.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/pluginManager.js +18 -4
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/pluginManager.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js +15 -6
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/plugins/githubServerAppAuth.js +22 -11
- package/dist/lib/hybrid-sdk/client/brokerClientPlugins/plugins/githubServerAppAuth.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/checks/config/brokerClientUrlCheck.js +39 -33
- package/dist/lib/hybrid-sdk/client/checks/config/brokerClientUrlCheck.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/checks/config/brokerServerUrlCheck.js +5 -3
- package/dist/lib/hybrid-sdk/client/checks/config/brokerServerUrlCheck.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/checks/config/workloadConfiguration.js +5 -2
- package/dist/lib/hybrid-sdk/client/checks/config/workloadConfiguration.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/checks/http/http-executor.js +5 -3
- package/dist/lib/hybrid-sdk/client/checks/http/http-executor.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/config/remoteConfig.js +5 -0
- package/dist/lib/hybrid-sdk/client/config/remoteConfig.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js +2 -2
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/remoteConnectionSync.js +23 -3
- package/dist/lib/hybrid-sdk/client/connectionsManager/remoteConnectionSync.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/synchronizer.js +57 -8
- package/dist/lib/hybrid-sdk/client/connectionsManager/synchronizer.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/dispatcher/client/api.js +2 -0
- package/dist/lib/hybrid-sdk/client/dispatcher/client/api.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/index.js +21 -16
- package/dist/lib/hybrid-sdk/client/index.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/metrics/noopClient.js +1 -0
- package/dist/lib/hybrid-sdk/client/metrics/noopClient.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/metrics/otelClient.js +7 -0
- package/dist/lib/hybrid-sdk/client/metrics/otelClient.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/routesHandler/websocketConnectionMiddlewares.js +2 -4
- package/dist/lib/hybrid-sdk/client/routesHandler/websocketConnectionMiddlewares.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/errorHandler.js +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/errorHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/serviceHandler.js +5 -3
- package/dist/lib/hybrid-sdk/client/socketHandlers/serviceHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js +16 -8
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/connectionToWorkloadInterface/forwardWebsocketRequest.js +8 -0
- package/dist/lib/hybrid-sdk/common/connectionToWorkloadInterface/forwardWebsocketRequest.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/filter/filter-rules-loading.js +6 -5
- package/dist/lib/hybrid-sdk/common/filter/filter-rules-loading.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/filter/filtersAsync.js +2 -2
- package/dist/lib/hybrid-sdk/common/filter/filtersAsync.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/http/middleware/requestId.js +60 -0
- package/dist/lib/hybrid-sdk/common/http/middleware/requestId.js.map +1 -0
- package/dist/lib/hybrid-sdk/common/http/webserver.js +5 -4
- package/dist/lib/hybrid-sdk/common/http/webserver.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/utils/signals.js +41 -7
- package/dist/lib/hybrid-sdk/common/utils/signals.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/utils/token.js +6 -1
- package/dist/lib/hybrid-sdk/common/utils/token.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/utils/uuid.js +13 -0
- package/dist/lib/hybrid-sdk/common/utils/uuid.js.map +1 -0
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js +18 -3
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/request.js +19 -27
- package/dist/lib/hybrid-sdk/http/request.js.map +1 -1
- package/dist/lib/hybrid-sdk/requestsHelper.js +7 -3
- package/dist/lib/hybrid-sdk/requestsHelper.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/broker-middleware.js +6 -3
- package/dist/lib/hybrid-sdk/server/broker-middleware.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.js +4 -3
- package/dist/lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js +5 -4
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/postResponseHandler.js +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/postResponseHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socket.js +2 -0
- package/dist/lib/hybrid-sdk/server/socket.js.map +1 -1
- package/dist/lib/logs/log.js +1 -1
- package/dist/lib/logs/log.js.map +1 -1
- package/dist/lib/logs/logger.js +33 -37
- package/dist/lib/logs/logger.js.map +1 -1
- package/dist/lib/logs/redact.js +130 -0
- package/dist/lib/logs/redact.js.map +1 -0
- package/dist/package.json +7 -7
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -6
|
@@ -1671,6 +1671,12 @@
|
|
|
1671
1671
|
"method": "GET",
|
|
1672
1672
|
"path": "/api/v4/projects/:project/repository/compare",
|
|
1673
1673
|
"origin": "https://${GITLAB}"
|
|
1674
|
+
},
|
|
1675
|
+
{
|
|
1676
|
+
"//": "used to proxy GraphQL requests to GitLab",
|
|
1677
|
+
"method": "POST",
|
|
1678
|
+
"path": "/api/graphql",
|
|
1679
|
+
"origin": "https://${GITLAB}"
|
|
1674
1680
|
}
|
|
1675
1681
|
]
|
|
1676
1682
|
}
|
|
@@ -5,7 +5,6 @@ const clientRequestHelpers_1 = require("../hybrid-sdk/clientRequestHelpers");
|
|
|
5
5
|
const requestFiltering_1 = require("./requestFiltering");
|
|
6
6
|
const logger_1 = require("../logs/logger");
|
|
7
7
|
const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateRequestWithConfigData");
|
|
8
|
-
const node_crypto_1 = require("node:crypto");
|
|
9
8
|
const workloadFactory_1 = require("../hybrid-sdk/workloadFactory");
|
|
10
9
|
const metrics_1 = require("../hybrid-sdk/common/utils/metrics");
|
|
11
10
|
const noopClient_1 = require("../hybrid-sdk/client/metrics/noopClient");
|
|
@@ -42,7 +41,7 @@ class BrokerClientRequestWorkload extends workloadFactory_1.Workload {
|
|
|
42
41
|
responseMedium: this.req.headers['x-broker-ws-response']
|
|
43
42
|
? 'websocket'
|
|
44
43
|
: 'http',
|
|
45
|
-
requestId:
|
|
44
|
+
requestId: this.req.requestId,
|
|
46
45
|
};
|
|
47
46
|
if (!matchedFilterRule) {
|
|
48
47
|
(0, metrics_1.incrementHttpRequestsTotal)(true, 'inbound-request');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLocalRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientLocalRequests.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAEhF,yDAAyD;AACzD,2CAA+C;AAC/C,qGAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"clientLocalRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientLocalRequests.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,6 +79,11 @@ const prepareRequest = async (result, payload, logContext, options, brokerToken,
|
|
|
79
79
|
delete payload.headers['forwarded'];
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
+
// Propagate under the generic x-request-id header for downstream services
|
|
83
|
+
// that do not read the snyk-specific header.
|
|
84
|
+
if (payload.headers['snyk-request-id'] && !payload.headers['x-request-id']) {
|
|
85
|
+
payload.headers['x-request-id'] = payload.headers['snyk-request-id'];
|
|
86
|
+
}
|
|
82
87
|
if (brokerToken && socketType === 'server') {
|
|
83
88
|
Object.assign(payload.headers, { 'X-Broker-Token': brokerToken });
|
|
84
89
|
}
|
|
@@ -149,6 +154,7 @@ const prepareRequest = async (result, payload, logContext, options, brokerToken,
|
|
|
149
154
|
url: result.url,
|
|
150
155
|
headers: payload.headers,
|
|
151
156
|
method: payload.method,
|
|
157
|
+
requestId: payload.requestId,
|
|
152
158
|
};
|
|
153
159
|
if (payload.body) {
|
|
154
160
|
req.body = payload.body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAoC;AACpC,2CAA+C;AAC/C,kDAKkC;AAClC,qDAAwD;AACxD,uEAImC;AAEnC,qEAA+E;AAE/E,iFAAyD;
|
|
1
|
+
{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,12 +60,8 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
60
60
|
? 'websocket'
|
|
61
61
|
: 'http',
|
|
62
62
|
...correlationHeaders,
|
|
63
|
+
requestId: payload.requestId,
|
|
63
64
|
};
|
|
64
|
-
if (!correlationHeaders.requestId) {
|
|
65
|
-
// This should be a warning but older clients won't send one
|
|
66
|
-
// TODO make this a warning when significant majority of clients are on latest version
|
|
67
|
-
logger_1.log.debug(logContext, 'Header Snyk-Request-Id not included in headers passed through');
|
|
68
|
-
}
|
|
69
65
|
const responseHandler = new responseSenders_1.HybridResponseHandler({
|
|
70
66
|
connectionIdentifier: this.connectionIdentifier,
|
|
71
67
|
payloadStreamingId: payload.streamingID,
|
|
@@ -73,7 +69,7 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
73
69
|
}, this.websocketConnectionHandler, websocketResponseHandler, this.options.config, logContext);
|
|
74
70
|
const simplifiedContext = structuredClone(logContext);
|
|
75
71
|
delete simplifiedContext.requestHeaders;
|
|
76
|
-
logger_1.log.
|
|
72
|
+
logger_1.log.debug(simplifiedContext, `[Websocket Flow] Received request from ${process.env.BROKER_TYPE == 'client' ? 'client' : 'server'}`);
|
|
77
73
|
const metricsClient = this.options.metricsClient;
|
|
78
74
|
const matchedFilterRule = (0, requestFiltering_1.filterRequest)(payload, this.options, this.websocketConnectionHandler);
|
|
79
75
|
if (!matchedFilterRule) {
|
|
@@ -142,12 +138,16 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
142
138
|
metricsClient?.recordDownstreamDuration(false, (performance.now() - start) / 1000);
|
|
143
139
|
metricsClient?.recordDownstreamStatus(statusClass(response?.statusCode));
|
|
144
140
|
const status = (response && response.statusCode) || 500;
|
|
145
|
-
|
|
141
|
+
// Threshold matches downstream-post-stream-to-server.ts: surface
|
|
142
|
+
// 401/403 and all 5xx (customer-actionable auth/scope/upstream
|
|
143
|
+
// issues) but skip 404, which is often a probe on the happy path.
|
|
144
|
+
// Prior `status > 404` accidentally also silenced 401/402/403.
|
|
145
|
+
if (status >= 400 && status !== 404) {
|
|
146
146
|
logger_1.log.warn({
|
|
147
147
|
statusCode: response.statusCode,
|
|
148
148
|
url: preparedRequest.req.url,
|
|
149
149
|
requestId: logContext.requestId,
|
|
150
|
-
}, `[Websocket Flow][Inbound]
|
|
150
|
+
}, `[Websocket Flow][Inbound] Non-2xx response from downstream SCM.`);
|
|
151
151
|
}
|
|
152
152
|
responseHandler.sendDataResponse(response, logContext);
|
|
153
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/websocketRequests.ts"],"names":[],"mappings":";;;AAAA,0FAA8F;AAC9F,qDAAwD;AACxD,uEAAgE;AAEhE,2CAA+C;AAC/C,mEAAsE;AACtE,+DAAsE;AACtE,yDAAmD;AACnD,wDAGoC;AACpC,qCAAuC;AACvC,qGAAwF;AACxF,mEAIuC;AACvC,qDAAkD;AAElD,gEAG4C;AAE5C,4DAAwE;AAIxE,0CAA0C;AAC1C,SAAS,WAAW,CAAC,UAA8B;IACjD,OAAO,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC;AAUD;;;;GAIG;AACH,MAAa,cAAe,SAAQ,0BAAmC;IAIrE,YACE,oBAA4B,EAC5B,OAA8B,EAC9B,0BAAiE;QAEjE,KAAK,CAAC,QAAQ,EAAE,8BAAY,CAAC,eAAe,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAuC;QACnD,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;QAE3C,iBAAiB;QACjB,MAAM,cAAc,GAClB,wEAAwE,CAAC;QAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;SACvD;QACD,wBAAwB;QAExB,MAAM,wBAAwB,GAAG,gBAAgB,CAAC;QAClD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE;YAC9C,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC1D;QACD,MAAM,kBAAkB,GAAG,IAAA,mDAA6B,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAE/C,CAAC;QAEd,MAAM,UAAU,GAAuB;YACrC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,cAAc,EAAE,IAAI,CAAC,0BAA0B,CAAC,YAAY,IAAI,EAAE;YAClE,SAAS;YACT,aAAa,EAAE,OAAO,CAAC,MAAM;YAC7B,cAAc,EAAE,OAAO,CAAC,OAAO;YAC/B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,IAAA,iBAAS,EAAC,IAAI,CAAC,oBAAoB,CAAC;YACjD,WAAW,EAAE,IAAA,iBAAS,EAAC,IAAI,CAAC,oBAAoB,CAAC;YACjD,SAAS,EACP,IAAI,CAAC,0BAA0B,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,SAAS;YACvE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBACrD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,MAAM;YACV,GAAG,kBAAkB;
|
|
1
|
+
{"version":3,"file":"websocketRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/websocketRequests.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ async function fetchAndUpdateJwt(apiHostname, clientId, clientSecret) {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
exports.fetchAndUpdateJwt = fetchAndUpdateJwt;
|
|
49
|
-
const refreshJwt = async (clientConfig, clientId, clientSecret) => {
|
|
49
|
+
const refreshJwt = async (clientConfig, clientId, clientSecret, metricsClient) => {
|
|
50
50
|
logger_1.log.debug({}, 'Refreshing oauth access token');
|
|
51
51
|
try {
|
|
52
52
|
const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
|
|
@@ -58,19 +58,20 @@ const refreshJwt = async (clientConfig, clientId, clientSecret) => {
|
|
|
58
58
|
authHeader: newJwt.authHeader,
|
|
59
59
|
});
|
|
60
60
|
setTimeout(async () => {
|
|
61
|
-
refreshJwt(clientConfig, clientId, clientSecret);
|
|
61
|
+
refreshJwt(clientConfig, clientId, clientSecret, metricsClient);
|
|
62
62
|
}, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
|
|
63
63
|
}
|
|
64
64
|
catch (err) {
|
|
65
|
-
|
|
65
|
+
metricsClient?.recordJwtRefreshFailure();
|
|
66
|
+
logger_1.log.error({ err }, 'Error retrieving new JWT');
|
|
66
67
|
}
|
|
67
68
|
};
|
|
68
|
-
const setfetchAndUpdateJwt = async (clientConfig, clientId, clientSecret) => {
|
|
69
|
+
const setfetchAndUpdateJwt = async (clientConfig, clientId, clientSecret, metricsClient) => {
|
|
69
70
|
const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
|
|
70
71
|
logger_1.log.debug({}, 'Setting auth updater.');
|
|
71
72
|
if (newJwt) {
|
|
72
73
|
setTimeout(async () => {
|
|
73
|
-
refreshJwt(clientConfig, clientId, clientSecret);
|
|
74
|
+
refreshJwt(clientConfig, clientId, clientSecret, metricsClient);
|
|
74
75
|
}, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
|
|
75
76
|
}
|
|
76
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/auth/oauth.ts"],"names":[],"mappings":";;;AACA,gDAA6D;AAC7D,iDAAqD;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/auth/oauth.ts"],"names":[],"mappings":";;;AACA,gDAA6D;AAC7D,iDAAqD;AAUrD,MAAM,UAAU,GAAwB,EAAE,CAAC;AAEpC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,EAAE;IAC9D,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC1B,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,KAAK,UAAU,iBAAiB,CACrC,WAAmB,EACnB,QAAgB,EAChB,YAAoB;IAEpB,IAAI;QACF,MAAM,IAAI,GAAG;YACX,UAAU,EAAE,oBAAoB;YAChC,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;SAC5B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,OAAO,GAA8B;YACzC,GAAG,EAAE,GAAG,WAAW,eAAe;YAClC,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;YAChE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC1B,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,aAAa,CAAC,UAAU,IAAI,GAAG,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,IAAI,KAAK,CACb,GAAG,aAAa,CAAC,UAAU,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAChF,CAAC;SACH;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,aAAa,CAAC,IAAI,CACM,CAAC;QAC3B,MAAM,GAAG,GAAG,eAAe,CAAC,YAAY,CAAC;QACzC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC;QACxC,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC;QAE7C,IAAA,wBAAgB,EAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE;SAC7B,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;KAC/D;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAC;KACjD;AACH,CAAC;AAzCD,8CAyCC;AAED,MAAM,UAAU,GAAG,KAAK,EACtB,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAA6B,EAC7B,EAAE;IACF,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,+BAA+B,CAAC,CAAC;IAClD,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,YAAY,CAAC,WAAW,EACxB,QAAQ,EACR,YAAY,CACb,CAAC;QACF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;QACD,IAAA,wBAAgB,EAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC,EAAE,YAAY,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;KAC7E;IAAC,OAAO,GAAG,EAAE;QACZ,aAAa,EAAE,uBAAuB,EAAE,CAAC;QACzC,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,0BAA0B,CAAC,CAAC;KACnD;AACH,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACvC,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAA6B,EAC7B,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,YAAY,CAAC,WAAW,EACxB,QAAQ,EACR,YAAY,CACb,CAAC;IACF,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,uBAAuB,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC,EAAE,YAAY,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;KAC7E;AACH,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const pluginsConfig_1 = require("../../common/config/pluginsConfig");
|
|
4
4
|
const request_1 = require("../../http/request");
|
|
5
5
|
const logger_1 = require("../../../logs/logger");
|
|
6
|
+
const redact_1 = require("../../../logs/redact");
|
|
6
7
|
class BrokerPlugin {
|
|
7
8
|
constructor(brokerClientCfg) {
|
|
8
9
|
this.logger = logger_1.log;
|
|
@@ -40,10 +41,14 @@ class BrokerPlugin {
|
|
|
40
41
|
(0, pluginsConfig_1.setPluginConfigParamByConnectionKeyAndContextId)(connectionKey, contextId, paramName, value);
|
|
41
42
|
}
|
|
42
43
|
async preRequest(connectionConfiguration, postFilterPreparedRequest, pluginConfig) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
// Guard the redactConfig calls — preRequest is per-request hot path, and
|
|
45
|
+
// arguments evaluate before the trace call short-circuits internally.
|
|
46
|
+
if (logger_1.log.trace()) {
|
|
47
|
+
logger_1.log.trace({
|
|
48
|
+
connectionConfig: (0, redact_1.redactConfig)(connectionConfiguration),
|
|
49
|
+
pluginsConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
50
|
+
}, 'Abstract preRequest Plugin');
|
|
51
|
+
}
|
|
47
52
|
return postFilterPreparedRequest;
|
|
48
53
|
}
|
|
49
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AACA,qEAQ2C;AAC3C,gDAA2E;AAC3E,iDAAqD;
|
|
1
|
+
{"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AACA,qEAQ2C;AAC3C,gDAA2E;AAC3E,iDAAqD;AACrD,iDAAoD;AAEpD,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;IAED,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;IAED,eAAe;QACb,OAAO,IAAA,gCAAgB,GAAE,CAAC;IAC5B,CAAC;IAED,4BAA4B,CAAC,aAAqB;QAChD,OAAO,IAAA,8CAA8B,EAAC,aAAa,CAAC,CAAC;IACvD,CAAC;IAED,iCAAiC,CAAC,aAAqB,EAAE,SAAiB;QACxE,OAAO,IAAA,mDAAmC,EAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,wCAAwC,CACtC,aAAqB,EACrB,SAAiB,EACjB,SAAiB;QAEjB,OAAO,IAAA,+DAA+C,EACpD,aAAa,EACb,SAAS,EACT,SAAS,CACV,CAAC;IACJ,CAAC;IAED,iCAAiC,CAC/B,aAAqB,EACrB,SAAiB,EACjB,KAAU;QAEV,IAAA,mDAAmC,EAAC,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,wCAAwC,CACtC,aAAqB,EACrB,SAAiB,EACjB,SAAiB,EACjB,KAAU;QAEV,IAAA,+DAA+C,EAC7C,aAAa,EACb,SAAS,EACT,SAAS,EACT,KAAK,CACN,CAAC;IACJ,CAAC;IA6BD,KAAK,CAAC,UAAU,CACd,uBAA4C,EAC5C,yBAAoD,EACpD,YAAqC;QAErC,yEAAyE;QACzE,sEAAsE;QACtE,IAAI,YAAM,CAAC,KAAK,EAAE,EAAE;YAClB,YAAM,CAAC,KAAK,CACV;gBACE,gBAAgB,EAAE,IAAA,qBAAY,EAAC,uBAAuB,CAAC;gBACvD,aAAa,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC;aAC1C,EACD,4BAA4B,CAC7B,CAAC;SACH;QACD,OAAO,yBAAyB,CAAC;IACnC,CAAC;CACF;AAjID,+BAiIC"}
|
|
@@ -29,6 +29,18 @@ const logger_1 = require("../../../logs/logger");
|
|
|
29
29
|
const fs_1 = require("fs");
|
|
30
30
|
const pluginsConfig_1 = require("../../common/config/pluginsConfig");
|
|
31
31
|
const universal_1 = require("../../common/config/universal");
|
|
32
|
+
/**
|
|
33
|
+
* Loads broker plugins from the given folder into clientOpts.config.plugins.
|
|
34
|
+
*
|
|
35
|
+
* On failure, throws — either the original Error (with its message prefixed
|
|
36
|
+
* by "Error loading plugins from {path}: ") or, if the underlying throwable
|
|
37
|
+
* was not an Error, a fresh Error with the original preserved via
|
|
38
|
+
* `Error.cause`. The local catch deliberately does NOT log — callers must
|
|
39
|
+
* structurally log the thrown err so its stack, code, and cause survive
|
|
40
|
+
* (e.g. `logger.warn({ err }, '...')`, not `logger.warn('...: ' + err)`).
|
|
41
|
+
* The only caller today (lib/hybrid-sdk/client/index.ts main()) does this
|
|
42
|
+
* correctly; any new caller must follow the same shape.
|
|
43
|
+
*/
|
|
32
44
|
const loadPlugins = async (pluginsFolderPath, clientOpts) => {
|
|
33
45
|
var _a;
|
|
34
46
|
clientOpts.config['plugins'] = new Map();
|
|
@@ -47,7 +59,7 @@ const loadPlugins = async (pluginsFolderPath, clientOpts) => {
|
|
|
47
59
|
applicableBrokerTypes.forEach((applicableBrokerType) => {
|
|
48
60
|
if (!pluginInstance.isDisabled(clientOpts.config) &&
|
|
49
61
|
pluginInstance.isPluginActive()) {
|
|
50
|
-
logger_1.log.
|
|
62
|
+
logger_1.log.info({}, `Loading plugin ${pluginInstance.pluginName}`);
|
|
51
63
|
const configPluginForCurrentType = clientOpts.config.plugins.get(applicableBrokerType);
|
|
52
64
|
if (configPluginForCurrentType.some((x) => x.pluginCode === pluginInstance.pluginCode ||
|
|
53
65
|
x.pluginName === pluginInstance.pluginName)) {
|
|
@@ -66,9 +78,11 @@ const loadPlugins = async (pluginsFolderPath, clientOpts) => {
|
|
|
66
78
|
return clientOpts.config['plugins'];
|
|
67
79
|
}
|
|
68
80
|
catch (err) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
81
|
+
if (err instanceof Error) {
|
|
82
|
+
err.message = `Error loading plugins from ${pluginsFolderPath}: ${err.message}`;
|
|
83
|
+
throw err;
|
|
84
|
+
}
|
|
85
|
+
throw new Error(`Error loading plugins from ${pluginsFolderPath}: ${String(err)}`, { cause: err });
|
|
72
86
|
}
|
|
73
87
|
};
|
|
74
88
|
exports.loadPlugins = loadPlugins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginManager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/brokerClientPlugins/pluginManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAsC;AACtC,iDAAqD;AAErD,2BAAgC;AAChC,qEAG2C;AAE3C,6DAAuE;
|
|
1
|
+
{"version":3,"file":"pluginManager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/brokerClientPlugins/pluginManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Plugin = void 0;
|
|
7
7
|
const abstractBrokerPlugin_1 = __importDefault(require("../abstractBrokerPlugin"));
|
|
8
|
+
const redact_1 = require("../../../../logs/redact");
|
|
8
9
|
class Plugin extends abstractBrokerPlugin_1.default {
|
|
9
10
|
constructor() {
|
|
10
11
|
super(...arguments);
|
|
@@ -35,11 +36,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
35
36
|
!this.applicableBrokerTypes.includes(connectionConfig.type)) {
|
|
36
37
|
throw new Error(`Plugin ${this.pluginCode} startup failure: unknown container registry type: ${connectionConfig.type ?? '<not provided>'}.`);
|
|
37
38
|
}
|
|
38
|
-
this.logger.trace({
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
if (this.logger.trace()) {
|
|
40
|
+
this.logger.trace({
|
|
41
|
+
plugin: this.pluginCode,
|
|
42
|
+
config: (0, redact_1.redactConfig)(connectionConfig),
|
|
43
|
+
pluginConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
44
|
+
}, 'Connection Config passed to the plugin');
|
|
45
|
+
}
|
|
43
46
|
const credentials = Buffer.from(this._getCredentials(connectionConfig)).toString('base64');
|
|
44
47
|
this.setPluginConfigParamForConnection(connectionKey, 'CR_CREDENTIALS', credentials);
|
|
45
48
|
if (connectionConfig && connectionConfig.BROKER_CLIENT_VALIDATION_URL) {
|
|
@@ -47,7 +50,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
47
50
|
}
|
|
48
51
|
}
|
|
49
52
|
async startUpContext(connectionKey, contextId, connectionConfiguration, pluginConfig) {
|
|
50
|
-
this.logger.debug({
|
|
53
|
+
if (this.logger.debug()) {
|
|
54
|
+
this.logger.debug({
|
|
55
|
+
contextId,
|
|
56
|
+
connectionConfiguration: (0, redact_1.redactConfig)(connectionConfiguration),
|
|
57
|
+
pluginConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
51
60
|
if (!connectionConfiguration.type ||
|
|
52
61
|
!this.applicableBrokerTypes.includes(connectionConfiguration.type)) {
|
|
53
62
|
throw new Error(`Plugin ${this.pluginCode} startup failure: unknown container registry type: ${connectionConfiguration.type ?? '<not provided>'}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRegistryCredentialsFormatting.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.ts"],"names":[],"mappings":";;;;;;AAAA,mFAAmD;
|
|
1
|
+
{"version":3,"file":"containerRegistryCredentialsFormatting.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/brokerClientPlugins/plugins/containerRegistryCredentialsFormatting.ts"],"names":[],"mappings":";;;;;;AAAA,mFAAmD;AAEnD,oDAAuD;AAEvD,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;IAyIJ,CAAC;IAvIC,cAAc;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO,CACX,aAAqB,EACrB,gBAAgB,EAChB,YAAoC;QAEpC,IACE,CAAC,gBAAgB,CAAC,IAAI;YACtB,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC3D;YACA,MAAM,IAAI,KAAK,CACb,UACE,IAAI,CAAC,UACP,sDACE,gBAAgB,CAAC,IAAI,IAAI,gBAC3B,GAAG,CACJ,CAAC;SACH;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf;gBACE,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,IAAA,qBAAY,EAAC,gBAAgB,CAAC;gBACtC,YAAY,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC;aACzC,EACD,wCAAwC,CACzC,CAAC;SACH;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,CACvC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,IAAI,CAAC,iCAAiC,CACpC,aAAa,EACb,gBAAgB,EAChB,WAAW,CACZ,CAAC;QAEF,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,4BAA4B,EAAE;YACrE,IAAI,CAAC,iCAAiC,CACpC,aAAa,EACb,8BAA8B,EAC9B,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,aAAqB,EACrB,SAAiB,EACjB,uBAA4C,EAC5C,YAAoC;QAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAChB,SAAS;gBACT,uBAAuB,EAAE,IAAA,qBAAY,EAAC,uBAAuB,CAAC;gBAC9D,YAAY,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC;aACzC,CAAC,CAAC;SACJ;QACD,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,kBAAkB;QAClB,wGAAwG;QACxG,kGAAkG;QAClG,gDAAgD;QAChD,uEAAuE;QACvE,mEAAmE;QACnE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAC9C,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,IAAI,CAAC,wCAAwC,CAC3C,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,WAAW,CACZ,CAAC;QAEF,IAAI,uBAAuB,CAAC,4BAA4B,EAAE;YACxD,IAAI,CAAC,wCAAwC,CAC3C,aAAa,EACb,SAAS,EACT,8BAA8B,EAC9B,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAED,eAAe,CAAC,MAAM;QACpB,IAAI,WAAW,CAAC;QAChB,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,KAAK;gBACR,IACE,CAAC,MAAM,CAAC,WAAW;oBACnB,CAAC,MAAM,CAAC,SAAS;oBACjB,CAAC,MAAM,CAAC,cAAc,EACtB;oBACA,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,MAAM,CAAC,IAAI,gFAAgF,CAC1I,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,MAAM,CAAC,IAAI,gBAAgB,MAAM,CAAC,WAAW,wBAAwB,MAAM,CAAC,SAAS,mBAAmB,MAAM,CAAC,cAAc,OAAO,CAAC;gBAC/J,MAAM;YACR,KAAK,iBAAiB;gBACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACpB,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,MAAM,CAAC,IAAI,+CAA+C,CACzG,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,MAAM,CAAC,IAAI,kBAAkB,MAAM,CAAC,QAAQ,kBAAkB,MAAM,CAAC,QAAQ,sBAAsB,MAAM,CAAC,OAAO,MAAM,CAAC;gBAClJ,MAAM;YACR;gBACE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;oBAC9C,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,CAAC,UAAU,qBAAqB,MAAM,CAAC,IAAI,8DAA8D,CACxH,CAAC;iBACH;gBACD,WAAW,GAAG,YAAY,MAAM,CAAC,IAAI,kBAAkB,MAAM,CAAC,WAAW,kBAAkB,MAAM,CAAC,WAAW,sBAAsB,MAAM,CAAC,OAAO,MAAM,CAAC;SAC3J;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AA5JD,wBA4JC"}
|
|
@@ -11,6 +11,7 @@ const jsonwebtoken_1 = require("jsonwebtoken");
|
|
|
11
11
|
const request_1 = require("../../../http/request");
|
|
12
12
|
const token_1 = require("../../../common/utils/token");
|
|
13
13
|
const replace_vars_1 = require("../../../common/utils/replace-vars");
|
|
14
|
+
const redact_1 = require("../../../../logs/redact");
|
|
14
15
|
class Plugin extends abstractBrokerPlugin_1.default {
|
|
15
16
|
constructor() {
|
|
16
17
|
super(...arguments);
|
|
@@ -34,11 +35,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
34
35
|
try {
|
|
35
36
|
const connectionName = connectionConfig.friendlyName;
|
|
36
37
|
this.logger.info({ plugin: this.pluginName, connectionName }, 'Running Startup.');
|
|
37
|
-
this.logger.trace({
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
if (this.logger.trace()) {
|
|
39
|
+
this.logger.trace({
|
|
40
|
+
plugin: this.pluginCode,
|
|
41
|
+
config: (0, redact_1.redactConfig)(connectionConfig),
|
|
42
|
+
pluginConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
43
|
+
}, 'Connection Config passed to the plugin');
|
|
44
|
+
}
|
|
42
45
|
if (connectionConfig &&
|
|
43
46
|
(!connectionConfig.GITHUB_APP_CLIENT_ID ||
|
|
44
47
|
!connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH ||
|
|
@@ -82,14 +85,22 @@ class Plugin extends abstractBrokerPlugin_1.default {
|
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
async startUpContext(connectionKey, contextId, connectionConfiguration, pluginConfig) {
|
|
85
|
-
this.logger.debug({
|
|
88
|
+
if (this.logger.debug()) {
|
|
89
|
+
this.logger.debug({
|
|
90
|
+
contextId,
|
|
91
|
+
connectionConfiguration: (0, redact_1.redactConfig)(connectionConfiguration),
|
|
92
|
+
pluginConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
93
|
+
});
|
|
94
|
+
}
|
|
86
95
|
try {
|
|
87
96
|
this.logger.info({ plugin: this.pluginName, connectionKey }, 'Running Startup.');
|
|
88
|
-
this.logger.trace({
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
97
|
+
if (this.logger.trace()) {
|
|
98
|
+
this.logger.trace({
|
|
99
|
+
plugin: this.pluginCode,
|
|
100
|
+
config: (0, redact_1.redactConfig)(connectionConfiguration),
|
|
101
|
+
pluginConfig: (0, redact_1.redactConfig)(pluginConfig),
|
|
102
|
+
}, 'Connection Config passed to the plugin');
|
|
103
|
+
}
|
|
93
104
|
if (connectionConfiguration &&
|
|
94
105
|
(!connectionConfiguration.GITHUB_APP_CLIENT_ID ||
|
|
95
106
|
!connectionConfiguration.GITHUB_APP_PRIVATE_PEM_PATH ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,21 @@ async function validateBrokerClientUrl(checkOptions, config) {
|
|
|
17
17
|
output: `Broker Client URL must use the HTTP or HTTPS protocols. Configured URL: ${brokerClientUrl}`,
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
if (isHttpsWithoutCertificates(config)
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
20
|
+
if (isHttpsWithoutCertificates(config)) {
|
|
21
|
+
const tls = await checkTLSTermination(config);
|
|
22
|
+
if (!tls.terminated) {
|
|
23
|
+
return {
|
|
24
|
+
id: checkOptions.id,
|
|
25
|
+
name: checkOptions.name,
|
|
26
|
+
status: 'error',
|
|
27
|
+
output: `Broker Client URL uses the HTTPS protocol: ${brokerClientUrl}, ` +
|
|
28
|
+
`but the broker could not verify how TLS is being terminated. ` +
|
|
29
|
+
`Probe to ${brokerClientUrl}/healthcheck failed: ${tls.probeError}. ` +
|
|
30
|
+
`Either configure HTTPS_CERT and HTTPS_KEY so the broker terminates TLS itself, ` +
|
|
31
|
+
`or set BROKER_CLIENT_URL_TLS_TERMINATED=true if TLS is already terminated upstream ` +
|
|
32
|
+
`(e.g. behind a reverse proxy).`,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
28
35
|
}
|
|
29
36
|
if (brokerClientUrl && isHostnameLocalhost(brokerClientUrl)) {
|
|
30
37
|
return {
|
|
@@ -42,9 +49,11 @@ async function validateBrokerClientUrl(checkOptions, config) {
|
|
|
42
49
|
};
|
|
43
50
|
}
|
|
44
51
|
catch (error) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
52
|
+
if (error instanceof Error) {
|
|
53
|
+
error.message = `Error executing check with checkId ${checkOptions.id}: ${error.message}`;
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
throw new Error(`Error executing check with checkId ${checkOptions.id}: ${String(error)}`, { cause: error });
|
|
48
57
|
}
|
|
49
58
|
}
|
|
50
59
|
exports.validateBrokerClientUrl = validateBrokerClientUrl;
|
|
@@ -65,31 +74,28 @@ function isHttpsWithoutCertificates(config) {
|
|
|
65
74
|
return false;
|
|
66
75
|
}
|
|
67
76
|
}
|
|
68
|
-
async function
|
|
69
|
-
let isTLSTerminated = false;
|
|
77
|
+
async function checkTLSTermination(config) {
|
|
70
78
|
if (config.BROKER_CLIENT_URL_TLS_TERMINATED) {
|
|
71
|
-
|
|
79
|
+
return { terminated: true };
|
|
72
80
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
81
|
+
const request = {
|
|
82
|
+
url: `${config.BROKER_CLIENT_URL}/healthcheck`,
|
|
83
|
+
method: 'GET',
|
|
84
|
+
headers: {
|
|
85
|
+
Accept: 'application/json',
|
|
86
|
+
'Content-Type': 'application/json',
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
try {
|
|
90
|
+
const response = await (0, exponential_backoff_1.retry)(() => (0, request_1.makeSingleRawRequestToDownstream)(request), { retries: 3, operation: 'config check broker-client-url-validation' });
|
|
91
|
+
logger_1.log.trace({ response: response }, 'config check raw response data');
|
|
92
|
+
return { terminated: true };
|
|
93
|
+
}
|
|
94
|
+
catch (err) {
|
|
95
|
+
const cause = err instanceof Error ? err.message : String(err);
|
|
96
|
+
logger_1.log.warn({ err, url: request.url }, `Failed to reach the BROKER_CLIENT_URL during TLS-termination probe: ${cause}.`);
|
|
97
|
+
return { terminated: false, probeError: cause };
|
|
91
98
|
}
|
|
92
|
-
return isTLSTerminated;
|
|
93
99
|
}
|
|
94
100
|
function isHostnameLocalhost(brokerClientUrl) {
|
|
95
101
|
logger_1.log.trace({ url: brokerClientUrl }, 'checking if localhost is used');
|