@mongodb-js/devtools-connect 2.4.3 → 2.5.0
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/.esm-wrapper.mjs +1 -1
- package/{lib → dist}/connect.d.ts +1 -0
- package/dist/connect.d.ts.map +1 -0
- package/{lib → dist}/connect.js +76 -33
- package/dist/connect.js.map +1 -0
- package/{lib → dist}/fast-failure-connect.d.ts +1 -0
- package/dist/fast-failure-connect.d.ts.map +1 -0
- package/{lib → dist}/fast-failure-connect.js +1 -1
- package/dist/fast-failure-connect.js.map +1 -0
- package/{lib → dist}/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -0
- package/{lib → dist}/ipc-rpc-state-share.d.ts +2 -1
- package/dist/ipc-rpc-state-share.d.ts.map +1 -0
- package/{lib → dist}/ipc-rpc-state-share.js +30 -19
- package/dist/ipc-rpc-state-share.js.map +1 -0
- package/{lib → dist}/log-hook.d.ts +1 -0
- package/dist/log-hook.d.ts.map +1 -0
- package/{lib → dist}/log-hook.js +8 -8
- package/dist/log-hook.js.map +1 -0
- package/{lib → dist}/oidc/handler.d.ts +1 -0
- package/dist/oidc/handler.d.ts.map +1 -0
- package/dist/oidc/handler.js +41 -0
- package/dist/oidc/handler.js.map +1 -0
- package/{lib → dist}/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -0
- package/package.json +37 -26
- package/README.md +0 -7
- package/lib/connect.js.map +0 -1
- package/lib/fast-failure-connect.js.map +0 -1
- package/lib/ipc-rpc-state-share.js.map +0 -1
- package/lib/log-hook.js.map +0 -1
- package/lib/oidc/handler.js +0 -29
- package/lib/oidc/handler.js.map +0 -1
- package/lib/oidc/static/create-static-pages.d.ts +0 -4
- package/lib/oidc/static/create-static-pages.js +0 -89
- package/lib/oidc/static/create-static-pages.js.map +0 -1
- package/lib/oidc/static/create-static-pages.spec.d.ts +0 -1
- package/lib/oidc/static/create-static-pages.spec.js +0 -71
- package/lib/oidc/static/create-static-pages.spec.js.map +0 -1
- package/lib/oidc/static/pages-source.d.ts +0 -12
- package/lib/oidc/static/pages-source.js +0 -95
- package/lib/oidc/static/pages-source.js.map +0 -1
- package/lib/oidc/static/static-pages.js +0 -109
- /package/{lib → dist}/index.js +0 -0
- /package/{lib → dist}/index.js.map +0 -0
- /package/{lib → dist}/types.js +0 -0
- /package/{lib → dist}/types.js.map +0 -0
package/.esm-wrapper.mjs
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,SAAS,CAAC;AAQjB,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AAmBjC,qBAAa,8BAA+B,SAAQ,KAAK;;CAMxD;AA0OD,qBAAa,uBAAuB;IAC3B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,gBAAgB,CAAiC;IACzD,OAAO,CAAC,gBAAgB,CAAiC;gBAGvD,OAAO,EAAE,IAAI,CACX,sBAAsB,EACtB,iBAAiB,GAAG,aAAa,GAAG,MAAM,GAAG,cAAc,CAC5D,EACD,MAAM,EAAE,iBAAiB;IA+BrB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAKhE,WAAW,CAAC,EAAE,OAAO,CAAC;IAItB,eAAe,EAAE,MAAM,CAAC;IAIxB,WAAW,EAAE,MAAM,CAAC;IAIpB,IAAI,CAAC,EAAE,IAAI,CACT,wBAAwB,EACxB,QAAQ,GAAG,8BAA8B,CAC1C,CAAC;IAKF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAStC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,sBAAsB,EACrC,MAAM,EAAE,iBAAiB,EACzB,gBAAgB,EAAE,OAAO,WAAW,GACnC,OAAO,CAAC;IACT,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC,CA0ED;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAuBT"}
|
package/{lib → dist}/connect.js
RENAMED
|
@@ -39,7 +39,7 @@ const events_1 = __importDefault(require("events"));
|
|
|
39
39
|
function isAtlas(str) {
|
|
40
40
|
try {
|
|
41
41
|
const { hosts } = new mongodb_connection_string_url_1.default(str);
|
|
42
|
-
return hosts.every(host => /(^|\.)mongodb.net(:|$)/.test(host));
|
|
42
|
+
return hosts.every((host) => /(^|\.)mongodb.net(:|$)/.test(host));
|
|
43
43
|
}
|
|
44
44
|
catch {
|
|
45
45
|
return false;
|
|
@@ -58,10 +58,11 @@ async function connectWithFailFast(uri, client, logger) {
|
|
|
58
58
|
uri,
|
|
59
59
|
driver: client.options.metadata.driver,
|
|
60
60
|
devtoolsConnectVersion: require('../package.json').version,
|
|
61
|
-
host: client.options.srvHost ?? client.options.hosts.join(',')
|
|
61
|
+
host: client.options.srvHost ?? client.options.hosts.join(','),
|
|
62
62
|
});
|
|
63
|
-
const heartbeatFailureListener = ({ failure, connectionId }) => {
|
|
64
|
-
const topologyDescription = client
|
|
63
|
+
const heartbeatFailureListener = ({ failure, connectionId, }) => {
|
|
64
|
+
const topologyDescription = client
|
|
65
|
+
.topology?.description;
|
|
65
66
|
const servers = topologyDescription?.servers;
|
|
66
67
|
const isFailFast = (0, fast_failure_connect_1.isFastFailureConnectionError)(failure);
|
|
67
68
|
const isKnownServer = !!servers?.has(connectionId);
|
|
@@ -69,21 +70,23 @@ async function connectWithFailFast(uri, client, logger) {
|
|
|
69
70
|
connectionId,
|
|
70
71
|
failure,
|
|
71
72
|
isFailFast,
|
|
72
|
-
isKnownServer
|
|
73
|
+
isKnownServer,
|
|
73
74
|
});
|
|
74
75
|
if (!isKnownServer) {
|
|
75
76
|
return;
|
|
76
77
|
}
|
|
77
78
|
if (isFailFast && servers) {
|
|
78
79
|
failedConnections.set(connectionId, failure);
|
|
79
|
-
if ([...servers.keys()].every(server => failedConnections.has(server))) {
|
|
80
|
+
if ([...servers.keys()].every((server) => failedConnections.has(server))) {
|
|
80
81
|
logger.emit('devtools-connect:connect-fail-early');
|
|
81
82
|
failEarlyClosePromise = client.close();
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
85
|
};
|
|
85
|
-
const heartbeatSucceededListener = ({ connectionId }) => {
|
|
86
|
-
logger.emit('devtools-connect:connect-heartbeat-succeeded', {
|
|
86
|
+
const heartbeatSucceededListener = ({ connectionId, }) => {
|
|
87
|
+
logger.emit('devtools-connect:connect-heartbeat-succeeded', {
|
|
88
|
+
connectionId,
|
|
89
|
+
});
|
|
87
90
|
failedConnections.delete(connectionId);
|
|
88
91
|
};
|
|
89
92
|
client.addListener('serverHeartbeatFailed', heartbeatFailureListener);
|
|
@@ -108,7 +111,8 @@ async function connectWithFailFast(uri, client, logger) {
|
|
|
108
111
|
client.removeListener('serverHeartbeatFailed', heartbeatFailureListener);
|
|
109
112
|
client.removeListener('serverHeartbeatSucceeded', heartbeatSucceededListener);
|
|
110
113
|
logger.emit('devtools-connect:connect-attempt-finished', {
|
|
111
|
-
cryptSharedLibVersionInfo: client?.autoEncrypter
|
|
114
|
+
cryptSharedLibVersionInfo: client?.autoEncrypter
|
|
115
|
+
?.cryptSharedLibVersionInfo,
|
|
112
116
|
});
|
|
113
117
|
}
|
|
114
118
|
}
|
|
@@ -119,23 +123,29 @@ async function resolveMongodbSrv(uri, logger) {
|
|
|
119
123
|
try {
|
|
120
124
|
resolveDnsHelpers ?? (resolveDnsHelpers = {
|
|
121
125
|
resolve: require('resolve-mongodb-srv'),
|
|
122
|
-
osDns: require('os-dns-native')
|
|
126
|
+
osDns: require('os-dns-native'),
|
|
123
127
|
});
|
|
124
128
|
}
|
|
125
129
|
catch (error) {
|
|
126
130
|
logger.emit('devtools-connect:resolve-srv-error', {
|
|
127
|
-
from: '',
|
|
131
|
+
from: '',
|
|
132
|
+
error,
|
|
133
|
+
duringLoad: true,
|
|
134
|
+
resolutionDetails,
|
|
128
135
|
});
|
|
129
136
|
}
|
|
130
137
|
if (resolveDnsHelpers !== undefined) {
|
|
131
138
|
try {
|
|
132
|
-
const { wasNativelyLookedUp, withNodeFallback: { resolveSrv, resolveTxt } } = resolveDnsHelpers.osDns;
|
|
139
|
+
const { wasNativelyLookedUp, withNodeFallback: { resolveSrv, resolveTxt }, } = resolveDnsHelpers.osDns;
|
|
133
140
|
const resolved = await resolveDnsHelpers.resolve(uri, {
|
|
134
141
|
dns: {
|
|
135
142
|
resolveSrv(hostname, cb) {
|
|
136
143
|
resolveSrv(hostname, (...args) => {
|
|
137
144
|
resolutionDetails.push({
|
|
138
|
-
query: 'SRV',
|
|
145
|
+
query: 'SRV',
|
|
146
|
+
hostname,
|
|
147
|
+
error: args[0]?.message,
|
|
148
|
+
wasNativelyLookedUp: wasNativelyLookedUp(args[1]),
|
|
139
149
|
});
|
|
140
150
|
cb(...args);
|
|
141
151
|
});
|
|
@@ -143,18 +153,30 @@ async function resolveMongodbSrv(uri, logger) {
|
|
|
143
153
|
resolveTxt(hostname, cb) {
|
|
144
154
|
resolveTxt(hostname, (...args) => {
|
|
145
155
|
resolutionDetails.push({
|
|
146
|
-
query: 'TXT',
|
|
156
|
+
query: 'TXT',
|
|
157
|
+
hostname,
|
|
158
|
+
error: args[0]?.message,
|
|
159
|
+
wasNativelyLookedUp: wasNativelyLookedUp(args[1]),
|
|
147
160
|
});
|
|
148
161
|
cb(...args);
|
|
149
162
|
});
|
|
150
|
-
}
|
|
151
|
-
}
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
});
|
|
166
|
+
logger.emit('devtools-connect:resolve-srv-succeeded', {
|
|
167
|
+
from: uri,
|
|
168
|
+
to: resolved,
|
|
169
|
+
resolutionDetails,
|
|
152
170
|
});
|
|
153
|
-
logger.emit('devtools-connect:resolve-srv-succeeded', { from: uri, to: resolved, resolutionDetails });
|
|
154
171
|
return resolved;
|
|
155
172
|
}
|
|
156
173
|
catch (error) {
|
|
157
|
-
logger.emit('devtools-connect:resolve-srv-error', {
|
|
174
|
+
logger.emit('devtools-connect:resolve-srv-error', {
|
|
175
|
+
from: uri,
|
|
176
|
+
error,
|
|
177
|
+
duringLoad: false,
|
|
178
|
+
resolutionDetails,
|
|
179
|
+
});
|
|
158
180
|
throw error;
|
|
159
181
|
}
|
|
160
182
|
}
|
|
@@ -166,31 +188,46 @@ function detectAndLogMissingOptionalDependencies(logger) {
|
|
|
166
188
|
require('socks');
|
|
167
189
|
}
|
|
168
190
|
catch (error) {
|
|
169
|
-
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
191
|
+
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
192
|
+
name: 'socks',
|
|
193
|
+
error,
|
|
194
|
+
});
|
|
170
195
|
}
|
|
171
196
|
try {
|
|
172
197
|
require('mongodb-client-encryption');
|
|
173
198
|
}
|
|
174
199
|
catch (error) {
|
|
175
|
-
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
200
|
+
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
201
|
+
name: 'mongodb-client-encryption',
|
|
202
|
+
error,
|
|
203
|
+
});
|
|
176
204
|
}
|
|
177
205
|
try {
|
|
178
206
|
require('os-dns-native');
|
|
179
207
|
}
|
|
180
208
|
catch (error) {
|
|
181
|
-
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
209
|
+
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
210
|
+
name: 'os-dns-native',
|
|
211
|
+
error,
|
|
212
|
+
});
|
|
182
213
|
}
|
|
183
214
|
try {
|
|
184
215
|
require('resolve-mongodb-srv');
|
|
185
216
|
}
|
|
186
217
|
catch (error) {
|
|
187
|
-
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
218
|
+
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
219
|
+
name: 'resolve-mongodb-srv',
|
|
220
|
+
error,
|
|
221
|
+
});
|
|
188
222
|
}
|
|
189
223
|
try {
|
|
190
224
|
require('kerberos');
|
|
191
225
|
}
|
|
192
226
|
catch (error) {
|
|
193
|
-
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
227
|
+
logger.emit('devtools-connect:missing-optional-dependency', {
|
|
228
|
+
name: 'kerberos',
|
|
229
|
+
error,
|
|
230
|
+
});
|
|
194
231
|
}
|
|
195
232
|
}
|
|
196
233
|
class DevtoolsConnectionState {
|
|
@@ -212,7 +249,7 @@ class DevtoolsConnectionState {
|
|
|
212
249
|
this.oidcPlugin = (0, oidc_plugin_1.createMongoDBOIDCPlugin)({
|
|
213
250
|
...options.oidc,
|
|
214
251
|
logger: proxyingLogger,
|
|
215
|
-
redirectServerRequestHandler: handler_1.oidcServerRequestHandler.bind(null, options)
|
|
252
|
+
redirectServerRequestHandler: handler_1.oidcServerRequestHandler.bind(null, options),
|
|
216
253
|
});
|
|
217
254
|
}
|
|
218
255
|
}
|
|
@@ -229,7 +266,8 @@ exports.DevtoolsConnectionState = DevtoolsConnectionState;
|
|
|
229
266
|
async function connectMongoClient(uri, clientOptions, logger, MongoClientClass) {
|
|
230
267
|
detectAndLogMissingOptionalDependencies(logger);
|
|
231
268
|
const shouldAddOidcCallbacks = isHumanOidcFlow(uri, clientOptions);
|
|
232
|
-
const state = clientOptions.parentState ??
|
|
269
|
+
const state = clientOptions.parentState ??
|
|
270
|
+
new DevtoolsConnectionState(clientOptions, logger);
|
|
233
271
|
const mongoClientOptions = (0, lodash_merge_1.default)({}, clientOptions, shouldAddOidcCallbacks ? state.oidcPlugin.mongoClientOptions : {});
|
|
234
272
|
mongoClientOptions.lookup = (hostname, options, callback) => {
|
|
235
273
|
return dns_1.default.lookup(hostname, { verbatim: false, ...options }, callback);
|
|
@@ -239,7 +277,7 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
|
|
|
239
277
|
const ca = await (0, system_ca_1.systemCertsAsync)(systemCAOpts);
|
|
240
278
|
logger.emit('devtools-connect:used-system-ca', {
|
|
241
279
|
caCount: ca.length,
|
|
242
|
-
asyncFallbackError: systemCAOpts.asyncFallbackError
|
|
280
|
+
asyncFallbackError: systemCAOpts.asyncFallbackError,
|
|
243
281
|
});
|
|
244
282
|
mongoClientOptions.ca = ca.join('\n');
|
|
245
283
|
}
|
|
@@ -258,10 +296,13 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
|
|
|
258
296
|
const client = new MongoClientClass(uri, optionsWithoutFLE);
|
|
259
297
|
closeMongoClientWhenAuthFails(state, client);
|
|
260
298
|
await connectWithFailFast(uri, client, logger);
|
|
261
|
-
const buildInfo = await client
|
|
299
|
+
const buildInfo = await client
|
|
300
|
+
.db('admin')
|
|
301
|
+
.admin()
|
|
302
|
+
.command({ buildInfo: 1 });
|
|
262
303
|
await client.close();
|
|
263
|
-
if (!
|
|
264
|
-
!
|
|
304
|
+
if (!buildInfo.modules?.includes('enterprise') &&
|
|
305
|
+
!buildInfo.gitVersion?.match(/enterprise/)) {
|
|
265
306
|
throw new MongoAutoencryptionUnavailable();
|
|
266
307
|
}
|
|
267
308
|
}
|
|
@@ -270,13 +311,14 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
|
|
|
270
311
|
closeMongoClientWhenAuthFails(state, client);
|
|
271
312
|
await connectWithFailFast(uri, client, logger);
|
|
272
313
|
if (client.autoEncrypter) {
|
|
273
|
-
|
|
314
|
+
client.autoEncrypter[Symbol.for('@@mdb.decorateDecryptionResult')] = true;
|
|
274
315
|
}
|
|
275
316
|
return { client, state };
|
|
276
317
|
}
|
|
277
318
|
exports.connectMongoClient = connectMongoClient;
|
|
278
319
|
function isHumanOidcFlow(uri, clientOptions) {
|
|
279
|
-
if ((clientOptions.authMechanism &&
|
|
320
|
+
if ((clientOptions.authMechanism &&
|
|
321
|
+
clientOptions.authMechanism !== 'MONGODB-OIDC') ||
|
|
280
322
|
clientOptions.authMechanismProperties?.PROVIDER_NAME) {
|
|
281
323
|
return false;
|
|
282
324
|
}
|
|
@@ -289,14 +331,15 @@ function isHumanOidcFlow(uri, clientOptions) {
|
|
|
289
331
|
}
|
|
290
332
|
const sp = cs.typedSearchParams();
|
|
291
333
|
const authMechanism = clientOptions.authMechanism ?? sp.get('authMechanism');
|
|
292
|
-
return authMechanism === 'MONGODB-OIDC' &&
|
|
334
|
+
return (authMechanism === 'MONGODB-OIDC' &&
|
|
335
|
+
!new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(sp.get('authMechanismProperties')).get('PROVIDER_NAME'));
|
|
293
336
|
}
|
|
294
337
|
exports.isHumanOidcFlow = isHumanOidcFlow;
|
|
295
338
|
function closeMongoClientWhenAuthFails(state, client) {
|
|
296
339
|
const originalClose = client.close;
|
|
297
340
|
client.close = async function (...args) {
|
|
298
341
|
let closeEmitted = false;
|
|
299
|
-
const onClose = () => closeEmitted = true;
|
|
342
|
+
const onClose = () => (closeEmitted = true);
|
|
300
343
|
this.on('close', onClose);
|
|
301
344
|
const result = await originalClose.call(this, ...args);
|
|
302
345
|
this.off('close', onClose);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fast-failure-connect.d.ts","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":"AAGA,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAWlE"}
|
|
@@ -4,7 +4,7 @@ exports.isFastFailureConnectionError = void 0;
|
|
|
4
4
|
function isFastFailureConnectionError(error) {
|
|
5
5
|
switch (error.name) {
|
|
6
6
|
case 'MongoNetworkError':
|
|
7
|
-
return /\b(ECONNREFUSED|ENOTFOUND|ENETUNREACH)\b/.test(error.message);
|
|
7
|
+
return /\b(ECONNREFUSED|ENOTFOUND|ENETUNREACH|EINVAL)\b/.test(error.message);
|
|
8
8
|
case 'MongoError':
|
|
9
9
|
return /The apiVersion parameter is required/.test(error.message);
|
|
10
10
|
default:
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fast-failure-connect.js","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":";;;AAGA,SAAgB,4BAA4B,CAAC,KAAY;IACvD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,mBAAmB;YACtB,OAAO,iDAAiD,CAAC,IAAI,CAC3D,KAAK,CAAC,OAAO,CACd,CAAC;QACJ,KAAK,YAAY;YACf,OAAO,sCAAsC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpE;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAXD,oEAWC"}
|
package/{lib → dist}/index.d.ts
RENAMED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './types';
|
|
2
2
|
export { connectMongoClient } from './connect';
|
|
3
|
-
export type { DevtoolsConnectOptions, DevtoolsConnectionState } from './connect';
|
|
3
|
+
export type { DevtoolsConnectOptions, DevtoolsConnectionState, } from './connect';
|
|
4
4
|
export { hookLogger } from './log-hook';
|
|
5
5
|
export { oidcServerRequestHandler } from './oidc/handler';
|
|
6
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,YAAY,EACV,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { MongoDBOIDCPlugin } from '@mongodb-js/oidc-plugin';
|
|
3
3
|
import type { DevtoolsConnectionState } from './connect';
|
|
4
|
-
import { Readable } from 'stream';
|
|
4
|
+
import type { Readable } from 'stream';
|
|
5
5
|
export declare function readSignedStream(input: Readable, signature: string | string[] | undefined, hmacKey: Uint8Array): Promise<string>;
|
|
6
6
|
export declare function sign(payload: Uint8Array | string, hmacKey: Uint8Array): string;
|
|
7
7
|
export declare abstract class RpcServer {
|
|
@@ -36,3 +36,4 @@ export declare class StateShareClient extends RpcClient {
|
|
|
36
36
|
constructor(handle: string);
|
|
37
37
|
private _oidcCallback;
|
|
38
38
|
}
|
|
39
|
+
//# sourceMappingURL=ipc-rpc-state-share.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ipc-rpc-state-share.d.ts","sourceRoot":"","sources":["../src/ipc-rpc-state-share.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAazD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAKvC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACxC,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAGD,wBAAgB,IAAI,CAClB,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,OAAO,EAAE,UAAU,GAClB,MAAM,CAER;AAMD,8BAAsB,SAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,eAAe,CAAC,CAAa;IACrC,MAAM,CAAC,GAAG,SAAK;IAEf,SAAS,aAAa,gBAAgB,EAAE,MAAM;IAS9C,IAAW,MAAM,IAAI,MAAM,CAK1B;cAEe,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMxB,aAAa;YAoCb,cAAc;IAyBf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOnC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAGD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,aAAa,CAAS;gBAElB,MAAM,EAAE,MAAM;IAMb,WAAW,CACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAwBpC;AAID,qBAAa,gBAAiB,SAAQ,SAAS;IAC7C,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,aAAa,CAAsC;IAE3D,OAAO;WAKM,MAAM,CACjB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,gBAAgB,CAAC;cAOZ,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CA8B1E;AAGD,qBAAa,gBAAiB,SAAQ,SAAS;IACtC,UAAU,EAAE,iBAAiB,CAAC;gBAEzB,MAAM,EAAE,MAAM;YA4BZ,aAAa;CA4B5B"}
|
|
@@ -43,11 +43,14 @@ class RpcServer {
|
|
|
43
43
|
this.server = undefined;
|
|
44
44
|
}
|
|
45
45
|
get handle() {
|
|
46
|
-
return JSON.stringify([
|
|
46
|
+
return JSON.stringify([
|
|
47
|
+
this.hmacKey.toString('base64'),
|
|
48
|
+
this.server.address(),
|
|
49
|
+
]);
|
|
47
50
|
}
|
|
48
51
|
async _init() {
|
|
49
52
|
this.server = (0, http_1.createServer)((req, res) => this._handleRequest(req, res));
|
|
50
|
-
this.hmacKey =
|
|
53
|
+
this.hmacKey = await (0, util_1.promisify)(crypto_1.default.randomBytes)(16);
|
|
51
54
|
await this._serverListen();
|
|
52
55
|
}
|
|
53
56
|
async _serverListen() {
|
|
@@ -71,7 +74,8 @@ class RpcServer {
|
|
|
71
74
|
try {
|
|
72
75
|
(0, fs_1.rmSync)(path);
|
|
73
76
|
}
|
|
74
|
-
catch {
|
|
77
|
+
catch {
|
|
78
|
+
}
|
|
75
79
|
}
|
|
76
80
|
};
|
|
77
81
|
process.on('exit', this.cleanupCallback);
|
|
@@ -80,10 +84,15 @@ class RpcServer {
|
|
|
80
84
|
let response;
|
|
81
85
|
try {
|
|
82
86
|
const content = JSON.parse(await readSignedStream(req, req.headers['x-signature'], this.hmacKey));
|
|
83
|
-
response = { status: 200, ...await this.handleRpc(content) };
|
|
87
|
+
response = { status: 200, ...(await this.handleRpc(content)) };
|
|
84
88
|
}
|
|
85
89
|
catch (err) {
|
|
86
|
-
response = {
|
|
90
|
+
response = {
|
|
91
|
+
status: 500,
|
|
92
|
+
error: err && typeof err === 'object' && 'message' in err
|
|
93
|
+
? err.message
|
|
94
|
+
: String(err),
|
|
95
|
+
};
|
|
87
96
|
}
|
|
88
97
|
res.statusCode = response.status;
|
|
89
98
|
const payload = new TextEncoder().encode(JSON.stringify(response));
|
|
@@ -115,11 +124,11 @@ class RpcClient {
|
|
|
115
124
|
headers: {
|
|
116
125
|
'content-type': 'application/json',
|
|
117
126
|
'content-length': payload.length,
|
|
118
|
-
'x-signature': sign(payload, this.hmacKey)
|
|
119
|
-
}
|
|
127
|
+
'x-signature': sign(payload, this.hmacKey),
|
|
128
|
+
},
|
|
120
129
|
});
|
|
121
130
|
req.end(payload);
|
|
122
|
-
const [res] = await (0, events_1.once)(req, 'response');
|
|
131
|
+
const [res] = (await (0, events_1.once)(req, 'response'));
|
|
123
132
|
const content = JSON.parse(await readSignedStream(res, res.headers['x-signature'], this.hmacKey));
|
|
124
133
|
if (res.statusCode !== 200 || content.status !== 200) {
|
|
125
134
|
throw new Error(String(content.error ?? `${res.statusCode} ${res.statusMessage}`));
|
|
@@ -155,7 +164,7 @@ class StateShareServer extends RpcServer {
|
|
|
155
164
|
try {
|
|
156
165
|
const result = await oidcCallbacks[oidcMethod](content.info, {
|
|
157
166
|
...content.context,
|
|
158
|
-
timeoutContext: abortController.signal
|
|
167
|
+
timeoutContext: abortController.signal,
|
|
159
168
|
});
|
|
160
169
|
return { result };
|
|
161
170
|
}
|
|
@@ -173,7 +182,9 @@ class StateShareClient extends RpcClient {
|
|
|
173
182
|
constructor(handle) {
|
|
174
183
|
super(handle);
|
|
175
184
|
this.oidcPlugin = {
|
|
176
|
-
destroy() {
|
|
185
|
+
destroy() {
|
|
186
|
+
return Promise.resolve();
|
|
187
|
+
},
|
|
177
188
|
serialize() {
|
|
178
189
|
throw new Error('serialize() not supported in devtools-connect state-share clients');
|
|
179
190
|
},
|
|
@@ -181,28 +192,28 @@ class StateShareClient extends RpcClient {
|
|
|
181
192
|
mongoClientOptions: {
|
|
182
193
|
authMechanismProperties: {
|
|
183
194
|
REQUEST_TOKEN_CALLBACK: this._oidcCallback.bind(this, 'oidc:REQUEST_TOKEN_CALLBACK'),
|
|
184
|
-
REFRESH_TOKEN_CALLBACK: this._oidcCallback.bind(this, 'oidc:REFRESH_TOKEN_CALLBACK')
|
|
185
|
-
}
|
|
186
|
-
}
|
|
195
|
+
REFRESH_TOKEN_CALLBACK: this._oidcCallback.bind(this, 'oidc:REFRESH_TOKEN_CALLBACK'),
|
|
196
|
+
},
|
|
197
|
+
},
|
|
187
198
|
};
|
|
188
199
|
}
|
|
189
200
|
async _oidcCallback(method, info, _context) {
|
|
190
201
|
const timeoutContextId = (await (0, util_1.promisify)(crypto_1.default.randomBytes)(16)).toString('base64');
|
|
191
202
|
const { timeoutContext, ...context } = _context;
|
|
192
|
-
const abort = () => {
|
|
193
|
-
this.makeRpcCall({
|
|
203
|
+
const abort = async () => {
|
|
204
|
+
await this.makeRpcCall({
|
|
194
205
|
method: 'oidc:_abort',
|
|
195
|
-
timeoutContextId
|
|
206
|
+
timeoutContextId,
|
|
196
207
|
});
|
|
197
208
|
};
|
|
198
209
|
timeoutContext?.addEventListener('abort', abort);
|
|
199
210
|
try {
|
|
200
|
-
const { result } =
|
|
211
|
+
const { result } = await this.makeRpcCall({
|
|
201
212
|
method,
|
|
202
213
|
timeoutContextId,
|
|
203
214
|
context,
|
|
204
|
-
info
|
|
205
|
-
})
|
|
215
|
+
info,
|
|
216
|
+
});
|
|
206
217
|
return result;
|
|
207
218
|
}
|
|
208
219
|
finally {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ipc-rpc-state-share.js","sourceRoot":"","sources":["../src/ipc-rpc-state-share.ts"],"names":[],"mappings":";;;;;;AAOA,+BAAiE;AAMjE,+BAAiC;AACjC,oDAA4B;AAC5B,4CAAoB;AACpB,mCAA4C;AAC5C,2BAA4C;AAC5C,mCAAqC;AAErC,+BAA8C;AAIvC,KAAK,UAAU,gBAAgB,CACpC,KAAe,EACf,SAAwC,EACxC,OAAmB;IAEnB,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAMrE,MAAM,MAAM,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,oBAAW,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACxE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE5C,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QACxC,IAAI,IAAI,KAAK,CAAC;IAChB,CAAC;IACD,MAAM,YAAY,CAAC;IAEnB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,4CA2BC;AAGD,SAAgB,IAAI,CAClB,OAA4B,EAC5B,OAAmB;IAEnB,OAAO,gBAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC/E,CAAC;AALD,oBAKC;AAMD,MAAsB,SAAS;IAO7B,YAAsB,gBAAwB;QAC5C,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,OAAO,GAAG,SAA8B,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,SAAkC,CAAC;IACnD,CAAC;IAID,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,KAAK;QACnB,IAAI,CAAC,MAAM,GAAG,IAAA,mBAAgB,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,GAAG,MAAM,IAAA,gBAAS,EAAC,gBAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,IAAY,CAAC;QACjB,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,gBAAgB,IACnC,OAAO,CAAC,GACV,QAAQ,SAAS,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,GAAG,gBAAgB,IAAI,EAAE,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,YAAE,CAAC,MAAM,EAAE,CAAC;YAC1D,IAAI,GAAG,IAAA,cAAW,EAAC,GAAG,MAAM,IAAI,IAAI,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,MAAM,IAAA,aAAI,EAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAIrC,MAAM,aAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAK5B,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE;YAC1B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,IAAI,CAAC;oBACH,IAAA,WAAM,EAAC,IAAI,CAAC,CAAC;gBACf,CAAC;gBAAC,MAAM,CAAC;gBAET,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QACF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAoB,EAAE,GAAmB;QACpE,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CACtE,CAAC;YAEF,QAAQ,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACjE,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,QAAQ,GAAG;gBACT,MAAM,EAAE,GAAG;gBACX,KAAK,EACH,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG;oBAChD,CAAC,CAAC,GAAG,CAAC,OAAO;oBACb,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aAClB,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;QACjC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClD,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,IAAA,aAAI,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;IACnC,CAAC;;AA/FH,8BAoGC;AA/FQ,aAAG,GAAG,CAAC,CAAC;AAkGjB,MAAa,SAAS;IAIpB,YAAY,MAAc;QACxB,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,OAAgC;QAEhC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC;YAClB,UAAU,EAAE,IAAI,CAAC,aAAa;YAC9B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,OAAO,CAAC,MAAM;gBAChC,aAAa,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;aAC3C;SACF,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAA,aAAI,EAAC,GAAG,EAAE,UAAU,CAAC,CAAsB,CAAC;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CACtE,CAAC;QACF,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAErD,MAAM,IAAI,KAAK,CACb,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC,CAClE,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AApCD,8BAoCC;AAID,MAAa,gBAAiB,SAAQ,SAAS;IAI7C,YAAoB,KAA8B;QAChD,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAHnB,kBAAa,GAAG,IAAI,GAAG,EAA2B,CAAC;QAIzD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,KAA8B;QAE9B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAGS,KAAK,CAAC,SAAS,CAAC,OAAY;QACpC,MAAM,aAAa,GACjB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,uBAAuB,CAAC;QACnE,IAAI,UAAsC,CAAC;QAC3C,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;YACvB,KAAK,aAAa;gBAChB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC;gBAC1D,OAAO,EAAE,CAAC;YACZ,KAAK,6BAA6B;gBAChC,UAAU,GAAG,wBAAwB,CAAC;YAExC,KAAK,6BAA6B,CAAC,CAAC,CAAC;gBACnC,UAAU,KAAV,UAAU,GAAK,wBAAwB,EAAC;gBAExC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC9C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;gBAClE,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE;wBAC3D,GAAG,OAAO,CAAC,OAAO;wBAClB,cAAc,EAAE,eAAe,CAAC,MAAM;qBACvC,CAAC,CAAC;oBACH,OAAO,EAAE,MAAM,EAAE,CAAC;gBACpB,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YACD;gBACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;CACF;AAhDD,4CAgDC;AAGD,MAAa,gBAAiB,SAAQ,SAAS;IAG7C,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,UAAU,GAAG;YAChB,OAAO;gBACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC;YACD,SAAS;gBACP,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;YACJ,CAAC;YACD,MAAM,EAAE,IAAI,qBAAY,EAAE;YAC1B,kBAAkB,EAAE;gBAClB,uBAAuB,EAAE;oBACvB,sBAAsB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAC7C,IAAI,EACJ,6BAA6B,CAC9B;oBACD,sBAAsB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAC7C,IAAI,EACJ,6BAA6B,CAC9B;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,MAAc,EACd,IAAmB,EACnB,QAA6B;QAE7B,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,gBAAS,EAAC,gBAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CACzE,QAAQ,CACT,CAAC;QACF,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,GAAG,QAAQ,CAAC;QAChD,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;YACvB,MAAM,IAAI,CAAC,WAAW,CAAC;gBACrB,MAAM,EAAE,aAAa;gBACrB,gBAAgB;aACjB,CAAC,CAAC;QACL,CAAC,CAAC;QACF,cAAc,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;gBACxC,MAAM;gBACN,gBAAgB;gBAChB,OAAO;gBACP,IAAI;aACL,CAAC,CAAC;YACH,OAAO,MAA2B,CAAC;QACrC,CAAC;gBAAS,CAAC;YACT,cAAc,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;CACF;AA3DD,4CA2DC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-hook.d.ts","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EASV,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAIjB,UAAU,cAAc;IACtB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC1E,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7C;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,cAAc,EACnB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAC5C,IAAI,CAkJN"}
|
package/{lib → dist}/log-hook.js
RENAMED
|
@@ -8,13 +8,13 @@ function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
|
|
|
8
8
|
emitter.on('devtools-connect:connect-attempt-initialized', function (ev) {
|
|
9
9
|
log.info('DEVTOOLS-CONNECT', mongoLogId(1000000042), `${contextPrefix}-connect`, 'Initiating connection attempt', {
|
|
10
10
|
...ev,
|
|
11
|
-
uri: redactURICredentials(ev.uri)
|
|
11
|
+
uri: redactURICredentials(ev.uri),
|
|
12
12
|
});
|
|
13
13
|
});
|
|
14
14
|
emitter.on('devtools-connect:connect-heartbeat-failure', function (ev) {
|
|
15
15
|
log.warn('DEVTOOLS-CONNECT', mongoLogId(1000000034), `${contextPrefix}-connect`, 'Server heartbeat failure', {
|
|
16
16
|
...ev,
|
|
17
|
-
failure: ev.failure?.message
|
|
17
|
+
failure: ev.failure?.message,
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
20
|
emitter.on('devtools-connect:connect-heartbeat-succeeded', function (ev) {
|
|
@@ -29,8 +29,8 @@ function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
|
|
|
29
29
|
attr = {
|
|
30
30
|
cryptSharedLibVersionInfo: {
|
|
31
31
|
version: ev.cryptSharedLibVersionInfo.version.toString(16),
|
|
32
|
-
versionStr: ev.cryptSharedLibVersionInfo.versionStr
|
|
33
|
-
}
|
|
32
|
+
versionStr: ev.cryptSharedLibVersionInfo.versionStr,
|
|
33
|
+
},
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
log.info('DEVTOOLS-CONNECT', mongoLogId(1000000037), `${contextPrefix}-connect`, 'Connection attempt finished', attr);
|
|
@@ -40,26 +40,26 @@ function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
|
|
|
40
40
|
from: redactURICredentials(ev.from),
|
|
41
41
|
error: ev.error?.message,
|
|
42
42
|
duringLoad: ev.duringLoad,
|
|
43
|
-
resolutionDetails: ev.resolutionDetails
|
|
43
|
+
resolutionDetails: ev.resolutionDetails,
|
|
44
44
|
});
|
|
45
45
|
});
|
|
46
46
|
emitter.on('devtools-connect:resolve-srv-succeeded', function (ev) {
|
|
47
47
|
log.info('DEVTOOLS-CONNECT', mongoLogId(1000000039), `${contextPrefix}-connect`, 'Resolving SRV record succeeded', {
|
|
48
48
|
from: redactURICredentials(ev.from),
|
|
49
49
|
to: redactURICredentials(ev.to),
|
|
50
|
-
resolutionDetails: ev.resolutionDetails
|
|
50
|
+
resolutionDetails: ev.resolutionDetails,
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
53
|
emitter.on('devtools-connect:missing-optional-dependency', function (ev) {
|
|
54
54
|
log.error('DEVTOOLS-CONNECT', mongoLogId(1000000041), `${contextPrefix}-deps`, 'Missing optional dependency', {
|
|
55
55
|
name: ev.name,
|
|
56
|
-
error: ev.error.message
|
|
56
|
+
error: ev.error.message,
|
|
57
57
|
});
|
|
58
58
|
});
|
|
59
59
|
emitter.on('devtools-connect:used-system-ca', function (ev) {
|
|
60
60
|
log.info('DEVTOOLS-CONNECT', mongoLogId(1000000049), `${contextPrefix}-connect`, 'Loaded system CA list', {
|
|
61
61
|
caCount: ev.caCount,
|
|
62
|
-
asyncFallbackError: ev.asyncFallbackError?.message
|
|
62
|
+
asyncFallbackError: ev.asyncFallbackError?.message,
|
|
63
63
|
});
|
|
64
64
|
});
|
|
65
65
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-hook.js","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { RedirectServerRequestInfo } from '@mongodb-js/oidc-plugin';
|
|
2
2
|
import type { DevtoolsConnectOptions } from '../connect';
|
|
3
3
|
export declare function oidcServerRequestHandler(options: Pick<DevtoolsConnectOptions, 'productDocsLink' | 'productName'>, info: RedirectServerRequestInfo): void;
|
|
4
|
+
//# sourceMappingURL=handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/oidc/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAMzD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,iBAAiB,GAAG,aAAa,CAAC,EACxE,IAAI,EAAE,yBAAyB,GAC9B,IAAI,CAiDN"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.oidcServerRequestHandler = void 0;
|
|
4
|
+
const oidc_http_server_pages_1 = require("@mongodb-js/oidc-http-server-pages");
|
|
5
|
+
function oidcServerRequestHandler(options, info) {
|
|
6
|
+
const { productDocsLink, productName } = options;
|
|
7
|
+
const { res, result, status } = info;
|
|
8
|
+
res.statusCode = status;
|
|
9
|
+
if (result === 'redirecting') {
|
|
10
|
+
res.setHeader('Location', info.location);
|
|
11
|
+
res.end();
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
res.setHeader('Content-Security-Policy', "default-src 'self'; style-src 'unsafe-inline'");
|
|
15
|
+
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
|
16
|
+
switch (result) {
|
|
17
|
+
case 'accepted':
|
|
18
|
+
res.end((0, oidc_http_server_pages_1.getStaticPage)(oidc_http_server_pages_1.HttpServerPage.OIDCAcceptedPage, {
|
|
19
|
+
productDocsLink,
|
|
20
|
+
productName,
|
|
21
|
+
}));
|
|
22
|
+
break;
|
|
23
|
+
case 'rejected':
|
|
24
|
+
res.end((0, oidc_http_server_pages_1.getStaticPage)(oidc_http_server_pages_1.HttpServerPage.OIDCErrorPage, {
|
|
25
|
+
productDocsLink,
|
|
26
|
+
productName,
|
|
27
|
+
error: info.error,
|
|
28
|
+
errorDescription: info.errorDescription,
|
|
29
|
+
errorURI: info.errorURI,
|
|
30
|
+
}));
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
res.end((0, oidc_http_server_pages_1.getStaticPage)(oidc_http_server_pages_1.HttpServerPage.OIDCNotFoundPage, {
|
|
34
|
+
productDocsLink,
|
|
35
|
+
productName,
|
|
36
|
+
}));
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.oidcServerRequestHandler = oidcServerRequestHandler;
|
|
41
|
+
//# sourceMappingURL=handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/oidc/handler.ts"],"names":[],"mappings":";;;AAEA,+EAG4C;AAE5C,SAAgB,wBAAwB,CACtC,OAAwE,EACxE,IAA+B;IAE/B,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACrC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;IAExB,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,GAAG,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IAKD,GAAG,CAAC,SAAS,CACX,yBAAyB,EACzB,+CAA+C,CAChD,CAAC;IACF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;IAE1D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,UAAU;YACb,GAAG,CAAC,GAAG,CACL,IAAA,sCAAa,EAAC,uCAAc,CAAC,gBAAgB,EAAE;gBAC7C,eAAe;gBACf,WAAW;aACZ,CAAC,CACH,CAAC;YACF,MAAM;QACR,KAAK,UAAU;YACb,GAAG,CAAC,GAAG,CACL,IAAA,sCAAa,EAAC,uCAAc,CAAC,aAAa,EAAE;gBAC1C,eAAe;gBACf,WAAW;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC,CACH,CAAC;YACF,MAAM;QACR;YACE,GAAG,CAAC,GAAG,CACL,IAAA,sCAAa,EAAC,uCAAc,CAAC,gBAAgB,EAAE;gBAC7C,eAAe;gBACf,WAAW;aACZ,CAAC,CACH,CAAC;YACF,MAAM;IACV,CAAC;AACH,CAAC;AApDD,4DAoDC"}
|
package/{lib → dist}/types.d.ts
RENAMED