snyk-broker 4.208.3 → 4.208.4
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/azure-repos/accept.json.sample +30 -0
- package/dist/client-templates/gitlab/accept.json.sample +31 -1
- package/dist/lib/hybrid-sdk/client/checks/config/index.js +12 -0
- package/dist/lib/hybrid-sdk/client/checks/config/index.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/checks/config/workloadConfiguration.js +64 -0
- package/dist/lib/hybrid-sdk/client/checks/config/workloadConfiguration.js.map +1 -0
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js +5 -0
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/index.js +16 -12
- package/dist/lib/hybrid-sdk/client/index.js.map +1 -1
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js +1 -0
- package/dist/lib/hybrid-sdk/clientRequestHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/common/utils/signals.js +23 -3
- package/dist/lib/hybrid-sdk/common/utils/signals.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/request.js +3 -0
- package/dist/lib/hybrid-sdk/http/request.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/authHandlers.js +1 -0
- package/dist/lib/hybrid-sdk/server/routesHandlers/authHandlers.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.js +1 -0
- package/dist/lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js +1 -0
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socket.js +1 -0
- package/dist/lib/hybrid-sdk/server/socket.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socketHandlers/closeHandler.js +2 -0
- package/dist/lib/hybrid-sdk/server/socketHandlers/closeHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socketHandlers/connectionHandler.js +5 -0
- package/dist/lib/hybrid-sdk/server/socketHandlers/connectionHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socketHandlers/identifyHandler.js +25 -1
- package/dist/lib/hybrid-sdk/server/socketHandlers/identifyHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socketHandlers/terminateHandler.js +11 -0
- package/dist/lib/hybrid-sdk/server/socketHandlers/terminateHandler.js.map +1 -0
- package/dist/lib/hybrid-sdk/workloadFactory.js +3 -0
- package/dist/lib/hybrid-sdk/workloadFactory.js.map +1 -1
- package/dist/package.json +3 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -424,6 +424,36 @@
|
|
|
424
424
|
"scheme": "basic",
|
|
425
425
|
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
426
426
|
}
|
|
427
|
+
},
|
|
428
|
+
{
|
|
429
|
+
"//": "create a general/inline pull request comment",
|
|
430
|
+
"method": "POST",
|
|
431
|
+
"path": "/:owner/_apis/git/repositories/:repo/pullRequests/:pullRef/threads",
|
|
432
|
+
"origin": "https://${AZURE_REPOS_HOST}/${AZURE_REPOS_ORG}",
|
|
433
|
+
"auth": {
|
|
434
|
+
"scheme": "basic",
|
|
435
|
+
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
436
|
+
}
|
|
437
|
+
},
|
|
438
|
+
{
|
|
439
|
+
"//": "update a general pull request comment",
|
|
440
|
+
"method": "PATCH",
|
|
441
|
+
"path": "/:owner/_apis/git/repositories/:repo/pullRequests/:pullRef/threads/:threadId/comments/:commentId",
|
|
442
|
+
"origin": "https://${AZURE_REPOS_HOST}/${AZURE_REPOS_ORG}",
|
|
443
|
+
"auth": {
|
|
444
|
+
"scheme": "basic",
|
|
445
|
+
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
446
|
+
}
|
|
447
|
+
},
|
|
448
|
+
{
|
|
449
|
+
"//": "resolve an inline pull request comment",
|
|
450
|
+
"method": "PATCH",
|
|
451
|
+
"path": "/:owner/_apis/git/repositories/:repo/pullRequests/:pullRef/threads/:commentId",
|
|
452
|
+
"origin": "https://${AZURE_REPOS_HOST}/${AZURE_REPOS_ORG}",
|
|
453
|
+
"auth": {
|
|
454
|
+
"scheme": "basic",
|
|
455
|
+
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
456
|
+
}
|
|
427
457
|
}
|
|
428
458
|
]
|
|
429
459
|
}
|
|
@@ -1599,6 +1599,36 @@
|
|
|
1599
1599
|
"method": "GET",
|
|
1600
1600
|
"path": "/api/v4/projects/:project/merge_requests/:pullRef",
|
|
1601
1601
|
"origin": "https://${GITLAB}"
|
|
1602
|
-
|
|
1602
|
+
},
|
|
1603
|
+
{
|
|
1604
|
+
"//": "create a new MR summary comment (note)",
|
|
1605
|
+
"method": "POST",
|
|
1606
|
+
"path": "/api/v4/projects/:project/merge_requests/:pullRef/notes",
|
|
1607
|
+
"origin": "https://${GITLAB}"
|
|
1608
|
+
},
|
|
1609
|
+
{
|
|
1610
|
+
"//": "update an existing MR summary comment (note)",
|
|
1611
|
+
"method": "PUT",
|
|
1612
|
+
"path": "/api/v4/projects/:project/merge_requests/:pullRef/notes/:noteId",
|
|
1613
|
+
"origin": "https://${GITLAB}"
|
|
1614
|
+
},
|
|
1615
|
+
{
|
|
1616
|
+
"//": "get diff version for a given commit SHA in a merge request",
|
|
1617
|
+
"method": "GET",
|
|
1618
|
+
"path": "/api/v4/projects/:project/merge_requests/:pullRef/versions",
|
|
1619
|
+
"origin": "https://${GITLAB}"
|
|
1620
|
+
},
|
|
1621
|
+
{
|
|
1622
|
+
"//": "create an inline MR comment (discussion)",
|
|
1623
|
+
"method": "POST",
|
|
1624
|
+
"path": "/api/v4/projects/:project/merge_requests/:pullRef/discussions",
|
|
1625
|
+
"origin": "https://${GITLAB}"
|
|
1626
|
+
},
|
|
1627
|
+
{
|
|
1628
|
+
"//": "resolve an inline MR comment (discussion)",
|
|
1629
|
+
"method": "PUT",
|
|
1630
|
+
"path": "/api/v4/projects/:project/merge_requests/:pullRef/discussions/:discussion",
|
|
1631
|
+
"origin": "https://${GITLAB}"
|
|
1632
|
+
}
|
|
1603
1633
|
]
|
|
1604
1634
|
}
|
|
@@ -7,6 +7,7 @@ const codeAgentDeprecation_1 = require("./codeAgentDeprecation");
|
|
|
7
7
|
const universalConnectionConfigCheck_1 = require("./universalConnectionConfigCheck");
|
|
8
8
|
const brokerClientVersionCheck_1 = require("./brokerClientVersionCheck");
|
|
9
9
|
const brokerTokenCheck_1 = require("./brokerTokenCheck");
|
|
10
|
+
const workloadConfiguration_1 = require("./workloadConfiguration");
|
|
10
11
|
function getConfigChecks(config) {
|
|
11
12
|
return [
|
|
12
13
|
brokerClientUrlCheck(config),
|
|
@@ -15,6 +16,7 @@ function getConfigChecks(config) {
|
|
|
15
16
|
codeAgentDeprecationCheck(config),
|
|
16
17
|
brokerClientVersionCheck(config),
|
|
17
18
|
brokerTokenCheck(config),
|
|
19
|
+
workloadConfigurationCheck(config),
|
|
18
20
|
];
|
|
19
21
|
}
|
|
20
22
|
exports.getConfigChecks = getConfigChecks;
|
|
@@ -49,6 +51,16 @@ const acceptFlagsConfigurationCheck = (config) => {
|
|
|
49
51
|
},
|
|
50
52
|
};
|
|
51
53
|
};
|
|
54
|
+
const workloadConfigurationCheck = (config) => {
|
|
55
|
+
return {
|
|
56
|
+
id: 'workload-config-validation',
|
|
57
|
+
name: 'Workload Configuration Check',
|
|
58
|
+
enabled: true,
|
|
59
|
+
check: function () {
|
|
60
|
+
return (0, workloadConfiguration_1.validateWorkloadConfig)({ id: this.id, name: this.name }, config);
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
};
|
|
52
64
|
const codeAgentDeprecationCheck = (config) => {
|
|
53
65
|
return {
|
|
54
66
|
id: 'code-agent-deprecation-validation',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/checks/config/index.ts"],"names":[],"mappings":";;;AAEA,iEAAiE;AACjE,yDAA+D;AAC/D,iEAAsE;AACtE,qFAAsF;AACtF,yEAAsF;AACtF,yDAAyD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/checks/config/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateWorkloadConfig = void 0;
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const config_1 = require("../../../common/config/config");
|
|
6
|
+
const node_path_1 = require("node:path");
|
|
7
|
+
const validateWorkloadConfig = (checkOptions, config) => {
|
|
8
|
+
const workloadKeys = Object.keys(config).filter((x) => x.includes('_WORKLOAD_'));
|
|
9
|
+
if (workloadKeys.length < 4) {
|
|
10
|
+
return {
|
|
11
|
+
id: checkOptions.id,
|
|
12
|
+
name: checkOptions.name,
|
|
13
|
+
status: 'error',
|
|
14
|
+
output: `Workload configuration missing. Please use or update config from https://github.com/snyk/broker/blob/master/config.default.json.`,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
const REMOTE_WORKLOAD_NAME = config.REMOTE_WORKLOAD_NAME;
|
|
18
|
+
const REMOTE_WORKLOAD_MODULE_PATH = config.REMOTE_WORKLOAD_MODULE_PATH;
|
|
19
|
+
const CLIENT_WORKLOAD_NAME = config.CLIENT_WORKLOAD_NAME;
|
|
20
|
+
const CLIENT_WORKLOAD_MODULE_PATH = config.CLIENT_WORKLOAD_MODULE_PATH;
|
|
21
|
+
if (!verifyClassAndHandler(REMOTE_WORKLOAD_NAME, REMOTE_WORKLOAD_MODULE_PATH) ||
|
|
22
|
+
!verifyClassAndHandler(CLIENT_WORKLOAD_NAME, CLIENT_WORKLOAD_MODULE_PATH)) {
|
|
23
|
+
return {
|
|
24
|
+
id: checkOptions.id,
|
|
25
|
+
name: checkOptions.name,
|
|
26
|
+
status: 'error',
|
|
27
|
+
output: `Workload configuration invalid. The workload cannot be found or is not containing the expected method(s).`,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
id: checkOptions.id,
|
|
32
|
+
name: checkOptions.name,
|
|
33
|
+
status: 'passing',
|
|
34
|
+
output: 'Workload configuration OK.',
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
exports.validateWorkloadConfig = validateWorkloadConfig;
|
|
38
|
+
function verifyClassAndHandler(className, filePath) {
|
|
39
|
+
try {
|
|
40
|
+
const root = (0, config_1.findProjectRoot)(__dirname);
|
|
41
|
+
if (!root) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
const absolutePath = (0, node_path_1.resolve)(`${root}/dist/lib/`, filePath.replace('../', '')) + '.js';
|
|
45
|
+
if (!(0, node_fs_1.existsSync)(absolutePath)) {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
const fileContent = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
|
|
49
|
+
if (!fileContent) {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
const classRegex = new RegExp(`class\\s+${className}\\s*extends`);
|
|
53
|
+
const handlerRegex = /handler\s*\(/;
|
|
54
|
+
if (!classRegex.test(fileContent)) {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
return handlerRegex.test(fileContent);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
const errorMessage = `Error validating Workload configuration. ${error}`;
|
|
61
|
+
throw new Error(errorMessage);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=workloadConfiguration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workloadConfiguration.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/checks/config/workloadConfiguration.ts"],"names":[],"mappings":";;;AAEA,qCAAmD;AACnD,0DAAgE;AAChE,yCAAoC;AAC7B,MAAM,sBAAsB,GAAG,CACpC,YAA0B,EAC1B,MAAc,EACD,EAAE;IACf,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACpD,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CACzB,CAAC;IACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,OAAO;YACL,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,kIAAkI;SACrH,CAAC;KACzB;IAED,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;IACzD,MAAM,2BAA2B,GAAG,MAAM,CAAC,2BAA2B,CAAC;IACvE,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;IACzD,MAAM,2BAA2B,GAAG,MAAM,CAAC,2BAA2B,CAAC;IAEvE,IACE,CAAC,qBAAqB,CAAC,oBAAoB,EAAE,2BAA2B,CAAC;QACzE,CAAC,qBAAqB,CAAC,oBAAoB,EAAE,2BAA2B,CAAC,EACzE;QACA,OAAO;YACL,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,2GAA2G;SAC9F,CAAC;KACzB;IAED,OAAO;QACL,EAAE,EAAE,YAAY,CAAC,EAAE;QACnB,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,4BAA4B;KACf,CAAC;AAC1B,CAAC,CAAC;AAvCW,QAAA,sBAAsB,0BAuCjC;AAEF,SAAS,qBAAqB,CAAC,SAAS,EAAE,QAAQ;IAChD,IAAI;QACF,MAAM,IAAI,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QACD,MAAM,YAAY,GAChB,IAAA,mBAAO,EAAC,GAAG,IAAI,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QACpE,IAAI,CAAC,IAAA,oBAAU,EAAC,YAAY,CAAC,EAAE;YAC7B,OAAO,KAAK,CAAC;SACd;QACD,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAExD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,YAAY,SAAS,aAAa,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,cAAc,CAAC;QAEpC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC;SACd;QAED,OAAO,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KACvC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,4CAA4C,KAAK,EAAE,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;AACH,CAAC"}
|
|
@@ -34,6 +34,11 @@ const manageWebsocketConnections = async (clientOpts, globalIdentifyingMetadata)
|
|
|
34
34
|
(0, validator_1.validateUniversalConnectionsRemoteConfig)(`${(0, config_1.findProjectRoot)(__dirname)}/config.universal.json`);
|
|
35
35
|
(0, signals_1.handleTerminationSignal)(cleanup_1.cleanUpUniversalFile);
|
|
36
36
|
}
|
|
37
|
+
else {
|
|
38
|
+
(0, signals_1.handleTerminationSignal)(() => {
|
|
39
|
+
logger_1.log.debug({}, 'Received process termination signal.');
|
|
40
|
+
});
|
|
41
|
+
}
|
|
37
42
|
await (0, configHelpers_1.reloadConfig)(clientOpts);
|
|
38
43
|
}
|
|
39
44
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/manager.ts"],"names":[],"mappings":";;;AAEA,iDAAqD;AACrD,yDAA0E;AAC1E,uDAA6D;AAC7D,wDAAqE;AACrE,8CAAwD;AACxD,2CAAuE;AACvE,2BAA+C;AAC/C,yCAAqD;AACrD,2DAAuD;AACvD,gEAAoE;AACpE,+CAA+C;AAExC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,UAA4B,EAC5B,yBAA8C,EACd,EAAE;IAClC,IAAI;QACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YACnC,IAAI,CAAC,IAAA,eAAU,EAAC,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE;gBACtE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC;gBACvC,IAAA,kBAAa,EACX,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,EACrD,IAAI,CAAC,SAAS,CAAC;oBACb,2BAA2B,EAAE;wBAC3B,MAAM,EAAE;4BACN,KAAK,EAAE;gCACL,QAAQ,EAAE,cAAc;gCACxB,YAAY,EAAE,kBAAkB;6BACjC;yBACF;qBACF;iBACF,CAAC,CACH,CAAC;gBACF,MAAM,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC;aAChC;YAED,MAAM,IAAA,4BAAoB,EACxB,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EACjE,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CACtE,CAAC;YAEF,MAAM,IAAA,+CAAgC,EACpC,UAAU,EACV,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CACtD,CAAC;YAEF,IAAA,oDAAwC,EACtC,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CACtD,CAAC;YAEF,IAAA,iCAAuB,EAAC,8BAAoB,CAAC,CAAC;SAC/C;QAED,MAAM,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC;KAChC;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,uCAAuC,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC;KACX;IAED,+EAA+E;IAC/E,yBAAyB,CAAC,eAAe,GAAG,CAC1C,MAAM,IAAA,kCAAmB,EAAC,UAAU,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAC1E,CAAC,qBAAqB,CAAC;IAExB,uGAAuG;IAEvG,MAAM,oBAAoB,GAA0B,EAAE,CAAC;IAEvD,IAAA,4BAAc,EAAC,UAAU,EAAE,oBAAoB,EAAE,yBAAyB,CAAC,CAAC;IAC5E,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/manager.ts"],"names":[],"mappings":";;;AAEA,iDAAqD;AACrD,yDAA0E;AAC1E,uDAA6D;AAC7D,wDAAqE;AACrE,8CAAwD;AACxD,2CAAuE;AACvE,2BAA+C;AAC/C,yCAAqD;AACrD,2DAAuD;AACvD,gEAAoE;AACpE,+CAA+C;AAExC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,UAA4B,EAC5B,yBAA8C,EACd,EAAE;IAClC,IAAI;QACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YACnC,IAAI,CAAC,IAAA,eAAU,EAAC,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE;gBACtE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC;gBACvC,IAAA,kBAAa,EACX,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,EACrD,IAAI,CAAC,SAAS,CAAC;oBACb,2BAA2B,EAAE;wBAC3B,MAAM,EAAE;4BACN,KAAK,EAAE;gCACL,QAAQ,EAAE,cAAc;gCACxB,YAAY,EAAE,kBAAkB;6BACjC;yBACF;qBACF;iBACF,CAAC,CACH,CAAC;gBACF,MAAM,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC;aAChC;YAED,MAAM,IAAA,4BAAoB,EACxB,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EACjE,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CACtE,CAAC;YAEF,MAAM,IAAA,+CAAgC,EACpC,UAAU,EACV,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CACtD,CAAC;YAEF,IAAA,oDAAwC,EACtC,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,wBAAwB,CACtD,CAAC;YAEF,IAAA,iCAAuB,EAAC,8BAAoB,CAAC,CAAC;SAC/C;aAAM;YACL,IAAA,iCAAuB,EAAC,GAAG,EAAE;gBAC3B,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,sCAAsC,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC;KAChC;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,uCAAuC,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC;KACX;IAED,+EAA+E;IAC/E,yBAAyB,CAAC,eAAe,GAAG,CAC1C,MAAM,IAAA,kCAAmB,EAAC,UAAU,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAC1E,CAAC,qBAAqB,CAAC;IAExB,uGAAuG;IAEvG,MAAM,oBAAoB,GAA0B,EAAE,CAAC;IAEvD,IAAA,4BAAc,EAAC,UAAU,EAAE,oBAAoB,EAAE,yBAAyB,CAAC,CAAC;IAC5E,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AA/DW,QAAA,0BAA0B,8BA+DrC"}
|
|
@@ -3,7 +3,7 @@ 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.main = void 0;
|
|
6
|
+
exports.main = exports.getWebsocketConnections = exports.websocketConnections = void 0;
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const socket_1 = require("./socket");
|
|
9
9
|
const logger_1 = require("../../logs/logger");
|
|
@@ -32,6 +32,10 @@ process.on('uncaughtException', (error) => {
|
|
|
32
32
|
process.exit(1);
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
|
+
const getWebsocketConnections = () => {
|
|
36
|
+
return exports.websocketConnections;
|
|
37
|
+
};
|
|
38
|
+
exports.getWebsocketConnections = getWebsocketConnections;
|
|
35
39
|
const main = async (clientOpts) => {
|
|
36
40
|
try {
|
|
37
41
|
logger_1.log.info({ version: version_1.default }, 'Broker starting in client mode.');
|
|
@@ -39,6 +43,7 @@ const main = async (clientOpts) => {
|
|
|
39
43
|
clientOpts.config.brokerClientId = (0, uuid_1.v4)();
|
|
40
44
|
clientOpts.config.logEnableBody = 'false';
|
|
41
45
|
clientOpts.config.LOG_ENABLE_BODY = 'false';
|
|
46
|
+
exports.websocketConnections = [];
|
|
42
47
|
logger_1.log.info({ brokerClientId: clientOpts.config.brokerClientId }, 'Generated broker client id.');
|
|
43
48
|
clientOpts.config.API_BASE_URL =
|
|
44
49
|
clientOpts.config.API_BASE_URL ??
|
|
@@ -79,13 +84,12 @@ const main = async (clientOpts) => {
|
|
|
79
84
|
id: '',
|
|
80
85
|
isDisabled: false,
|
|
81
86
|
};
|
|
82
|
-
let websocketConnections = [];
|
|
83
87
|
if (clientOpts.config.universalBrokerEnabled) {
|
|
84
|
-
websocketConnections = await (0, manager_1.manageWebsocketConnections)(clientOpts, globalIdentifyingMetadata);
|
|
88
|
+
exports.websocketConnections = await (0, manager_1.manageWebsocketConnections)(clientOpts, globalIdentifyingMetadata);
|
|
85
89
|
}
|
|
86
90
|
else {
|
|
87
|
-
websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.primary));
|
|
88
|
-
websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.secondary));
|
|
91
|
+
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.primary));
|
|
92
|
+
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.secondary));
|
|
89
93
|
}
|
|
90
94
|
// start the local webserver to listen for relay requests
|
|
91
95
|
const { app, server } = (0, webserver_1.webserver)(clientOpts.config, clientOpts.port);
|
|
@@ -95,7 +99,7 @@ const main = async (clientOpts) => {
|
|
|
95
99
|
app.get('/health/checks', (0, checks_handler_1.handleChecksRoute)(clientOpts.config));
|
|
96
100
|
app.get('/health/checks/:checkId', (0, checks_handler_1.handleCheckIdsRoutes)(clientOpts.config));
|
|
97
101
|
app.get(clientOpts.config.brokerHealthcheckPath || '/healthcheck', (req, res, next) => {
|
|
98
|
-
res.locals.websocketConnections = websocketConnections;
|
|
102
|
+
res.locals.websocketConnections = exports.websocketConnections;
|
|
99
103
|
next();
|
|
100
104
|
}, healthcheckHandler_1.healthCheckHandler);
|
|
101
105
|
app.get('/filters', (req, res) => {
|
|
@@ -110,7 +114,7 @@ const main = async (clientOpts) => {
|
|
|
110
114
|
next();
|
|
111
115
|
}, systemCheckHandler_1.systemCheckHandler);
|
|
112
116
|
app.post('/webhook/*', (req, res, next) => {
|
|
113
|
-
res.locals.websocketConnections = websocketConnections;
|
|
117
|
+
res.locals.websocketConnections = exports.websocketConnections;
|
|
114
118
|
next();
|
|
115
119
|
}, websocketConnectionMiddlewares_1.websocketConnectionSelectorMiddleware, (req, res) => {
|
|
116
120
|
if ((0, socketHelpers_1.isWebsocketConnOpen)(res.locals.websocket)) {
|
|
@@ -127,17 +131,17 @@ const main = async (clientOpts) => {
|
|
|
127
131
|
// Need to check what CRA agent requests look like so we don't mess that up.
|
|
128
132
|
// New hooks we want to inject the BROKER_CLIENT_URL with the integration ID so we can select based on the integration ID
|
|
129
133
|
// but doing so can't break the existing webhooks
|
|
130
|
-
res.locals.websocketConnections = websocketConnections;
|
|
134
|
+
res.locals.websocketConnections = exports.websocketConnections;
|
|
131
135
|
next();
|
|
132
136
|
}, websocketConnectionMiddlewares_1.websocketConnectionSelectorMiddleware, httpToWsForwarder);
|
|
133
137
|
return {
|
|
134
|
-
websocketConnections,
|
|
138
|
+
websocketConnections: exports.websocketConnections,
|
|
135
139
|
close: (done) => {
|
|
136
140
|
logger_1.log.info('Client websocket is closing.');
|
|
137
141
|
server.close();
|
|
138
|
-
for (let i = 0; i < websocketConnections.length; i++) {
|
|
139
|
-
websocketConnections[i].destroy(function () {
|
|
140
|
-
logger_1.log.info(`Client websocket ${websocketConnections[i].identifier || ''} is closed.`);
|
|
142
|
+
for (let i = 0; i < exports.websocketConnections.length; i++) {
|
|
143
|
+
exports.websocketConnections[i].destroy(function () {
|
|
144
|
+
logger_1.log.info(`Client websocket ${exports.websocketConnections[i].identifier || ''} is closed.`);
|
|
141
145
|
if (done) {
|
|
142
146
|
return done();
|
|
143
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -157,6 +157,7 @@ class HybridClientRequestHandler {
|
|
|
157
157
|
body: this.req.body,
|
|
158
158
|
headers: this.req.headers,
|
|
159
159
|
};
|
|
160
|
+
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
160
161
|
(0, request_1.makeRequestToDownstream)(filteredReq)
|
|
161
162
|
.then((resp) => {
|
|
162
163
|
if (resp.statusCode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientRequestHelpers.js","sourceRoot":"","sources":["../../../lib/hybrid-sdk/clientRequestHelpers.ts"],"names":[],"mappings":";;;;;;AACA,2CAA+C;AAC/C,mDAAmD;AAEnD,oDAIgC;AAChC,0DAAkC;AAElC,+BAAkC;AAClC,oDAA4B;AAC5B,kFAAiE;AACjE,gDAAiD;AACjD,4CAAyD;AAEzD,MAAa,0BAA0B;IAQrC,YAAY,GAAY,EAAE,GAAa;QACrC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAA,SAAI,GAAE,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC;YAC7D,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,KAAK,CAAC;QACV,IAAI,CAAC,UAAU,GAAG;YAChB,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;YACjB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;YAC9B,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;YAChC,SAAS,EACP,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACnC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE;YAC/C,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;YACpC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;YACpC,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CACjC,2BAA2B,CAClB;YACX,mBAAmB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CACnC,6BAA6B,CACpB;YACX,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAW;YAC5D,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAW;SACnD,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;QAC7C,YAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAC;IACvE,CAAC;
|
|
1
|
+
{"version":3,"file":"clientRequestHelpers.js","sourceRoot":"","sources":["../../../lib/hybrid-sdk/clientRequestHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addTimerToTerminalHandlers = exports.handleTerminationSignal = void 0;
|
|
4
|
+
const client_1 = require("../../client");
|
|
5
|
+
const logger_1 = require("../../../logs/logger");
|
|
4
6
|
const timers = [];
|
|
7
|
+
const GRACE_PERIOD_MS = 12000;
|
|
5
8
|
const handleTerminationSignal = (callback) => {
|
|
6
9
|
process.on('SIGINT', () => {
|
|
7
10
|
timers.forEach((timer) => clearInterval(timer));
|
|
8
11
|
callback();
|
|
9
|
-
|
|
12
|
+
signalTerminationToServer('SIGINT');
|
|
13
|
+
setTimeout(() => {
|
|
14
|
+
process.exit(0);
|
|
15
|
+
}, GRACE_PERIOD_MS);
|
|
10
16
|
});
|
|
11
|
-
process.on('SIGTERM', () => {
|
|
17
|
+
process.on('SIGTERM', async () => {
|
|
12
18
|
timers.forEach((timer) => clearInterval(timer));
|
|
13
19
|
callback();
|
|
14
|
-
|
|
20
|
+
signalTerminationToServer('SIGTERM');
|
|
21
|
+
setTimeout(() => {
|
|
22
|
+
process.exit(0);
|
|
23
|
+
}, GRACE_PERIOD_MS);
|
|
15
24
|
});
|
|
16
25
|
};
|
|
17
26
|
exports.handleTerminationSignal = handleTerminationSignal;
|
|
@@ -19,4 +28,15 @@ const addTimerToTerminalHandlers = (timerId) => {
|
|
|
19
28
|
timers.push(timerId);
|
|
20
29
|
};
|
|
21
30
|
exports.addTimerToTerminalHandlers = addTimerToTerminalHandlers;
|
|
31
|
+
const signalTerminationToServer = (signal) => {
|
|
32
|
+
const [websocket] = (0, client_1.getWebsocketConnections)();
|
|
33
|
+
if (websocket) {
|
|
34
|
+
websocket.send('terminate', {
|
|
35
|
+
signal,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
logger_1.log.error({}, 'Unable to find websocket to signal termination to server.');
|
|
40
|
+
}
|
|
41
|
+
};
|
|
22
42
|
//# sourceMappingURL=signals.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/common/utils/signals.ts"],"names":[],"mappings":";;;AAAA,MAAM,MAAM,GAAqB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/common/utils/signals.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AACvD,iDAAqD;AAErD,MAAM,MAAM,GAAqB,EAAE,CAAC;AACpC,MAAM,eAAe,GAAG,KAAK,CAAC;AACvB,MAAM,uBAAuB,GAAG,CAAC,QAAoB,EAAE,EAAE;IAC9D,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,QAAQ,EAAE,CAAC;QACX,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACpC,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,EAAE,eAAe,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,QAAQ,EAAE,CAAC;QACX,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACrC,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,EAAE,eAAe,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC;AAEK,MAAM,0BAA0B,GAAG,CAAC,OAAuB,EAAE,EAAE;IACpE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AAFW,QAAA,0BAA0B,8BAErC;AAEF,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,EAAE;IAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,gCAAuB,GAAE,CAAC;IAC9C,IAAI,SAAS,EAAE;QACb,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE;YAC1B,MAAM;SACP,CAAC,CAAC;KACJ;SAAM;QACL,YAAM,CAAC,KAAK,CACV,EAAE,EACF,2DAA2D,CAC5D,CAAC;KACH;AACH,CAAC,CAAC"}
|
|
@@ -43,6 +43,7 @@ const makeRequestToDownstream = async (req, retries = MAX_RETRY) => {
|
|
|
43
43
|
};
|
|
44
44
|
return new Promise((resolve, reject) => {
|
|
45
45
|
try {
|
|
46
|
+
// deepcode ignore Ssrf: re-ignore after http client refactoring
|
|
46
47
|
const request = httpClient.request(localRequest.url, options, (response) => {
|
|
47
48
|
let data = '';
|
|
48
49
|
// A chunk of data has been received.
|
|
@@ -142,6 +143,7 @@ const makeStreamingRequestToDownstream = (req, retries = MAX_RETRY) => {
|
|
|
142
143
|
};
|
|
143
144
|
return new Promise((resolve, reject) => {
|
|
144
145
|
try {
|
|
146
|
+
// deepcode ignore Ssrf: re-ignore after http client refactoring
|
|
145
147
|
const request = httpClient.request(localRequest.url, options, (response) => {
|
|
146
148
|
if (response.statusCode &&
|
|
147
149
|
response.statusCode >= 200 &&
|
|
@@ -232,6 +234,7 @@ const makeSingleRawRequestToDownstream = async (req) => {
|
|
|
232
234
|
};
|
|
233
235
|
return new Promise((resolve, reject) => {
|
|
234
236
|
try {
|
|
237
|
+
// deepcode ignore Ssrf: re-ignore after http client refactoring
|
|
235
238
|
const request = httpClient.request(localRequest.url, options, (response) => {
|
|
236
239
|
let data = '';
|
|
237
240
|
// A chunk of data has been received.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/http/request.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/http/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ const authRefreshHandler = async (req, res) => {
|
|
|
28
28
|
return res.status(401).send('Invalid credentials.');
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
+
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
31
32
|
const credsCheckResponse = await (0, authHelpers_1.validateBrokerClientCredentials)(credentials, brokerClientId, identifier, true);
|
|
32
33
|
logger_1.log.debug({ credsCheckResponse: credsCheckResponse }, 'Client Creds validation response.');
|
|
33
34
|
if (credsCheckResponse) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authHandlers.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/authHandlers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authHandlers.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/authHandlers.ts"],"names":[],"mappings":";;;AACA,qDAAsE;AACtE,iDAAqD;AACrD,sCAA4D;AAC5D,oDAAqD;AAU9C,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACtE,MAAM,qBAAqB,GACzB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,GAAG,qBAAqB,EAAE,CAAC;IAC/C,MAAM,iBAAiB,GACrB,GAAG,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,CAAC;QACjE,eAAe,CAAC;IAClB,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC;IACzC,YAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,IAAA,iBAAS,EAAC,UAAU,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAC/D,cAAc,CACf,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAgC,CAAC;IAC5E,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;IAE7D,MAAM,UAAU,GAAG,IAAA,wCAA+B,EAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,UAAU;QAC9B,CAAC,CAAC,UAAU,CAAC,IAAI,CACb,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CACjE;QACH,CAAC,CAAC,IAAI,CAAC;IACT,YAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,wBAAwB,CAAC,CAAC;IAC7E,IACE,WAAW,KAAK,SAAS;QACzB,iBAAiB,KAAK,SAAS;QAC/B,CAAC,UAAU;QACX,CAAC,aAAa,EACd;QACA,YAAM,CAAC,KAAK,CACV,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,EACjD,qBAAqB,CACtB,CAAC;QACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;KACrD;SAAM;QACL,+HAA+H;QAC/H,MAAM,kBAAkB,GAAG,MAAM,IAAA,6CAA+B,EAC9D,WAAW,EACX,cAAwB,EACxB,UAAU,EACV,IAAI,CACL,CAAC;QACF,YAAM,CAAC,KAAK,CACV,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,EAC1C,mCAAmC,CACpC,CAAC;QACF,IAAI,kBAAkB,EAAE;YACtB,iCAAiC;YACjC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACzC,aAAa,CAAC,mBAAmB,GAAG,OAAO,CAAC;YAC5C,MAAM,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAC9D,CAAC;YACF,IAAI,kBAAkB,GAAG,CAAC,CAAC,EAAE;gBAC3B,UAAU,CAAC,kBAAkB,CAAC,GAAG,aAAa,CAAC;gBAC/C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnC;iBAAM;gBACL,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;aAClE;SACF;aAAM;YACL,YAAM,CAAC,KAAK,CACV,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,EACjD,2DAA2D,CAC5D,CAAC;YACF,aAAa,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;SAC9D;KACF;AACH,CAAC,CAAC;AApEW,QAAA,kBAAkB,sBAoE7B"}
|
|
@@ -39,6 +39,7 @@ const connectionStatusHandler = async (req, res) => {
|
|
|
39
39
|
}
|
|
40
40
|
logger_1.log.debug({ url: req.url, method: req.method }, 'Making request to primary');
|
|
41
41
|
try {
|
|
42
|
+
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
42
43
|
const httpResponse = await (0, request_1.makeStreamingRequestToDownstream)(postFilterPreparedRequest);
|
|
43
44
|
res.writeHead(httpResponse.statusCode ?? 500, httpResponse.headers);
|
|
44
45
|
return httpResponse.pipe(res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectionStatusHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connectionStatusHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/connectionStatusHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ const overloadHttpRequestWithConnectionDetailsMiddleware = async (req, res, next
|
|
|
38
38
|
}
|
|
39
39
|
logger_1.log.debug({ url: req.url, method: req.method }, 'Making request to primary');
|
|
40
40
|
try {
|
|
41
|
+
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
41
42
|
const httpResponse = await (0, request_1.makeStreamingRequestToDownstream)(postFilterPreparedRequest);
|
|
42
43
|
res.writeHead(httpResponse.statusCode ?? 500, httpResponse.headers);
|
|
43
44
|
return httpResponse.pipe(res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpRequestHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.ts"],"names":[],"mappings":";;;AACA,iDAAqD;AACrD,0CAAsD;AACtD,sCAAiD;AACjD,wDAAwE;AACxE,qCAAmC;AACnC,uCAAgD;AAEhD,gDAAsE;AAE/D,MAAM,kDAAkD,GAAG,KAAK,EACrE,GAAY,EACZ,GAAa,EACb,IAAkB,EAClB,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,6BAAoB,GAAE,CAAC;IAC3C,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAC/B,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAAC,KAAK,CAAC,CAAC;IACtD,GAAG,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC;IACnD,GAAG,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC;IACnD,kDAAkD;IAClD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC3B,IAAA,oCAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,IAAA,kBAAQ,GAAE,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC9C,IACE,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC;YACjD,aAAa;YACb,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5B,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAC1B;YACA,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,UAAU,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YACxD,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAC1D,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAEtD,MAAM,yBAAyB,GAA8B;gBAC3D,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;aACnB,CAAC;YACF,IACE,GAAG,CAAC,MAAM,IAAI,MAAM;gBACpB,GAAG,CAAC,MAAM,IAAI,KAAK;gBACnB,GAAG,CAAC,MAAM,IAAI,OAAO,EACrB;gBACA,yBAAyB,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;aAC3C;YACD,YAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EACpC,2BAA2B,CAC5B,CAAC;YACF,IAAI;gBACF,MAAM,YAAY,GAAG,MAAM,IAAA,0CAAgC,EACzD,yBAAyB,CAC1B,CAAC;gBACF,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,IAAI,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACpE,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;YAAC,OAAO,GAAG,EAAE;gBACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,6BAA6B,GAAG,EAAE,CAAC,CAAC;gBAC1D,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;gBACjE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;aACrE;SACF;aAAM;YACL,YAAM,CAAC,IAAI,CAAC,EAAE,iBAAiB,EAAE,EAAE,+BAA+B,CAAC,CAAC;YACpE,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;YACnD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SAC5C;KACF;IACD,6CAA6C;IAC7C,0BAA0B;IAC1B,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACzD,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IACpE,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC3E,GAAG,CAAC,MAAM,CAAC,iBAAiB;QAC1B,WAAW,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC;IACrD,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACnB,GAAG,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC;QAC3B,WAAW,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;IACnD,wBAAwB;IACxB,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;IACnD,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;QACvC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,MAAM,GAAG,IAAI,0BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACjC,GAAG,CAAC,GAAG;gBACL,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACzE;KACF;IAED,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAC1C,IAAI,EAAE,CAAC;AACT,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"httpRequestHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,7 @@ const socket = ({ server, loadedServerOpts }) => {
|
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
73
|
logger_1.log.debug({ maskedToken: (0, token_1.maskToken)(connectionIdentifier), brokerClientId }, `Validating auth for connection ${connectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
74
|
+
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
74
75
|
const credsCheckResponse = await (0, authHelpers_1.validateBrokerClientCredentials)(authHeader, brokerClientId, connectionIdentifier);
|
|
75
76
|
if (!credsCheckResponse) {
|
|
76
77
|
logger_1.log.debug({ maskedToken: (0, token_1.maskToken)(connectionIdentifier), brokerClientId }, `Denied auth for connection ${connectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/server/socket.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/server/socket.ts"],"names":[],"mappings":"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"}
|