snyk-broker 5.16.1 → 5.16.3
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/lib/hybrid-sdk/client/socket.js +21 -16
- package/dist/lib/hybrid-sdk/client/socket.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/reconnectHandler.js +2 -2
- package/dist/lib/hybrid-sdk/client/socketHandlers/reconnectHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/auth/authHelpers.js +23 -7
- package/dist/lib/hybrid-sdk/server/auth/authHelpers.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/socket.js +10 -1
- package/dist/lib/hybrid-sdk/server/socket.js.map +1 -1
- package/dist/package.json +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -6,6 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.createWebSocket = exports.createWebSocketConnectionPairs = void 0;
|
|
8
8
|
const primus_1 = __importDefault(require("primus"));
|
|
9
|
+
const uuid_1 = require("uuid");
|
|
9
10
|
const logger_1 = require("../../logs/logger");
|
|
10
11
|
const primus_emitter_1 = __importDefault(require("primus-emitter"));
|
|
11
12
|
const reconnectHandler_1 = require("./socketHandlers/reconnectHandler");
|
|
@@ -118,16 +119,22 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
118
119
|
pong: parseInt(localClientOps.config.socketPongTimeout) || 10000,
|
|
119
120
|
timeout: parseInt(localClientOps.config.socketConnectTimeout) || 10000,
|
|
120
121
|
};
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
},
|
|
122
|
+
let currentRequestId = (0, uuid_1.v4)();
|
|
123
|
+
const buildExtraHeaders = (requestId) => {
|
|
124
|
+
const headers = {
|
|
125
|
+
'x-snyk-broker-client-id': identifyingMetadata.clientId,
|
|
126
|
+
'x-snyk-broker-client-role': identifyingMetadata.role,
|
|
127
|
+
'x-broker-client-version': version_1.default,
|
|
128
|
+
'snyk-request-id': requestId,
|
|
129
129
|
};
|
|
130
|
-
|
|
130
|
+
if ((0, oauth_1.getAuthConfig)().accessToken && clientOpts.config.UNIVERSAL_BROKER_GA) {
|
|
131
|
+
headers.Authorization = (0, oauth_1.getAuthConfig)().accessToken.authHeader;
|
|
132
|
+
}
|
|
133
|
+
return headers;
|
|
134
|
+
};
|
|
135
|
+
socketSettings['transport'] = {
|
|
136
|
+
extraHeaders: buildExtraHeaders(currentRequestId),
|
|
137
|
+
};
|
|
131
138
|
const websocket = new Socket(localClientOps.config.brokerServerUrlForSocket, socketSettings);
|
|
132
139
|
websocket.socketVersion = 1;
|
|
133
140
|
websocket.socketType = 'client';
|
|
@@ -152,12 +159,7 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
152
159
|
connection: (0, token_1.maskToken)(identifyingMetadata.identifier),
|
|
153
160
|
role: identifyingMetadata.role,
|
|
154
161
|
};
|
|
155
|
-
websocket.transport.extraHeaders =
|
|
156
|
-
Authorization: (0, oauth_1.getAuthConfig)().accessToken.authHeader,
|
|
157
|
-
'x-snyk-broker-client-id': identifyingMetadata.clientId,
|
|
158
|
-
'x-snyk-broker-client-role': identifyingMetadata.role,
|
|
159
|
-
'x-broker-client-version': version_1.default,
|
|
160
|
-
};
|
|
162
|
+
websocket.transport.extraHeaders = buildExtraHeaders(currentRequestId);
|
|
161
163
|
logger_1.log.debug(commonLogFields, 'Renewing auth.');
|
|
162
164
|
const renewResponse = await (0, brokerServerConnection_1.renewBrokerServerConnection)({
|
|
163
165
|
connectionIdentifier: identifyingMetadata.identifier,
|
|
@@ -200,6 +202,7 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
200
202
|
logger_1.log.info({
|
|
201
203
|
url: localClientOps.config.brokerServerUrlForSocket,
|
|
202
204
|
serverId: serverId,
|
|
205
|
+
requestId: currentRequestId,
|
|
203
206
|
}, `Broker client is connecting to broker server ${role}.`);
|
|
204
207
|
(0, init_1.initializeSocketHandlers)(websocket, localClientOps);
|
|
205
208
|
// Websocket events
|
|
@@ -207,7 +210,9 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
207
210
|
websocket.on('reconnect scheduled', (opts) => {
|
|
208
211
|
metricsClient.setConnectionState('reconnecting', identifyingMetadata.role);
|
|
209
212
|
metricsClient.recordReconnect();
|
|
210
|
-
(0,
|
|
213
|
+
currentRequestId = (0, uuid_1.v4)();
|
|
214
|
+
websocket.transport.extraHeaders = buildExtraHeaders(currentRequestId);
|
|
215
|
+
(0, reconnectHandler_1.reconnectScheduledHandler)(opts, currentRequestId);
|
|
211
216
|
});
|
|
212
217
|
websocket.on('reconnect failed', () => {
|
|
213
218
|
metricsClient.setConnectionState('failed', identifyingMetadata.role);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/socket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.reconnectFailedHandler = exports.reconnectScheduledHandler = void 0;
|
|
4
4
|
const logger_1 = require("../../../logs/logger");
|
|
5
|
-
const reconnectScheduledHandler = (opts) => {
|
|
5
|
+
const reconnectScheduledHandler = (opts, requestId) => {
|
|
6
6
|
const attemptIn = Math.floor(opts.scheduled / 1000);
|
|
7
|
-
logger_1.log.warn(`Reconnect retry #${opts.attempt} of ${opts.retries} in about ${attemptIn}s.`);
|
|
7
|
+
logger_1.log.warn({ requestId }, `Reconnect retry #${opts.attempt} of ${opts.retries} in about ${attemptIn}s.`);
|
|
8
8
|
};
|
|
9
9
|
exports.reconnectScheduledHandler = reconnectScheduledHandler;
|
|
10
10
|
const reconnectFailedHandler = (io) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconnectHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/socketHandlers/reconnectHandler.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AAE9C,MAAM,yBAAyB,GAAG,CAAC,IAAI,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"reconnectHandler.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/socketHandlers/reconnectHandler.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AAE9C,MAAM,yBAAyB,GAAG,CAAC,IAAI,EAAE,SAAkB,EAAE,EAAE;IACpE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACpD,YAAM,CAAC,IAAI,CACT,EAAE,SAAS,EAAE,EACb,oBAAoB,IAAI,CAAC,OAAO,OAAO,IAAI,CAAC,OAAO,aAAa,SAAS,IAAI,CAC9E,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,yBAAyB,6BAMpC;AAEK,MAAM,sBAAsB,GAAG,CAAC,EAAE,EAAE,EAAE;IAC3C,EAAE,CAAC,GAAG,EAAE,CAAC;IACT,YAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAJW,QAAA,sBAAsB,0BAIjC"}
|
|
@@ -9,6 +9,7 @@ const AUTHORIZATION_HEADER = 'authorization';
|
|
|
9
9
|
const FORWARDED_FOR_HEADER = 'x-forwarded-for';
|
|
10
10
|
const BROKER_CLIENT_ID_HEADER = 'x-snyk-broker-client-id';
|
|
11
11
|
const BROKER_CLIENT_ROLE_HEADER = 'x-snyk-broker-client-role';
|
|
12
|
+
const SNYK_REQUEST_ID_HEADER = 'snyk-request-id';
|
|
12
13
|
function getHeader(headers, headerName) {
|
|
13
14
|
const header = headers[headerName];
|
|
14
15
|
if (Array.isArray(header)) {
|
|
@@ -28,13 +29,26 @@ function getTlsOptions(isInternalJWT) {
|
|
|
28
29
|
}
|
|
29
30
|
return {};
|
|
30
31
|
}
|
|
32
|
+
function getHeaderOptions(authHeader) {
|
|
33
|
+
const requestHeaders = {
|
|
34
|
+
authorization: authHeader,
|
|
35
|
+
'Content-type': 'application/vnd.api+json',
|
|
36
|
+
};
|
|
37
|
+
const gatewayHeaderName = process.env.GATEWAY_HEADER_NAME;
|
|
38
|
+
const gatewayHeaderValue = process.env.GATEWAY_HEADER_VALUE;
|
|
39
|
+
if (gatewayHeaderName) {
|
|
40
|
+
requestHeaders[gatewayHeaderName] = gatewayHeaderValue ?? '';
|
|
41
|
+
}
|
|
42
|
+
return requestHeaders;
|
|
43
|
+
}
|
|
31
44
|
const validateBrokerClientCredentials = async (headers, brokerConnectionIdentifier, isInternalJWT = false, brokerClientId) => {
|
|
32
45
|
const authHeader = getHeader(headers, AUTHORIZATION_HEADER);
|
|
33
46
|
brokerClientId =
|
|
34
47
|
brokerClientId ?? getHeader(headers, BROKER_CLIENT_ID_HEADER);
|
|
35
48
|
const role = getHeader(headers, BROKER_CLIENT_ROLE_HEADER) ?? '';
|
|
49
|
+
const requestId = getHeader(headers, SNYK_REQUEST_ID_HEADER) ?? '';
|
|
36
50
|
const maskedToken = (0, token_1.maskToken)(brokerConnectionIdentifier);
|
|
37
|
-
logger_1.log.debug({ maskedToken, brokerClientId }, `Validating auth for connection ${brokerConnectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
51
|
+
logger_1.log.debug({ maskedToken, brokerClientId, requestId }, `Validating auth for connection ${brokerConnectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
38
52
|
if (!authHeader ||
|
|
39
53
|
!authHeader.toLowerCase().startsWith('bearer') ||
|
|
40
54
|
!brokerClientId) {
|
|
@@ -42,7 +56,7 @@ const validateBrokerClientCredentials = async (headers, brokerConnectionIdentifi
|
|
|
42
56
|
}
|
|
43
57
|
const credentials = authHeader.substring(authHeader.indexOf(' ') + 1);
|
|
44
58
|
if (!credentials) {
|
|
45
|
-
logger_1.log.debug({ maskedToken, brokerClientId }, `Denied auth for connection ${brokerConnectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
59
|
+
logger_1.log.debug({ maskedToken, brokerClientId, requestId }, `Denied auth for connection ${brokerConnectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
46
60
|
throw new BrokerAuthError('Invalid JWT.');
|
|
47
61
|
}
|
|
48
62
|
const body = {
|
|
@@ -57,10 +71,7 @@ const validateBrokerClientCredentials = async (headers, brokerConnectionIdentifi
|
|
|
57
71
|
? (0, config_1.getConfig)().authorizationService
|
|
58
72
|
: process.env.GATEWAY_HOSTNAME;
|
|
59
73
|
const tlsOptions = getTlsOptions(isInternalJWT);
|
|
60
|
-
const requestHeaders =
|
|
61
|
-
authorization: authHeader,
|
|
62
|
-
'Content-type': 'application/vnd.api+json',
|
|
63
|
-
};
|
|
74
|
+
const requestHeaders = getHeaderOptions(authHeader);
|
|
64
75
|
const xForwardedFor = getHeader(headers, FORWARDED_FOR_HEADER);
|
|
65
76
|
if (xForwardedFor !== undefined) {
|
|
66
77
|
requestHeaders[FORWARDED_FOR_HEADER] = xForwardedFor;
|
|
@@ -76,9 +87,14 @@ const validateBrokerClientCredentials = async (headers, brokerConnectionIdentifi
|
|
|
76
87
|
logger_1.log.debug({
|
|
77
88
|
maskedToken,
|
|
78
89
|
validationResponseCode: response.statusCode,
|
|
90
|
+
requestId,
|
|
79
91
|
}, 'Validate Broker Client Credentials response');
|
|
80
92
|
if (response.statusCode !== 201) {
|
|
81
|
-
logger_1.log.debug({
|
|
93
|
+
logger_1.log.debug({
|
|
94
|
+
statusCode: response.statusCode,
|
|
95
|
+
message: response.statusText,
|
|
96
|
+
requestId,
|
|
97
|
+
}, `Broker ${brokerConnectionIdentifier} client ID ${brokerClientId} failed validation.`);
|
|
82
98
|
throw new BrokerAuthError('Invalid credentials.');
|
|
83
99
|
}
|
|
84
100
|
logger_1.log.debug({ maskedToken, brokerClientId }, `Successful auth for connection ${brokerConnectionIdentifier} client Id ${brokerClientId}, role ${role}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authHelpers.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/auth/authHelpers.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AACvD,oDAAqD;AACrD,iDAAqD;AAErD,gDAAsE;AAEtE,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAC7C,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAC/C,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAC1D,MAAM,yBAAyB,GAAG,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"authHelpers.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/server/auth/authHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,7 @@ const socket = ({ server, loadedServerOpts }) => {
|
|
|
41
41
|
const connectionIdentifier = req.uri.pathname
|
|
42
42
|
.replaceAll(/^\/primus\/([^/]+)\//g, '$1')
|
|
43
43
|
.toLowerCase();
|
|
44
|
+
const requestId = req.headers['snyk-request-id'];
|
|
44
45
|
try {
|
|
45
46
|
const { brokerClientId, credentials, role } =
|
|
46
47
|
// deepcode ignore Ssrf: request URL comes from the filter response, with the origin url being injected by the filtered version
|
|
@@ -73,6 +74,11 @@ const socket = ({ server, loadedServerOpts }) => {
|
|
|
73
74
|
}
|
|
74
75
|
catch (err) {
|
|
75
76
|
if (err instanceof authHelpers_1.BrokerAuthError) {
|
|
77
|
+
logger_1.log.warn({
|
|
78
|
+
maskedToken: (0, token_1.maskToken)(connectionIdentifier),
|
|
79
|
+
requestId,
|
|
80
|
+
reason: err.message,
|
|
81
|
+
}, 'Rejected broker client websocket connection.');
|
|
76
82
|
done({
|
|
77
83
|
statusCode: 401,
|
|
78
84
|
authenticate: 'Bearer',
|
|
@@ -80,7 +86,10 @@ const socket = ({ server, loadedServerOpts }) => {
|
|
|
80
86
|
});
|
|
81
87
|
return;
|
|
82
88
|
}
|
|
83
|
-
logger_1.log.error({
|
|
89
|
+
logger_1.log.error({
|
|
90
|
+
maskedToken: (0, token_1.maskToken)(connectionIdentifier),
|
|
91
|
+
requestId,
|
|
92
|
+
}, `Unexpected error occurred while validating broker client credentials: ${err}.`);
|
|
84
93
|
done(err);
|
|
85
94
|
return;
|
|
86
95
|
}
|
|
@@ -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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"}
|
package/dist/package.json
CHANGED
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"@opentelemetry/instrumentation": "0.212.0",
|
|
87
87
|
"@opentelemetry/instrumentation-runtime-node": "0.25.0",
|
|
88
88
|
"@opentelemetry/sdk-metrics": "2.5.1",
|
|
89
|
-
"axios": "1.
|
|
89
|
+
"axios": "1.16.0",
|
|
90
90
|
"axios-retry": "4.5.0",
|
|
91
91
|
"body-parser": "1.20.4",
|
|
92
92
|
"bunyan": "^1.8.12",
|
|
@@ -156,5 +156,5 @@
|
|
|
156
156
|
"form-data": "4.0.4",
|
|
157
157
|
"ws": "7.5.10"
|
|
158
158
|
},
|
|
159
|
-
"version": "5.16.
|
|
159
|
+
"version": "5.16.3"
|
|
160
160
|
}
|