@whitewall/blip-sdk 0.0.176 → 0.0.177
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/cjs/sender/http/httpsender.js +20 -10
- package/dist/cjs/sender/http/httpsender.js.map +1 -1
- package/dist/cjs/sender/security.js +6 -0
- package/dist/cjs/sender/security.js.map +1 -1
- package/dist/cjs/sender/sender.js +4 -2
- package/dist/cjs/sender/sender.js.map +1 -1
- package/dist/cjs/sender/sessionnegotiator.js +11 -4
- package/dist/cjs/sender/sessionnegotiator.js.map +1 -1
- package/dist/cjs/sender/tcp/tcpsender.js +60 -15
- package/dist/cjs/sender/tcp/tcpsender.js.map +1 -1
- package/dist/cjs/sender/transporttls.js +16 -0
- package/dist/cjs/sender/transporttls.js.map +1 -0
- package/dist/cjs/sender/websocket/websocketsender.js +2 -0
- package/dist/cjs/sender/websocket/websocketsender.js.map +1 -1
- package/dist/esm/sender/http/httpsender.js +20 -10
- package/dist/esm/sender/http/httpsender.js.map +1 -1
- package/dist/esm/sender/security.js +5 -1
- package/dist/esm/sender/security.js.map +1 -1
- package/dist/esm/sender/sender.js +4 -2
- package/dist/esm/sender/sender.js.map +1 -1
- package/dist/esm/sender/sessionnegotiator.js +11 -4
- package/dist/esm/sender/sessionnegotiator.js.map +1 -1
- package/dist/esm/sender/tcp/tcpsender.js +60 -15
- package/dist/esm/sender/tcp/tcpsender.js.map +1 -1
- package/dist/esm/sender/transporttls.js +13 -0
- package/dist/esm/sender/transporttls.js.map +1 -0
- package/dist/esm/sender/websocket/websocketsender.js +2 -0
- package/dist/esm/sender/websocket/websocketsender.js.map +1 -1
- package/dist/types/sender/http/httpsender.d.ts +2 -1
- package/dist/types/sender/http/httpsender.d.ts.map +1 -1
- package/dist/types/sender/security.d.ts +12 -1
- package/dist/types/sender/security.d.ts.map +1 -1
- package/dist/types/sender/sender.d.ts +2 -2
- package/dist/types/sender/sender.d.ts.map +1 -1
- package/dist/types/sender/sessionnegotiator.d.ts +1 -0
- package/dist/types/sender/sessionnegotiator.d.ts.map +1 -1
- package/dist/types/sender/tcp/tcpsender.d.ts.map +1 -1
- package/dist/types/sender/transporttls.d.ts +13 -0
- package/dist/types/sender/transporttls.d.ts.map +1 -0
- package/dist/types/sender/websocket/websocketsender.d.ts +2 -1
- package/dist/types/sender/websocket/websocketsender.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/sender/http/httpsender.ts +22 -11
- package/src/sender/security.ts +21 -0
- package/src/sender/sender.ts +9 -7
- package/src/sender/sessionnegotiator.ts +19 -5
- package/src/sender/tcp/tcpsender.ts +72 -19
- package/src/sender/transporttls.ts +16 -0
- package/src/sender/websocket/websocketsender.ts +6 -1
|
@@ -4,6 +4,7 @@ exports.HttpSender = void 0;
|
|
|
4
4
|
const index_ts_1 = require("../../types/index.js");
|
|
5
5
|
const bliperror_ts_1 = require("../bliperror.js");
|
|
6
6
|
const retryableerror_ts_1 = require("../retryableerror.js");
|
|
7
|
+
const security_ts_1 = require("../security.js");
|
|
7
8
|
const sender_ts_1 = require("../sender.js");
|
|
8
9
|
const throttler_ts_1 = require("../throttler.js");
|
|
9
10
|
class HttpSender extends sender_ts_1.ConnectionSender {
|
|
@@ -12,24 +13,33 @@ class HttpSender extends sender_ts_1.ConnectionSender {
|
|
|
12
13
|
throttler = new throttler_ts_1.EnvelopeThrottler();
|
|
13
14
|
constructor(options) {
|
|
14
15
|
super(options);
|
|
16
|
+
(0, security_ts_1.assertNonTransportAuth)(options.authentication, 'HttpSender');
|
|
15
17
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
16
18
|
this.baseurl = `https://${prefix}http.${this.domain}`;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
const auth = options.authentication;
|
|
20
|
+
const identity = index_ts_1.Node.from(options.node).toIdentity();
|
|
21
|
+
if (auth.scheme === 'key') {
|
|
22
|
+
this.authHeaders = { Authorization: `Key ${HttpSender.createToken(options.node, auth.key)}` };
|
|
20
23
|
}
|
|
21
|
-
else if (
|
|
22
|
-
this.authHeaders = { Authorization: `Key ${
|
|
24
|
+
else if (auth.scheme === 'token') {
|
|
25
|
+
this.authHeaders = { Authorization: `Key ${auth.token}` };
|
|
23
26
|
}
|
|
24
|
-
else if (
|
|
27
|
+
else if (auth.scheme === 'external') {
|
|
25
28
|
this.authHeaders = {
|
|
26
|
-
Authorization: `Bearer ${
|
|
27
|
-
'http-session-authentication-external-issuer':
|
|
28
|
-
'http-session-identity':
|
|
29
|
+
Authorization: `Bearer ${auth.token}`,
|
|
30
|
+
'http-session-authentication-external-issuer': auth.issuer,
|
|
31
|
+
'http-session-identity': identity,
|
|
29
32
|
};
|
|
30
33
|
}
|
|
34
|
+
else if (auth.scheme === 'plain') {
|
|
35
|
+
const basicAuth = `${identity}:${auth.password}`;
|
|
36
|
+
this.authHeaders = { Authorization: `Basic ${Buffer.from(basicAuth).toString('base64')}` };
|
|
37
|
+
}
|
|
38
|
+
else if (auth.scheme === 'guest') {
|
|
39
|
+
this.authHeaders = {};
|
|
40
|
+
}
|
|
31
41
|
else {
|
|
32
|
-
throw new Error('
|
|
42
|
+
throw new Error('Unsupported authentication scheme');
|
|
33
43
|
}
|
|
34
44
|
}
|
|
35
45
|
sendMessage(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":";;;AAAA,mDAO6B;AAC7B,kDAA2C;AAC3C,4DAAqD;AACrD,4CAA8F;AAC9F,kDAAmD;AAEnD,MAAa,UAAW,SAAQ,4BAAgB;IAC3B,OAAO,CAAQ;IACf,WAAW,CAAwB;IACnC,SAAS,GAAG,IAAI,gCAAiB,EAAE,CAAA;IAEpD,
|
|
1
|
+
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.assertNonTransportAuth = assertNonTransportAuth;
|
|
4
|
+
function assertNonTransportAuth(auth, senderName) {
|
|
5
|
+
if (auth?.scheme === 'transport') {
|
|
6
|
+
throw new Error(`${senderName} does not support the 'transport' scheme: TLS terminates before any application-layer negotiation, so a client certificate cannot be reliably delivered upstream. Use TCPSender.`);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
3
9
|
//# sourceMappingURL=security.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/sender/security.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/sender/security.ts"],"names":[],"mappings":";;AA+CA,wDAMC;AAND,SAAgB,sBAAsB,CAAC,IAAa,EAAE,UAAkB;IACpE,IAAK,IAA+C,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CACX,GAAG,UAAU,kLAAkL,CAClM,CAAA;IACL,CAAC;AACL,CAAC"}
|
|
@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.OpenConnectionSender = exports.ConnectionSender = void 0;
|
|
4
4
|
const index_ts_1 = require("../types/index.js");
|
|
5
5
|
const enveloperesolver_ts_1 = require("./enveloperesolver.js");
|
|
6
|
+
const ROOT_AUTHORITIES = ['msging.net', 'blip.ai', '0mn.io'];
|
|
6
7
|
class ConnectionSender {
|
|
7
8
|
_domain;
|
|
8
9
|
constructor(options) {
|
|
9
|
-
|
|
10
|
+
const nodeDomain = index_ts_1.Node.from(options.node).domain ?? 'msging.net';
|
|
11
|
+
this._domain =
|
|
12
|
+
ROOT_AUTHORITIES.find((root) => nodeDomain === root || nodeDomain.endsWith(`.${root}`)) ?? 'msging.net';
|
|
10
13
|
}
|
|
11
14
|
get domain() {
|
|
12
15
|
return this._domain;
|
|
@@ -40,7 +43,6 @@ class ConnectionSender {
|
|
|
40
43
|
accessKey = accessKeyOrTenantId;
|
|
41
44
|
tenantId = tenantIdOrUndefined;
|
|
42
45
|
}
|
|
43
|
-
// biome-ignore lint/complexity/noThisInStatic: fair use-case
|
|
44
46
|
return new this({
|
|
45
47
|
node,
|
|
46
48
|
authentication: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":";;;AAAA,gDAW0B;AAE1B,+DAAsF;
|
|
1
|
+
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,18 +26,23 @@ class SessionNegotiator {
|
|
|
26
26
|
state: 'new',
|
|
27
27
|
});
|
|
28
28
|
const negotiation = await this.waitForSessionResponse();
|
|
29
|
+
const wantsTls = options.authentication.scheme === 'transport' && !!options.upgradeToTls;
|
|
29
30
|
let authenticating;
|
|
30
31
|
if (negotiation.state === 'negotiating') {
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
const desiredEncryption = wantsTls ? 'tls' : 'none';
|
|
33
|
+
if (!negotiation.encryptionOptions?.includes(desiredEncryption)) {
|
|
34
|
+
throw new Error(`Unsupported encryption options (wanted '${desiredEncryption}')`);
|
|
33
35
|
}
|
|
34
36
|
this.sendSession({
|
|
35
37
|
id: negotiation.id,
|
|
36
38
|
state: 'negotiating',
|
|
37
|
-
encryption:
|
|
39
|
+
encryption: desiredEncryption,
|
|
38
40
|
compression: negotiation.compressionOptions?.at(-1),
|
|
39
41
|
});
|
|
40
42
|
await this.waitForSessionResponse();
|
|
43
|
+
if (wantsTls) {
|
|
44
|
+
await options.upgradeToTls();
|
|
45
|
+
}
|
|
41
46
|
authenticating = await this.waitForSessionResponse();
|
|
42
47
|
}
|
|
43
48
|
else if (negotiation.state === 'authenticating') {
|
|
@@ -56,7 +61,9 @@ class SessionNegotiator {
|
|
|
56
61
|
if (!authenticating.schemeOptions?.includes(options.authentication.scheme)) {
|
|
57
62
|
throw new Error(`Unsupported authentication scheme: ${options.authentication.scheme} (${authenticating.schemeOptions})`);
|
|
58
63
|
}
|
|
59
|
-
const { scheme, ...
|
|
64
|
+
const { scheme, ...rest } = options.authentication;
|
|
65
|
+
// 'transport' authenticates via mTLS; LIME spec requires an empty payload here.
|
|
66
|
+
const authenticationOptions = scheme === 'transport' ? {} : rest;
|
|
60
67
|
this.sendSession({
|
|
61
68
|
id: authenticating.id,
|
|
62
69
|
from: options.node,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":";;;AACA,8CAAsD;AAGtD,2CAAkD;AASlD,MAAa,iBAAiB;IAQL;IACA;IARd,KAAK,GAAiC,KAAK,CAAA;IAC3C,OAAO,GAA6B,IAAI,CAAA;IAEvC,eAAe,GAAyB,IAAI,CAAA;IAC5C,sBAAsB,GAAqE,IAAI,CAAA;IAEvG,YACqB,MAA4B,EAC5B,WAAuC;QADvC,WAAM,GAAN,MAAM,CAAsB;QAC5B,gBAAW,GAAX,WAAW,CAA4B;IACzD,CAAC;IAEG,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,13 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.TCPSender = void 0;
|
|
37
|
+
const logger_ts_1 = require("../../utils/logger.js");
|
|
37
38
|
const bliperror_ts_1 = require("../bliperror.js");
|
|
38
39
|
const retryableerror_ts_1 = require("../retryableerror.js");
|
|
39
40
|
const sender_ts_1 = require("../sender.js");
|
|
40
41
|
const sessionnegotiator_ts_1 = require("../sessionnegotiator.js");
|
|
41
42
|
const throttler_ts_1 = require("../throttler.js");
|
|
43
|
+
const transporttls_ts_1 = require("../transporttls.js");
|
|
42
44
|
const json_parser_ts_1 = require("./json-parser.js");
|
|
43
45
|
/**
|
|
44
46
|
* @remarks
|
|
@@ -52,13 +54,21 @@ class TCPSender extends sender_ts_1.OpenConnectionSender {
|
|
|
52
54
|
constructor(options) {
|
|
53
55
|
super(options);
|
|
54
56
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
55
|
-
|
|
57
|
+
const host = `${prefix}tcp.${this.domain}`;
|
|
58
|
+
const auth = options.authentication;
|
|
59
|
+
const tlsOptions = auth.scheme === 'transport' ? { ...(0, transporttls_ts_1.buildTlsConnectOptions)(auth), servername: host } : null;
|
|
60
|
+
this.connectionHandle = new TCPHandle(host, 443, () => {
|
|
56
61
|
this.sessionNegotiator = new sessionnegotiator_ts_1.SessionNegotiator(this, (session) => {
|
|
57
|
-
|
|
62
|
+
this.connectionHandle
|
|
63
|
+
.get()
|
|
64
|
+
.then((s) => s.write(JSON.stringify(session)))
|
|
65
|
+
.catch((err) => logger_ts_1.logger.warn('TCPSender', 'Failed to write session frame', err));
|
|
58
66
|
});
|
|
67
|
+
const upgradeToTls = tlsOptions ? () => this.connectionHandle.upgradeToTls(tlsOptions) : undefined;
|
|
59
68
|
return this.sessionNegotiator.negotiate({
|
|
60
69
|
node: options.node,
|
|
61
|
-
authentication:
|
|
70
|
+
authentication: auth,
|
|
71
|
+
upgradeToTls,
|
|
62
72
|
});
|
|
63
73
|
}, () => this.envelopeResolver.rejectPendingEnvelopes('Connection was closed'), (envelope) => {
|
|
64
74
|
if (this.sessionNegotiator?.negotiating) {
|
|
@@ -125,8 +135,11 @@ class TCPHandle {
|
|
|
125
135
|
currentSocketPromise = null;
|
|
126
136
|
closing = false;
|
|
127
137
|
connectionAttempts = 0;
|
|
138
|
+
buffer = Buffer.alloc(0);
|
|
139
|
+
onMessage;
|
|
128
140
|
constructor(host, port, onConnected, onClose, onMessage) {
|
|
129
|
-
this.
|
|
141
|
+
this.onMessage = onMessage;
|
|
142
|
+
this.currentSocketPromise = this.connect(host, port, onConnected, onClose);
|
|
130
143
|
}
|
|
131
144
|
get() {
|
|
132
145
|
if (!this.currentSocketPromise) {
|
|
@@ -141,10 +154,43 @@ class TCPHandle {
|
|
|
141
154
|
current.end().removeAllListeners().destroySoon();
|
|
142
155
|
}
|
|
143
156
|
}
|
|
144
|
-
async
|
|
157
|
+
async upgradeToTls(options) {
|
|
158
|
+
if (!this.currentSocketPromise) {
|
|
159
|
+
throw new Error('Cannot upgrade: no active socket.');
|
|
160
|
+
}
|
|
161
|
+
const plain = await this.currentSocketPromise;
|
|
162
|
+
plain.removeAllListeners('data');
|
|
163
|
+
this.buffer = Buffer.alloc(0);
|
|
164
|
+
const { connect: tlsConnect } = await Promise.resolve().then(() => __importStar(require('node:tls')));
|
|
165
|
+
const secured = tlsConnect({ ...options, socket: plain });
|
|
166
|
+
await new Promise((resolve, reject) => {
|
|
167
|
+
const onError = (err) => {
|
|
168
|
+
secured.off('secureConnect', onConnect);
|
|
169
|
+
reject(err);
|
|
170
|
+
};
|
|
171
|
+
const onConnect = () => {
|
|
172
|
+
secured.off('error', onError);
|
|
173
|
+
resolve();
|
|
174
|
+
};
|
|
175
|
+
secured.once('secureConnect', onConnect);
|
|
176
|
+
secured.once('error', onError);
|
|
177
|
+
});
|
|
178
|
+
this.attachDataListener(secured);
|
|
179
|
+
this.currentSocketPromise = Promise.resolve(secured);
|
|
180
|
+
}
|
|
181
|
+
attachDataListener(socket) {
|
|
182
|
+
socket.on('data', (chunk) => {
|
|
183
|
+
const result = (0, json_parser_ts_1.tryParseJSON)(this.buffer.length === 0 ? chunk : Buffer.concat([this.buffer, chunk]));
|
|
184
|
+
this.buffer = result.remainingBuffer;
|
|
185
|
+
for (const parsed of result.parsedObjects) {
|
|
186
|
+
this.onMessage(parsed);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
async connect(host, port, onConnected, onClose) {
|
|
145
191
|
const { connect } = await Promise.resolve().then(() => __importStar(require('node:net')));
|
|
146
192
|
const socket = connect({ host, port }).setKeepAlive(true);
|
|
147
|
-
|
|
193
|
+
this.buffer = Buffer.alloc(0);
|
|
148
194
|
await new Promise((resolve) => {
|
|
149
195
|
socket.once('connect', () => {
|
|
150
196
|
resolve();
|
|
@@ -155,26 +201,25 @@ class TCPHandle {
|
|
|
155
201
|
}
|
|
156
202
|
});
|
|
157
203
|
socket.once('close', () => {
|
|
204
|
+
socket.removeAllListeners('data');
|
|
158
205
|
if (!this.closing) {
|
|
159
206
|
onClose();
|
|
160
207
|
this.connectionAttempts++;
|
|
161
208
|
if (this.connectionAttempts < 3) {
|
|
162
|
-
this.currentSocketPromise = this.connect(host, port, onConnected, onClose
|
|
209
|
+
this.currentSocketPromise = this.connect(host, port, onConnected, onClose);
|
|
163
210
|
}
|
|
164
211
|
else {
|
|
165
212
|
throw new Error('Failed to connect/reconnect to TCP socket');
|
|
166
213
|
}
|
|
167
214
|
}
|
|
168
215
|
});
|
|
169
|
-
|
|
170
|
-
const result = (0, json_parser_ts_1.tryParseJSON)(buffer.length === 0 ? chunk : Buffer.concat([buffer, chunk]));
|
|
171
|
-
buffer = result.remainingBuffer;
|
|
172
|
-
for (const parsed of result.parsedObjects) {
|
|
173
|
-
onMessage(parsed);
|
|
174
|
-
}
|
|
175
|
-
});
|
|
216
|
+
this.attachDataListener(socket);
|
|
176
217
|
});
|
|
177
|
-
|
|
218
|
+
// sendSession callbacks read currentSocketPromise via .get(); resolve it
|
|
219
|
+
// before onConnected runs so negotiate() can write the 'new' session frame
|
|
220
|
+
// (otherwise we deadlock waiting on the outer connect() promise).
|
|
221
|
+
this.currentSocketPromise = Promise.resolve(socket);
|
|
222
|
+
await onConnected();
|
|
178
223
|
this.connectionAttempts = 0;
|
|
179
224
|
return socket;
|
|
180
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.buildTlsConnectOptions = buildTlsConnectOptions;
|
|
4
|
+
function buildTlsConnectOptions(auth) {
|
|
5
|
+
const toBuf = (v) => (typeof v === 'string' ? v : Buffer.from(v));
|
|
6
|
+
const toBufOrArray = (v) => Array.isArray(v) ? v.map(toBuf) : v !== undefined ? toBuf(v) : undefined;
|
|
7
|
+
return {
|
|
8
|
+
pfx: auth.pfx ? [{ buf: Buffer.from(auth.pfx), passphrase: auth.passphrase }] : undefined,
|
|
9
|
+
cert: auth.cert !== undefined ? toBuf(auth.cert) : undefined,
|
|
10
|
+
key: auth.key !== undefined ? toBuf(auth.key) : undefined,
|
|
11
|
+
ca: toBufOrArray(auth.ca),
|
|
12
|
+
passphrase: auth.passphrase,
|
|
13
|
+
rejectUnauthorized: auth.rejectUnauthorized ?? true,
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=transporttls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transporttls.js","sourceRoot":"","sources":["../../../src/sender/transporttls.ts"],"names":[],"mappings":";;AAEA,wDAaC;AAbD,SAAgB,sBAAsB,CAAC,IAA6B;IAChE,MAAM,KAAK,GAAG,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,CAAC,CAAgC,EAAE,EAAE,CACtD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE5E,OAAO;QACH,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QACzF,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;QAC5D,GAAG,EAAE,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QACzD,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI;KACtD,CAAA;AACL,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.WebSocketSender = void 0;
|
|
|
4
4
|
const logger_ts_1 = require("../../utils/logger.js");
|
|
5
5
|
const bliperror_ts_1 = require("../bliperror.js");
|
|
6
6
|
const retryableerror_ts_1 = require("../retryableerror.js");
|
|
7
|
+
const security_ts_1 = require("../security.js");
|
|
7
8
|
const sender_ts_1 = require("../sender.js");
|
|
8
9
|
const sessionnegotiator_ts_1 = require("../sessionnegotiator.js");
|
|
9
10
|
const throttler_ts_1 = require("../throttler.js");
|
|
@@ -12,6 +13,7 @@ class WebSocketSender extends sender_ts_1.OpenConnectionSender {
|
|
|
12
13
|
connectionHandle;
|
|
13
14
|
constructor(options) {
|
|
14
15
|
super(options);
|
|
16
|
+
(0, security_ts_1.assertNonTransportAuth)(options.authentication, 'WebSocketSender');
|
|
15
17
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
16
18
|
this.connectionHandle = new WebSocketHandle(`wss://${prefix}ws.${this.domain}`, (webSocket) => {
|
|
17
19
|
this.sessionNegotiator = new sessionnegotiator_ts_1.SessionNegotiator(this, (session) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":";;;AAUA,qDAA8C;AAC9C,kDAA2C;AAC3C,4DAAqD;AACrD,4CAAuG;AACvG,kEAA2D;AAC3D,kDAAmD;AAEnD,MAAa,eAAgB,SAAQ,gCAAoB;IACpC,SAAS,GAAG,IAAI,gCAAiB,EAAE,CAAA;IACnC,gBAAgB,CAA2B;IAE5D,
|
|
1
|
+
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Node, } from "../../types/index.js";
|
|
2
2
|
import { BlipError } from "../bliperror.js";
|
|
3
3
|
import { RetryableError } from "../retryableerror.js";
|
|
4
|
+
import { assertNonTransportAuth } from "../security.js";
|
|
4
5
|
import { ConnectionSender } from "../sender.js";
|
|
5
6
|
import { EnvelopeThrottler } from "../throttler.js";
|
|
6
7
|
export class HttpSender extends ConnectionSender {
|
|
@@ -9,24 +10,33 @@ export class HttpSender extends ConnectionSender {
|
|
|
9
10
|
throttler = new EnvelopeThrottler();
|
|
10
11
|
constructor(options) {
|
|
11
12
|
super(options);
|
|
13
|
+
assertNonTransportAuth(options.authentication, 'HttpSender');
|
|
12
14
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
13
15
|
this.baseurl = `https://${prefix}http.${this.domain}`;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
const auth = options.authentication;
|
|
17
|
+
const identity = Node.from(options.node).toIdentity();
|
|
18
|
+
if (auth.scheme === 'key') {
|
|
19
|
+
this.authHeaders = { Authorization: `Key ${HttpSender.createToken(options.node, auth.key)}` };
|
|
17
20
|
}
|
|
18
|
-
else if (
|
|
19
|
-
this.authHeaders = { Authorization: `Key ${
|
|
21
|
+
else if (auth.scheme === 'token') {
|
|
22
|
+
this.authHeaders = { Authorization: `Key ${auth.token}` };
|
|
20
23
|
}
|
|
21
|
-
else if (
|
|
24
|
+
else if (auth.scheme === 'external') {
|
|
22
25
|
this.authHeaders = {
|
|
23
|
-
Authorization: `Bearer ${
|
|
24
|
-
'http-session-authentication-external-issuer':
|
|
25
|
-
'http-session-identity':
|
|
26
|
+
Authorization: `Bearer ${auth.token}`,
|
|
27
|
+
'http-session-authentication-external-issuer': auth.issuer,
|
|
28
|
+
'http-session-identity': identity,
|
|
26
29
|
};
|
|
27
30
|
}
|
|
31
|
+
else if (auth.scheme === 'plain') {
|
|
32
|
+
const basicAuth = `${identity}:${auth.password}`;
|
|
33
|
+
this.authHeaders = { Authorization: `Basic ${Buffer.from(basicAuth).toString('base64')}` };
|
|
34
|
+
}
|
|
35
|
+
else if (auth.scheme === 'guest') {
|
|
36
|
+
this.authHeaders = {};
|
|
37
|
+
}
|
|
28
38
|
else {
|
|
29
|
-
throw new Error('
|
|
39
|
+
throw new Error('Unsupported authentication scheme');
|
|
30
40
|
}
|
|
31
41
|
}
|
|
32
42
|
sendMessage(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,IAAI,GAEP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAiD,MAAM,cAAc,CAAA;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,OAAO,UAAW,SAAQ,gBAAgB;IAC3B,OAAO,CAAQ;IACf,WAAW,CAAwB;IACnC,SAAS,GAAG,IAAI,iBAAiB,EAAE,CAAA;IAEpD,
|
|
1
|
+
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,IAAI,GAEP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAmC,MAAM,gBAAgB,CAAA;AACxF,OAAO,EAAE,gBAAgB,EAAiD,MAAM,cAAc,CAAA;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,OAAO,UAAW,SAAQ,gBAAgB;IAC3B,OAAO,CAAQ;IACf,WAAW,CAAwB;IACnC,SAAS,GAAG,IAAI,iBAAiB,EAAE,CAAA;IAEpD,YACI,OAAsG;QAEtG,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,sBAAsB,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAE5D,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7D,IAAI,CAAC,OAAO,GAAG,WAAW,MAAM,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAA;QAErD,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAA;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAA;QAErD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,WAAW,GAAG,EAAE,aAAa,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAA;QACjG,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,GAAG,EAAE,aAAa,EAAE,OAAO,IAAI,CAAC,KAAK,EAAE,EAAE,CAAA;QAC7D,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,GAAG;gBACf,aAAa,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE;gBACrC,6CAA6C,EAAE,IAAI,CAAC,MAAM;gBAC1D,uBAAuB,EAAE,QAAQ;aACpC,CAAA;QACL,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,SAAS,GAAG,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAA;YAChD,IAAI,CAAC,WAAW,GAAG,EAAE,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAA;QAC9F,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QACzB,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACxD,CAAC;IACL,CAAC;IAEM,WAAW,CAA4B,OAAsB;QAChE,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;YAEtE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;YAC1F,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,WAAW,CAAC,OAAgC;QAC/C,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;YAEtE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;YAC1F,CAAC;YAED,MAAM,MAAM,GAA2B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YAC5D,IAAI,SAAS,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5C,MAAM,SAAS,CAAC,0BAA0B,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACnE,CAAC;iBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACrC,OAAO,MAAM,CAAC,QAAQ,CAAA;YAC1B,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YACpG,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,GAAG,CAAA,gBAAgB,CAAC,KAAiB,CAAA,CAAA;IAEhD,KAAK,CAAC,KAAK,CAAC,IAA6B,EAAE,IAAY;QAC3D,OAAO,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,GAAG,IAAI,CAAC,WAAW;aACtB;YACD,IAAI;SACP,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAI,EAAoB,EAAE,OAAO,GAAG,CAAC;QACnE,IAAI,CAAC;YACD,OAAO,MAAM,EAAE,EAAE,CAAA;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IACI,OAAO,GAAG,CAAC;gBACX,GAAG,YAAY,KAAK;gBACpB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC1B,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC7B,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC7B,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC;oBAC/B,uDAAuD;oBACvD,CAAC,GAAG,CAAC,KAAK,YAAY,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,KAAK,qBAAqB,CAAC;oBACzE,GAAG,CAAC,OAAO,KAAK,YAAY;oBAC5B,GAAG,CAAC,OAAO,KAAK,cAAc,CAAC,EACrC,CAAC;gBACC,uBAAuB;gBACvB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;gBACzE,OAAO,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,CAAC,CAAC,CAAA;YACrD,CAAC;YAED,MAAM,GAAG,CAAA;QACb,CAAC;IACL,CAAC"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export function assertNonTransportAuth(auth, senderName) {
|
|
2
|
+
if (auth?.scheme === 'transport') {
|
|
3
|
+
throw new Error(`${senderName} does not support the 'transport' scheme: TLS terminates before any application-layer negotiation, so a client certificate cannot be reliably delivered upstream. Use TCPSender.`);
|
|
4
|
+
}
|
|
5
|
+
}
|
|
2
6
|
//# sourceMappingURL=security.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/sender/security.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/sender/security.ts"],"names":[],"mappings":"AA+CA,MAAM,UAAU,sBAAsB,CAAC,IAAa,EAAE,UAAkB;IACpE,IAAK,IAA+C,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CACX,GAAG,UAAU,kLAAkL,CAClM,CAAA;IACL,CAAC;AACL,CAAC"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { Node, } from "../types/index.js";
|
|
2
2
|
import { EnvelopeResolver } from "./enveloperesolver.js";
|
|
3
|
+
const ROOT_AUTHORITIES = ['msging.net', 'blip.ai', '0mn.io'];
|
|
3
4
|
export class ConnectionSender {
|
|
4
5
|
_domain;
|
|
5
6
|
constructor(options) {
|
|
6
|
-
|
|
7
|
+
const nodeDomain = Node.from(options.node).domain ?? 'msging.net';
|
|
8
|
+
this._domain =
|
|
9
|
+
ROOT_AUTHORITIES.find((root) => nodeDomain === root || nodeDomain.endsWith(`.${root}`)) ?? 'msging.net';
|
|
7
10
|
}
|
|
8
11
|
get domain() {
|
|
9
12
|
return this._domain;
|
|
@@ -37,7 +40,6 @@ export class ConnectionSender {
|
|
|
37
40
|
accessKey = accessKeyOrTenantId;
|
|
38
41
|
tenantId = tenantIdOrUndefined;
|
|
39
42
|
}
|
|
40
|
-
// biome-ignore lint/complexity/noThisInStatic: fair use-case
|
|
41
43
|
return new this({
|
|
42
44
|
node,
|
|
43
45
|
authentication: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,IAAI,GAIP,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,gBAAgB,EAAgC,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,18 +23,23 @@ export class SessionNegotiator {
|
|
|
23
23
|
state: 'new',
|
|
24
24
|
});
|
|
25
25
|
const negotiation = await this.waitForSessionResponse();
|
|
26
|
+
const wantsTls = options.authentication.scheme === 'transport' && !!options.upgradeToTls;
|
|
26
27
|
let authenticating;
|
|
27
28
|
if (negotiation.state === 'negotiating') {
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
const desiredEncryption = wantsTls ? 'tls' : 'none';
|
|
30
|
+
if (!negotiation.encryptionOptions?.includes(desiredEncryption)) {
|
|
31
|
+
throw new Error(`Unsupported encryption options (wanted '${desiredEncryption}')`);
|
|
30
32
|
}
|
|
31
33
|
this.sendSession({
|
|
32
34
|
id: negotiation.id,
|
|
33
35
|
state: 'negotiating',
|
|
34
|
-
encryption:
|
|
36
|
+
encryption: desiredEncryption,
|
|
35
37
|
compression: negotiation.compressionOptions?.at(-1),
|
|
36
38
|
});
|
|
37
39
|
await this.waitForSessionResponse();
|
|
40
|
+
if (wantsTls) {
|
|
41
|
+
await options.upgradeToTls();
|
|
42
|
+
}
|
|
38
43
|
authenticating = await this.waitForSessionResponse();
|
|
39
44
|
}
|
|
40
45
|
else if (negotiation.state === 'authenticating') {
|
|
@@ -53,7 +58,9 @@ export class SessionNegotiator {
|
|
|
53
58
|
if (!authenticating.schemeOptions?.includes(options.authentication.scheme)) {
|
|
54
59
|
throw new Error(`Unsupported authentication scheme: ${options.authentication.scheme} (${authenticating.schemeOptions})`);
|
|
55
60
|
}
|
|
56
|
-
const { scheme, ...
|
|
61
|
+
const { scheme, ...rest } = options.authentication;
|
|
62
|
+
// 'transport' authenticates via mTLS; LIME spec requires an empty payload here.
|
|
63
|
+
const authenticationOptions = scheme === 'transport' ? {} : rest;
|
|
57
64
|
this.sendSession({
|
|
58
65
|
id: authenticating.id,
|
|
59
66
|
from: options.node,
|