snyk-broker 4.165.8 → 4.166.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/exec.js.map +1 -1
- package/dist/lib/client/checks/http/http-executor.js +15 -14
- package/dist/lib/client/checks/http/http-executor.js.map +1 -1
- package/dist/lib/client/hooks/startup/processHooks.js +1 -9
- package/dist/lib/client/hooks/startup/processHooks.js.map +1 -1
- package/dist/lib/client/index.js +1 -3
- package/dist/lib/client/index.js.map +1 -1
- package/dist/lib/client/routesHandler/systemCheckHandler.js +2 -3
- package/dist/lib/client/routesHandler/systemCheckHandler.js.map +1 -1
- package/dist/lib/client/socket.js +1 -1
- package/dist/lib/client/socket.js.map +1 -1
- package/dist/lib/client/utils/credentials.js +38 -26
- package/dist/lib/client/utils/credentials.js.map +1 -1
- package/dist/lib/common/config.js +20 -16
- package/dist/lib/common/config.js.map +1 -1
- package/dist/lib/common/filter/filtersAsync.js.map +1 -1
- package/dist/lib/common/http/downstream-post-stream-to-server.js +99 -74
- package/dist/lib/common/http/downstream-post-stream-to-server.js.map +1 -1
- package/dist/lib/common/http/patch-https-request-for-proxying.js +1 -0
- package/dist/lib/common/http/patch-https-request-for-proxying.js.map +1 -1
- package/dist/lib/common/http/request.js +186 -17
- package/dist/lib/common/http/request.js.map +1 -1
- package/dist/lib/common/relay/forwardWebsocketRequest.js +35 -266
- package/dist/lib/common/relay/forwardWebsocketRequest.js.map +1 -1
- package/dist/lib/common/relay/prepareRequest.js +152 -0
- package/dist/lib/common/relay/prepareRequest.js.map +1 -0
- package/dist/lib/common/relay/requestsHelper.js +100 -0
- package/dist/lib/common/relay/requestsHelper.js.map +1 -0
- package/dist/lib/index.js +2 -0
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/server/socketHandlers/closeHandler.js +3 -2
- package/dist/lib/server/socketHandlers/closeHandler.js.map +1 -1
- package/dist/package.json +4 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
package/dist/cli/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.ts"],"names":[],"mappings":";;AAAA,wCAAmC;AAEnC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEtC,kBAAe,KAAK,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.ts"],"names":[],"mappings":";;AAAA,wCAAmC;AAEnC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEtC,kBAAe,KAAK,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC;IACnC,MAAM,IAAA,WAAG,EAAC,IAAI,CAAC,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -3,27 +3,26 @@ 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.convertHttpResponseToCheckResult = exports.executeHttpRequest = void 0;
|
|
7
7
|
const logger_1 = require("../../../logs/logger");
|
|
8
8
|
const version_1 = __importDefault(require("../../../common/utils/version"));
|
|
9
|
-
const axios_1 = require("../../../common/http/axios");
|
|
10
9
|
const exponential_backoff_1 = require("../../retry/exponential-backoff");
|
|
10
|
+
const request_1 = require("../../../common/http/request");
|
|
11
11
|
async function executeHttpRequest(checkOptions, httpOptions) {
|
|
12
12
|
logger_1.log.debug({ checkId: checkOptions.id }, 'executing http check');
|
|
13
13
|
try {
|
|
14
|
-
const
|
|
15
|
-
method: httpOptions.method,
|
|
14
|
+
const request = {
|
|
16
15
|
url: httpOptions.url,
|
|
16
|
+
method: httpOptions.method,
|
|
17
17
|
headers: {
|
|
18
18
|
Accept: 'application/json',
|
|
19
19
|
'Content-Type': 'application/json',
|
|
20
20
|
'User-Agent': `broker client/${version_1.default} (http check service)`,
|
|
21
21
|
},
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const checkResult = convertAxiosResponseToCheckResult({
|
|
22
|
+
};
|
|
23
|
+
const response = await (0, exponential_backoff_1.retry)(() => (0, request_1.makeSingleRawRequestToDownstream)(request), { retries: 3, operation: `http check ${checkOptions.id}` });
|
|
24
|
+
logger_1.log.trace({ response: response }, 'http check raw response data');
|
|
25
|
+
const checkResult = convertHttpResponseToCheckResult({
|
|
27
26
|
id: checkOptions.id,
|
|
28
27
|
name: checkOptions.name,
|
|
29
28
|
url: httpOptions.url,
|
|
@@ -39,18 +38,20 @@ async function executeHttpRequest(checkOptions, httpOptions) {
|
|
|
39
38
|
}
|
|
40
39
|
}
|
|
41
40
|
exports.executeHttpRequest = executeHttpRequest;
|
|
42
|
-
function
|
|
41
|
+
function convertHttpResponseToCheckResult(check, response) {
|
|
43
42
|
let status;
|
|
44
|
-
if (response.
|
|
43
|
+
if (response.statusCode &&
|
|
44
|
+
response.statusCode >= 200 &&
|
|
45
|
+
response.statusCode <= 299) {
|
|
45
46
|
status = 'passing';
|
|
46
47
|
}
|
|
47
|
-
else if (response.
|
|
48
|
+
else if (response.statusCode == 429) {
|
|
48
49
|
status = 'warning';
|
|
49
50
|
}
|
|
50
51
|
else {
|
|
51
52
|
status = 'error';
|
|
52
53
|
}
|
|
53
|
-
const output = `HTTP ${check.method} ${check.url}: ${response.
|
|
54
|
+
const output = `HTTP ${check.method} ${check.url}: ${response.statusCode} ${response.statusText}, response: ${truncate(JSON.stringify(response.body))}`;
|
|
54
55
|
return {
|
|
55
56
|
id: check.id,
|
|
56
57
|
name: check.name,
|
|
@@ -58,7 +59,7 @@ function convertAxiosResponseToCheckResult(check, response) {
|
|
|
58
59
|
output,
|
|
59
60
|
};
|
|
60
61
|
}
|
|
61
|
-
exports.
|
|
62
|
+
exports.convertHttpResponseToCheckResult = convertHttpResponseToCheckResult;
|
|
62
63
|
const truncate = (text) => {
|
|
63
64
|
if (text.length <= 200) {
|
|
64
65
|
return text;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqD;AACrD,4EAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqD;AACrD,4EAAoD;AACpD,yEAAwD;AAExD,0DAGsC;AAE/B,KAAK,UAAU,kBAAkB,CACtC,YAGC,EACD,WAIC;IAED,YAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAEnE,IAAI;QACF,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,iBAAiB,iBAAO,uBAAuB;aAC9D;SACF,CAAC;QACF,MAAM,QAAQ,GAAiB,MAAM,IAAA,2BAAK,EACxC,GAAG,EAAE,CAAC,IAAA,0CAAgC,EAAC,OAAO,CAAC,EAC/C,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,cAAc,YAAY,CAAC,EAAE,EAAE,EAAE,CAC3D,CAAC;QACF,YAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,8BAA8B,CAAC,CAAC;QAErE,MAAM,WAAW,GAAG,gCAAgC,CAClD;YACE,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,MAAM,EAAE,WAAW,CAAC,MAAM;SAC3B,EACD,QAAQ,CACT,CAAC;QAEF,YAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,EACxD,gCAAgC,CACjC,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACrC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,sCAAsC,YAAY,CAAC,EAAE,EAAE,CAAC;QAC7E,YAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;AACH,CAAC;AAjDD,gDAiDC;AAED,SAAgB,gCAAgC,CAC9C,KAAyE,EACzE,QAAsB;IAEtB,IAAI,MAAmB,CAAC;IACxB,IACE,QAAQ,CAAC,UAAU;QACnB,QAAQ,CAAC,UAAU,IAAI,GAAG;QAC1B,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B;QACA,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE;QACrC,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM;QACL,MAAM,GAAG,OAAO,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,QAAQ,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,UAAU,IACtE,QAAQ,CAAC,UACX,eAAe,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;IAEzD,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM;QACN,MAAM;KACe,CAAC;AAC1B,CAAC;AA3BD,4EA2BC;AAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE;IACxC,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,GAAG,aAAa,iBAAiB,CAAC;AAC3C,CAAC,CAAC"}
|
|
@@ -8,12 +8,10 @@ const scm_1 = require("../../scm");
|
|
|
8
8
|
const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
9
9
|
var _a;
|
|
10
10
|
try {
|
|
11
|
-
let okToBoot = true;
|
|
12
11
|
if (!clientOpts.config.brokerToken) {
|
|
13
12
|
const brokerToken = clientOpts.config.brokerToken;
|
|
14
13
|
// null, undefined, empty, etc.
|
|
15
14
|
logger_1.log.error({ brokerToken }, '[MISSING_BROKER_TOKEN] BROKER_TOKEN is required to successfully identify itself to the server');
|
|
16
|
-
okToBoot = false;
|
|
17
15
|
const error = new ReferenceError('BROKER_TOKEN is required to successfully identify itself to the server');
|
|
18
16
|
error['code'] = 'MISSING_BROKER_TOKEN';
|
|
19
17
|
throw error;
|
|
@@ -22,15 +20,10 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
|
22
20
|
const brokerServerUrl = clientOpts.config.brokerServerUrl;
|
|
23
21
|
// null, undefined, empty, etc.
|
|
24
22
|
logger_1.log.error({ brokerServerUrl }, '[MISSING_BROKER_SERVER_URL] BROKER_SERVER_URL is required to connect to the broker server');
|
|
25
|
-
okToBoot = false;
|
|
26
23
|
const error = new ReferenceError('BROKER_SERVER_URL is required to connect to the broker server');
|
|
27
24
|
error['code'] = 'MISSING_BROKER_SERVER_URL';
|
|
28
25
|
throw error;
|
|
29
26
|
}
|
|
30
|
-
// Return early before processing anything further since the basics are not there....
|
|
31
|
-
if (!okToBoot) {
|
|
32
|
-
return { okToBoot };
|
|
33
|
-
}
|
|
34
27
|
if (!clientOpts.config.BROKER_CLIENT_URL) {
|
|
35
28
|
const proto = !clientOpts.config.key && !clientOpts.config.cert ? 'http' : 'https';
|
|
36
29
|
clientOpts.config.BROKER_CLIENT_URL = `${proto}://localhost:${clientOpts.port}`;
|
|
@@ -64,7 +57,6 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
|
64
57
|
logger_1.log.info({ enabled: true, rulesCount: commitSigningRules.length }, 'loading commit signing rules');
|
|
65
58
|
}
|
|
66
59
|
return {
|
|
67
|
-
okToBoot,
|
|
68
60
|
preflightCheckResults: preflightCheckResults.length
|
|
69
61
|
? preflightCheckResults
|
|
70
62
|
: undefined,
|
|
@@ -72,7 +64,7 @@ const processStartUpHooks = async (clientOpts, brokerClientId) => {
|
|
|
72
64
|
}
|
|
73
65
|
catch (error) {
|
|
74
66
|
logger_1.log.error({ error }, 'Error processing startup hooks');
|
|
75
|
-
|
|
67
|
+
throw error;
|
|
76
68
|
}
|
|
77
69
|
};
|
|
78
70
|
exports.processStartUpHooks = processStartUpHooks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processHooks.js","sourceRoot":"","sources":["../../../../../lib/client/hooks/startup/processHooks.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAC5E,iDAAqD;AACrD,yCAA8E;AAC9E,mCAA2E;AAIpE,MAAM,mBAAmB,GAAG,KAAK,EACtC,UAAsB,EACtB,cAAsB,EACA,EAAE;;IACxB,IAAI;QACF,IAAI,
|
|
1
|
+
{"version":3,"file":"processHooks.js","sourceRoot":"","sources":["../../../../../lib/client/hooks/startup/processHooks.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/client/index.js
CHANGED
|
@@ -21,9 +21,6 @@ const main = async (clientOpts) => {
|
|
|
21
21
|
const brokerClientId = (0, uuid_1.v4)();
|
|
22
22
|
logger_1.log.info({ brokerClientId }, 'generated broker client id');
|
|
23
23
|
const hookResults = await (0, processHooks_1.processStartUpHooks)(clientOpts, brokerClientId);
|
|
24
|
-
if (!hookResults.okToBoot) {
|
|
25
|
-
throw new Error(`Processing startup hooks error. Interrupting broker client boot up.`);
|
|
26
|
-
}
|
|
27
24
|
const identifyingMetadata = {
|
|
28
25
|
capabilities: ['post-streams'],
|
|
29
26
|
clientId: brokerClientId,
|
|
@@ -66,6 +63,7 @@ const main = async (clientOpts) => {
|
|
|
66
63
|
}
|
|
67
64
|
catch (err) {
|
|
68
65
|
logger_1.log.warn({ err }, `Shutting down client`);
|
|
66
|
+
throw err;
|
|
69
67
|
}
|
|
70
68
|
};
|
|
71
69
|
exports.main = main;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/client/index.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAoC;AACpC,qCAA2C;AAC3C,2CAA+C;AAC/C,2EAAwE;AACxE,wDAAqD;AACrD,sEAA8C;AAC9C,gEAGqC;AACrC,2EAAwE;AACxE,2EAAwE;AAExE,+DAAmE;AAE5D,MAAM,IAAI,GAAG,KAAK,EAAE,UAAsB,EAAE,EAAE;;IACnD,IAAI;QACF,YAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAP,iBAAO,EAAE,EAAE,wBAAwB,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,IAAA,SAAM,GAAE,CAAC;QAChC,YAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,4BAA4B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/client/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const systemCheckHandler = async (req, res) => {
|
|
|
10
10
|
const clientOpts = res.locals.clientOpts;
|
|
11
11
|
const brokerClientValidationMethod = clientOpts.config.brokerClientValidationMethod || 'GET';
|
|
12
12
|
const brokerClientValidationTimeoutMs = clientOpts.config.brokerClientValidationTimeoutMs || 5000;
|
|
13
|
-
const isJsonResponse = !clientOpts.config.brokerClientValidationJsonDisabled;
|
|
14
13
|
// set auth header according to config
|
|
15
14
|
const { auths, rawCreds } = (0, credentials_1.loadCredentialsFromConfig)(clientOpts.config);
|
|
16
15
|
// make the internal validation request
|
|
@@ -21,7 +20,7 @@ const systemCheckHandler = async (req, res) => {
|
|
|
21
20
|
logger_1.log.info(`Checking if credentials at index ${i} are valid`);
|
|
22
21
|
const auth = auths[i];
|
|
23
22
|
const rawCred = rawCreds[i];
|
|
24
|
-
const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(auth, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs
|
|
23
|
+
const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(auth, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
|
|
25
24
|
data['maskedCredentials'] =
|
|
26
25
|
rawCred.length <= 6
|
|
27
26
|
? '***'
|
|
@@ -33,7 +32,7 @@ const systemCheckHandler = async (req, res) => {
|
|
|
33
32
|
}
|
|
34
33
|
else {
|
|
35
34
|
logger_1.log.info('No credentials specified - checking if target can be accessed without credentials');
|
|
36
|
-
const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(null, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs
|
|
35
|
+
const { data, errorOccurred: err } = await (0, credentials_1.checkCredentials)(null, clientOpts.config, brokerClientValidationMethod, brokerClientValidationTimeoutMs);
|
|
37
36
|
data['maskedCredentials'] = null;
|
|
38
37
|
validationResults.push(data);
|
|
39
38
|
errorOccurred = err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"systemCheckHandler.js","sourceRoot":"","sources":["../../../../lib/client/routesHandler/systemCheckHandler.ts"],"names":[],"mappings":";;;AACA,sDAG8B;AAC9B,8CAAkD;AAG3C,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACtE,mEAAmE;IACnE,mEAAmE;IACnE,sCAAsC;IAEtC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,UAAwB,CAAC;IACvD,MAAM,4BAA4B,GAChC,UAAU,CAAC,MAAM,CAAC,4BAA4B,IAAI,KAAK,CAAC;IAC1D,MAAM,+BAA+B,GACnC,UAAU,CAAC,MAAM,CAAC,+BAA+B,IAAI,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"systemCheckHandler.js","sourceRoot":"","sources":["../../../../lib/client/routesHandler/systemCheckHandler.ts"],"names":[],"mappings":";;;AACA,sDAG8B;AAC9B,8CAAkD;AAG3C,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACtE,mEAAmE;IACnE,mEAAmE;IACnE,sCAAsC;IAEtC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,UAAwB,CAAC;IACvD,MAAM,4BAA4B,GAChC,UAAU,CAAC,MAAM,CAAC,4BAA4B,IAAI,KAAK,CAAC;IAC1D,MAAM,+BAA+B,GACnC,UAAU,CAAC,MAAM,CAAC,+BAA+B,IAAI,IAAI,CAAC;IAE5D,sCAAsC;IACtC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAA,uCAAyB,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEzE,uCAAuC;IACvC,MAAM,iBAAiB,GAAQ,EAAE,CAAC;IAClC,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,YAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,YAAY,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,8BAAgB,EACzD,IAAI,EACJ,UAAU,CAAC,MAAM,EACjB,4BAA4B,EAC5B,+BAA+B,CAChC,CAAC;YACF,IAAI,CAAC,mBAAmB,CAAC;gBACvB,OAAO,CAAC,MAAM,IAAI,CAAC;oBACjB,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAC/C,OAAO,CAAC,MAAM,GAAG,CAAC,CACnB,EAAE,CAAC;YACV,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,aAAa,GAAG,GAAG,CAAC;YACpB,YAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACpC;KACF;SAAM;QACL,YAAM,CAAC,IAAI,CACT,mFAAmF,CACpF,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,8BAAgB,EACzD,IAAI,EACJ,UAAU,CAAC,MAAM,EACjB,4BAA4B,EAC5B,+BAA+B,CAChC,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;QACjC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,aAAa,GAAG,GAAG,CAAC;KACrB;IAED,IAAI,aAAa,EAAE;QACjB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAChD;SAAM;QACL,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAChD;AACH,CAAC,CAAC;AA1DW,QAAA,kBAAkB,sBA0D7B"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// import '../common/http/patch-https-request-for-proxying';
|
|
2
3
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
5
|
};
|
|
5
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
7
|
exports.createWebSocket = void 0;
|
|
7
|
-
require("../common/http/patch-https-request-for-proxying");
|
|
8
8
|
const primus_1 = __importDefault(require("primus"));
|
|
9
9
|
const logger_1 = require("../logs/logger");
|
|
10
10
|
const primus_emitter_1 = __importDefault(require("primus-emitter"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../lib/client/socket.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../lib/client/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.checkCredentials = exports.loadCredentialsFromConfig = void 0;
|
|
|
7
7
|
const logger_1 = require("../../logs/logger");
|
|
8
8
|
const version_1 = __importDefault(require("../../common/utils/version"));
|
|
9
9
|
const logger_2 = require("../../logs/logger");
|
|
10
|
-
const
|
|
10
|
+
const request_1 = require("../../common/http/request");
|
|
11
11
|
const credsFromHeader = (s) => {
|
|
12
12
|
if (s.indexOf(' ') >= 0) {
|
|
13
13
|
return s.substring(s.indexOf(' ') + 1);
|
|
@@ -40,7 +40,7 @@ const loadCredentialsFromConfig = (config) => {
|
|
|
40
40
|
return { auths, rawCreds };
|
|
41
41
|
};
|
|
42
42
|
exports.loadCredentialsFromConfig = loadCredentialsFromConfig;
|
|
43
|
-
const checkCredentials = async (auth, config, brokerClientValidationMethod, brokerClientValidationTimeoutMs
|
|
43
|
+
const checkCredentials = async (auth, config, brokerClientValidationMethod, brokerClientValidationTimeoutMs) => {
|
|
44
44
|
const data = {
|
|
45
45
|
brokerClientValidationUrl: (0, logger_2.sanitise)(config.brokerClientValidationUrl),
|
|
46
46
|
brokerClientValidationMethod,
|
|
@@ -54,48 +54,60 @@ const checkCredentials = async (auth, config, brokerClientValidationMethod, brok
|
|
|
54
54
|
}
|
|
55
55
|
let errorOccurred = true;
|
|
56
56
|
// This was originally `request`, but `await` is a lot easier to understand than nested callback hell.
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
57
|
+
try {
|
|
58
|
+
const response = await (0, request_1.makeRequestToDownstream)({
|
|
59
|
+
url: config.brokerClientValidationUrl,
|
|
60
|
+
headers: validationRequestHeaders,
|
|
61
|
+
method: brokerClientValidationMethod,
|
|
62
|
+
});
|
|
63
|
+
// await rp({
|
|
64
|
+
// url: config.brokerClientValidationUrl,
|
|
65
|
+
// headers: validationRequestHeaders,
|
|
66
|
+
// method: brokerClientValidationMethod,
|
|
67
|
+
// timeout: brokerClientValidationTimeoutMs,
|
|
68
|
+
// json: isJsonResponse,
|
|
69
|
+
// resolveWithFullResponse: true,
|
|
70
|
+
// agentOptions: {
|
|
71
|
+
// ca: config.caCert, // Optional CA cert
|
|
72
|
+
// },
|
|
73
|
+
// })
|
|
69
74
|
// test logic requires to surface internal data
|
|
70
75
|
// which is best not exposed in production
|
|
71
|
-
if (process.env.JEST_WORKER_ID) {
|
|
72
|
-
data['testResponse'] = response;
|
|
73
|
-
}
|
|
74
76
|
const responseStatusCode = response && response.statusCode;
|
|
77
|
+
if (!responseStatusCode) {
|
|
78
|
+
logger_1.log.error({ response }, 'Failed systemcheck, unexpected response code');
|
|
79
|
+
throw new Error('Failed systemcheck');
|
|
80
|
+
}
|
|
75
81
|
data['brokerClientValidationUrlStatusCode'] = responseStatusCode;
|
|
76
82
|
// check for 2xx status code
|
|
77
|
-
|
|
78
|
-
if (!goodStatusCode) {
|
|
83
|
+
if (responseStatusCode > 300) {
|
|
79
84
|
data['ok'] = false;
|
|
80
85
|
data['error'] =
|
|
81
86
|
responseStatusCode === 401 || responseStatusCode === 403
|
|
82
87
|
? 'Failed due to invalid credentials'
|
|
83
88
|
: 'Status code is not 2xx';
|
|
84
89
|
logger_1.log.error(data, response && response.body, 'Systemcheck failed');
|
|
85
|
-
return;
|
|
86
90
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
+
else {
|
|
92
|
+
const parsedBodyResponse = JSON.parse(response.body || {});
|
|
93
|
+
// const responseToReturn = response
|
|
94
|
+
response.body = parsedBodyResponse;
|
|
95
|
+
if (process.env.JEST_WORKER_ID) {
|
|
96
|
+
data['testResponse'] = response;
|
|
97
|
+
}
|
|
98
|
+
errorOccurred = false;
|
|
99
|
+
data['ok'] = true;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
91
103
|
// test logic requires to surface internal data
|
|
92
104
|
// which is best not exposed in production
|
|
93
105
|
if (process.env.JEST_WORKER_ID) {
|
|
94
106
|
data['testError'] = error;
|
|
95
107
|
}
|
|
96
108
|
data['ok'] = false;
|
|
97
|
-
data['error'] = error
|
|
98
|
-
}
|
|
109
|
+
data['error'] = error;
|
|
110
|
+
}
|
|
99
111
|
return { data, errorOccurred };
|
|
100
112
|
};
|
|
101
113
|
exports.checkCredentials = checkCredentials;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../../lib/client/utils/credentials.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAkD;AAClD,yEAAiD;AACjD,8CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../../lib/client/utils/credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,31 @@ 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.config = void 0;
|
|
6
|
+
exports.loadBrokerConfig = exports.config = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const camelcase_1 = __importDefault(require("camelcase"));
|
|
10
10
|
const snyk_config_1 = require("snyk-config");
|
|
11
11
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
exports.config = {};
|
|
13
|
+
const loadBrokerConfig = () => {
|
|
14
|
+
dotenv_1.default.config({
|
|
15
|
+
path: path_1.default.join(process.cwd(), '.env'),
|
|
16
|
+
});
|
|
17
|
+
const localConfig = (0, snyk_config_1.loadConfig)(path_1.default.join(__dirname, '..'));
|
|
18
|
+
expand(process.env);
|
|
19
|
+
exports.config = Object.assign({}, camelify(localConfig), camelify(process.env));
|
|
20
|
+
if (exports.config.caCert) {
|
|
21
|
+
exports.config.caCert = fs_1.default.readFileSync(path_1.default.resolve(process.cwd(), exports.config.caCert));
|
|
22
|
+
}
|
|
23
|
+
for (const [key, value] of Object.entries(exports.config)) {
|
|
24
|
+
if ((key.endsWith('Pool') || key.endsWith('_POOL')) &&
|
|
25
|
+
!Array.isArray(value)) {
|
|
26
|
+
exports.config[key] = value.split(',').map((s) => s.trim());
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
exports.loadBrokerConfig = loadBrokerConfig;
|
|
16
31
|
function camelify(res) {
|
|
17
32
|
return Object.keys(res).reduce((acc, key) => {
|
|
18
33
|
const camelKey = (0, camelcase_1.default)(key);
|
|
@@ -79,15 +94,4 @@ function expand(obj) {
|
|
|
79
94
|
}
|
|
80
95
|
return obj;
|
|
81
96
|
}
|
|
82
|
-
expand(process.env);
|
|
83
|
-
exports.config = Object.assign({}, camelify(localConfig), camelify(process.env));
|
|
84
|
-
if (exports.config.caCert) {
|
|
85
|
-
exports.config.caCert = fs_1.default.readFileSync(path_1.default.resolve(process.cwd(), exports.config.caCert));
|
|
86
|
-
}
|
|
87
|
-
for (const [key, value] of Object.entries(exports.config)) {
|
|
88
|
-
if ((key.endsWith('Pool') || key.endsWith('_POOL')) &&
|
|
89
|
-
!Array.isArray(value)) {
|
|
90
|
-
exports.config[key] = value.split(',').map((s) => s.trim());
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
97
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/common/config.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,0DAAkC;AAClC,6CAAyC;AACzC,oDAA4B;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/common/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filtersAsync.js","sourceRoot":"","sources":["../../../../lib/common/filter/filtersAsync.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAClC,oEAAwC;AACxC,4CAAoB;AACpB,gDAAwB;AACxB,0DAAkC;AAClC,wDAAgD;AAChD,uEAA8C;AAC9C,6EAAmD;AACnD,8CAAkD;AAClD,sCAAmC;AAuCnC,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE;IAC7D,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;QAClC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,4BAA4B;AACrB,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,EAAE;IAChD,IAAI,KAAK,GAAgB,EAAE,CAAC;IAE5B,sBAAsB;IACtB,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,KAAK,GAAG,UAAU,CAAC;KACpB;SAAM,IAAI,UAAU,EAAE;QACrB,YAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,EAAE,uCAAuC,CAAC,CAAC;QACtE,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO,KAAK,YAAY,CACjE,CAAC;KACH;IAED,YAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"filtersAsync.js","sourceRoot":"","sources":["../../../../lib/common/filter/filtersAsync.ts"],"names":[],"mappings":"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"}
|