@reclaimprotocol/attestor-core 4.0.0 → 4.0.2

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.
Files changed (73) hide show
  1. package/lib/avs/tests/test.operator.js +4 -4
  2. package/lib/client/create-claim.js +28 -14
  3. package/lib/client/tunnels/make-rpc-tcp-tunnel.js +3 -3
  4. package/lib/client/tunnels/make-rpc-tls-tunnel.js +3 -3
  5. package/lib/client/utils/client-socket.d.ts +2 -2
  6. package/lib/client/utils/client-socket.js +14 -8
  7. package/lib/client/utils/message-handler.js +5 -4
  8. package/lib/config/index.d.ts +6 -2
  9. package/lib/config/index.js +6 -4
  10. package/lib/index.d.ts +1 -0
  11. package/lib/index.js +2 -1
  12. package/lib/mechain/abis/governanceABI.d.ts +50 -0
  13. package/lib/mechain/abis/governanceABI.js +462 -0
  14. package/lib/mechain/abis/taskABI.d.ts +157 -0
  15. package/lib/mechain/abis/taskABI.js +513 -0
  16. package/lib/mechain/client/create-claim-on-mechain.d.ts +10 -0
  17. package/lib/mechain/client/create-claim-on-mechain.js +32 -0
  18. package/lib/mechain/client/index.d.ts +1 -0
  19. package/lib/mechain/client/index.js +18 -0
  20. package/lib/mechain/constants/index.d.ts +3 -0
  21. package/lib/mechain/constants/index.js +7 -0
  22. package/lib/mechain/index.d.ts +2 -0
  23. package/lib/mechain/index.js +19 -0
  24. package/lib/mechain/types/index.d.ts +23 -0
  25. package/lib/mechain/types/index.js +3 -0
  26. package/lib/proto/api.d.ts +16 -0
  27. package/lib/proto/api.js +194 -2
  28. package/lib/providers/http/index.js +45 -12
  29. package/lib/scripts/check-avs-registration.js +2 -2
  30. package/lib/scripts/generate-provider-types.js +2 -2
  31. package/lib/scripts/generate-toprf-keys.js +2 -2
  32. package/lib/scripts/register-avs-operator.js +2 -2
  33. package/lib/scripts/start-server.js +10 -3
  34. package/lib/scripts/update-avs-metadata.js +2 -2
  35. package/lib/scripts/verify-root-ca.js +2 -2
  36. package/lib/scripts/whitelist-operator.js +2 -2
  37. package/lib/server/handlers/claimTunnel.js +2 -2
  38. package/lib/server/handlers/createTaskOnMechain.d.ts +2 -0
  39. package/lib/server/handlers/createTaskOnMechain.js +52 -0
  40. package/lib/server/handlers/createTunnel.js +3 -3
  41. package/lib/server/handlers/index.js +3 -1
  42. package/lib/server/socket.js +11 -12
  43. package/lib/server/tunnels/make-tcp-tunnel.js +15 -8
  44. package/lib/server/utils/apm.js +8 -4
  45. package/lib/server/utils/assert-valid-claim-request.d.ts +2 -2
  46. package/lib/server/utils/assert-valid-claim-request.js +14 -11
  47. package/lib/tests/test.claim-creation.js +2 -2
  48. package/lib/tests/test.http-provider-utils.js +383 -230
  49. package/lib/tests/test.http-provider.js +30 -2
  50. package/lib/tests/test.rpc-tunnel.js +10 -6
  51. package/lib/tests/test.zk.d.ts +1 -1
  52. package/lib/tests/test.zk.js +127 -9
  53. package/lib/types/client.d.ts +2 -2
  54. package/lib/types/providers.d.ts +18 -3
  55. package/lib/types/providers.gen.d.ts +2 -3
  56. package/lib/types/providers.gen.js +2 -2
  57. package/lib/types/tunnel.d.ts +2 -2
  58. package/lib/types/zk.d.ts +0 -1
  59. package/lib/utils/http-parser.d.ts +4 -0
  60. package/lib/utils/http-parser.js +6 -3
  61. package/lib/utils/socket-base.js +2 -1
  62. package/lib/utils/zk.d.ts +1 -1
  63. package/lib/utils/zk.js +94 -55
  64. package/lib/window-rpc/setup-window-rpc.js +32 -1
  65. package/lib/window-rpc/types.d.ts +14 -1
  66. package/lib/window-rpc/utils.js +2 -2
  67. package/package.json +4 -3
  68. package/lib/providers/httpb64/index.d.ts +0 -3
  69. package/lib/providers/httpb64/index.js +0 -209
  70. package/lib/providers/httpb64/utils.d.ts +0 -77
  71. package/lib/providers/httpb64/utils.js +0 -358
  72. package/lib/server/utils/verify-server-certificates.d.ts +0 -7
  73. package/lib/server/utils/verify-server-certificates.js +0 -101
@@ -1,358 +0,0 @@
1
- "use strict";
2
- // noinspection ExceptionCaughtLocallyJS
3
- Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.extractHTMLElement = extractHTMLElement;
5
- exports.extractHTMLElements = extractHTMLElements;
6
- exports.extractHTMLElementIndex = extractHTMLElementIndex;
7
- exports.extractHTMLElementsIndexes = extractHTMLElementsIndexes;
8
- exports.extractJSONValueIndex = extractJSONValueIndex;
9
- exports.extractJSONValueIndexes = extractJSONValueIndexes;
10
- exports.buildHeaders = buildHeaders;
11
- exports.convertResponsePosToAbsolutePos = convertResponsePosToAbsolutePos;
12
- exports.getRedactionsForChunkHeaders = getRedactionsForChunkHeaders;
13
- exports.parseHttpResponse = parseHttpResponse;
14
- exports.makeRegex = makeRegex;
15
- exports.matchRedactedStrings = matchRedactedStrings;
16
- exports.generateRequstAndResponseFromTranscript = generateRequstAndResponseFromTranscript;
17
- const tls_1 = require("@reclaimprotocol/tls");
18
- const esprima_next_1 = require("esprima-next");
19
- const jsonpath_plus_1 = require("jsonpath-plus");
20
- const utils_1 = require("../../utils");
21
- let RE2;
22
- try {
23
- RE2 = require('re2');
24
- if (!Object.keys(RE2).length) {
25
- RE2 = undefined;
26
- throw new Error();
27
- }
28
- }
29
- catch (_a) {
30
- console.log('RE2 not found. Using standard regex');
31
- }
32
- let jsd;
33
- if (typeof window !== 'undefined') {
34
- // @ts-ignore
35
- jsd = window.jsdom;
36
- }
37
- else {
38
- jsd = require('jsdom');
39
- }
40
- /**
41
- * Returns only first extracted element
42
- * @param html
43
- * @param xpathExpression
44
- * @param contentsOnly
45
- */
46
- function extractHTMLElement(html, xpathExpression, contentsOnly) {
47
- const { start, end } = extractHTMLElementIndex(html, xpathExpression, contentsOnly);
48
- return html.slice(start, end);
49
- }
50
- /**
51
- * Returns all extracted elements
52
- * @param html
53
- * @param xpathExpression
54
- * @param contentsOnly
55
- */
56
- function extractHTMLElements(html, xpathExpression, contentsOnly) {
57
- const indexes = extractHTMLElementsIndexes(html, xpathExpression, contentsOnly);
58
- const res = [];
59
- for (const { start, end } of indexes) {
60
- res.push(html.slice(start, end));
61
- }
62
- return res;
63
- }
64
- /**
65
- * returns a single index of extracted element
66
- * @param html
67
- * @param xpathExpression
68
- * @param contentsOnly
69
- */
70
- function extractHTMLElementIndex(html, xpathExpression, contentsOnly) {
71
- return extractHTMLElementsIndexes(html, xpathExpression, contentsOnly)[0];
72
- }
73
- /**
74
- * Returns indexes of all extracted elements
75
- * @param html
76
- * @param xpathExpression
77
- * @param contentsOnly
78
- */
79
- function extractHTMLElementsIndexes(html, xpathExpression, contentsOnly) {
80
- const dom = new jsd.JSDOM(html, {
81
- contentType: 'text/html',
82
- includeNodeLocations: true
83
- });
84
- const document = dom.window.document;
85
- const xpathResult = document.evaluate(xpathExpression, document, null, dom.window.XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
86
- const nodes = [];
87
- if ((xpathResult === null || xpathResult === void 0 ? void 0 : xpathResult.resultType) === dom.window.XPathResult.ORDERED_NODE_SNAPSHOT_TYPE &&
88
- (xpathResult === null || xpathResult === void 0 ? void 0 : xpathResult.snapshotLength)) {
89
- for (let i = 0; i < xpathResult.snapshotLength; ++i) {
90
- nodes.push(xpathResult.snapshotItem(i));
91
- }
92
- }
93
- if (!nodes.length) {
94
- throw new Error(`Failed to find XPath: "${xpathExpression}"`);
95
- }
96
- const res = [];
97
- for (const node of nodes) {
98
- const nodeLocation = dom.nodeLocation(node);
99
- if (!nodeLocation) {
100
- throw new Error(`Failed to find XPath node location: "${xpathExpression}"`);
101
- }
102
- if (contentsOnly) {
103
- const start = nodeLocation.startTag ? nodeLocation.startTag.endOffset : nodeLocation.startOffset;
104
- const end = nodeLocation.endTag ? nodeLocation.endTag.startOffset : nodeLocation.endOffset;
105
- res.push({ start, end });
106
- }
107
- else {
108
- res.push({ start: nodeLocation.startOffset, end: nodeLocation.endOffset });
109
- }
110
- }
111
- return res;
112
- }
113
- function extractJSONValueIndex(json, jsonPath) {
114
- return extractJSONValueIndexes(json, jsonPath)[0];
115
- }
116
- function extractJSONValueIndexes(json, jsonPath) {
117
- const pointers = (0, jsonpath_plus_1.JSONPath)({
118
- path: jsonPath,
119
- json: JSON.parse(json),
120
- wrap: false,
121
- resultType: 'pointer',
122
- eval: 'safe',
123
- // @ts-ignore
124
- ignoreEvalErrors: true
125
- });
126
- if (!pointers) {
127
- throw new Error('jsonPath not found');
128
- }
129
- const tree = (0, esprima_next_1.parseScript)('(' + json + ')', { range: true }); //wrap in parentheses for esprima to parse
130
- if (tree.body[0] instanceof esprima_next_1.ExpressionStatement
131
- && (tree.body[0].expression instanceof esprima_next_1.ObjectExpression || tree.body[0].expression instanceof esprima_next_1.ArrayExpression)) {
132
- const traversePointers = Array.isArray(pointers) ? pointers : [pointers];
133
- const res = [];
134
- for (const pointer of traversePointers) {
135
- const index = traverse(tree.body[0].expression, '', [pointer]);
136
- if (index) {
137
- res.push({
138
- start: index.start - 1, //account for '('
139
- end: index.end - 1,
140
- });
141
- }
142
- }
143
- return res;
144
- }
145
- throw new Error('jsonPath not found');
146
- }
147
- /**
148
- * recursively go through AST tree and build a JSON path while it's not equal to the one we search for
149
- * @param o - esprima expression for root object
150
- * @param path - path that is being built
151
- * @param pointers - JSON pointers to compare to
152
- */
153
- function traverse(o, path, pointers) {
154
- if (o instanceof esprima_next_1.ObjectExpression) {
155
- for (const p of o.properties) {
156
- if (!(p instanceof esprima_next_1.Property)) {
157
- continue;
158
- }
159
- const localPath = p.key.type === esprima_next_1.Syntax.Literal
160
- ? path + '/' + p.key.value
161
- : path;
162
- if (pointers.includes(localPath) && 'range' in p && Array.isArray(p.range)) {
163
- return {
164
- start: p.range[0],
165
- end: p.range[1],
166
- };
167
- }
168
- if (p.value instanceof esprima_next_1.ObjectExpression
169
- || p.value instanceof esprima_next_1.ArrayExpression) {
170
- const res = traverse(p.value, localPath, pointers);
171
- if (res) {
172
- return res;
173
- }
174
- }
175
- }
176
- }
177
- if (o instanceof esprima_next_1.ArrayExpression) {
178
- for (let i = 0; i < o.elements.length; i++) {
179
- const element = o.elements[i];
180
- if (!element) {
181
- continue;
182
- }
183
- const localPath = path + '/' + i;
184
- if (pointers.includes(localPath) &&
185
- 'range' in element &&
186
- Array.isArray(element.range)) {
187
- return {
188
- start: element.range[0],
189
- end: element.range[1],
190
- };
191
- }
192
- if (element instanceof esprima_next_1.ObjectExpression) {
193
- const res = traverse(element, localPath, pointers);
194
- if (res) {
195
- return res;
196
- }
197
- }
198
- if (element instanceof esprima_next_1.ArrayExpression) {
199
- const res = traverse(element, localPath, pointers);
200
- if (res) {
201
- return res;
202
- }
203
- }
204
- }
205
- }
206
- return null;
207
- }
208
- function buildHeaders(input) {
209
- const headers = [];
210
- for (const [key, value] of Object.entries(input || {})) {
211
- headers.push(`${key}: ${value}`);
212
- }
213
- return headers;
214
- }
215
- /**
216
- * Converts position in HTTP response body to an absolute position in TLS transcript considering chunked encoding
217
- * @param pos
218
- * @param bodyStartIdx
219
- * @param chunks
220
- */
221
- function convertResponsePosToAbsolutePos(pos, bodyStartIdx, chunks) {
222
- if (chunks === null || chunks === void 0 ? void 0 : chunks.length) {
223
- let chunkBodyStart = 0;
224
- for (const chunk of chunks) {
225
- const chunkSize = chunk.toIndex - chunk.fromIndex;
226
- if (pos >= chunkBodyStart && pos <= (chunkBodyStart + chunkSize)) {
227
- return pos - chunkBodyStart + chunk.fromIndex;
228
- }
229
- chunkBodyStart += chunkSize;
230
- }
231
- throw new Error('position out of range');
232
- }
233
- return bodyStartIdx + pos;
234
- }
235
- /**
236
- * Returns parts of response which contain chunk headers and must be redacted out
237
- * of revealed response part
238
- * @param from
239
- * @param to
240
- * @param chunks
241
- */
242
- function getRedactionsForChunkHeaders(from, to, chunks) {
243
- const res = [];
244
- if (chunks === null || chunks === void 0 ? void 0 : chunks.length) {
245
- for (let i = 1; i < (chunks === null || chunks === void 0 ? void 0 : chunks.length); i++) {
246
- if (chunks[i].fromIndex > from && chunks[i].fromIndex < to) {
247
- res.push({ fromIndex: chunks[i - 1].toIndex, toIndex: chunks[i].fromIndex });
248
- }
249
- }
250
- }
251
- return res;
252
- }
253
- function parseHttpResponse(buff) {
254
- const parser = (0, utils_1.makeHttpResponseParser)();
255
- parser.onChunk(buff);
256
- parser.streamEnded();
257
- return parser.res;
258
- }
259
- function makeRegex(str) {
260
- if (RE2 !== undefined) {
261
- return RE2(str, 'sgiu');
262
- }
263
- return new RegExp(str, 'sgi');
264
- }
265
- const TEMPLATE_START_CHARCODE = '{'.charCodeAt(0);
266
- const TEMPLATE_END_CHARCODE = '}'.charCodeAt(0);
267
- /**
268
- * Try to match strings that contain templates like {{param}}
269
- * against redacted string that has *** instead of that param
270
- */
271
- function matchRedactedStrings(templateString, redactedString) {
272
- if (templateString.length === 0 && (redactedString === null || redactedString === void 0 ? void 0 : redactedString.length) === 0) {
273
- return true;
274
- }
275
- if (!redactedString) {
276
- return false;
277
- }
278
- let ts = -1;
279
- let rs = -1;
280
- while (ts < templateString.length && rs < redactedString.length) {
281
- let ct = getTChar();
282
- let cr = getRChar();
283
- if (ct !== cr) {
284
- // only valid if param contains "{" & redacted contains "*"
285
- if (ct === TEMPLATE_START_CHARCODE && cr === utils_1.REDACTION_CHAR_CODE) {
286
- //check that the char after first "{" is also "{"
287
- if (getTChar() !== TEMPLATE_START_CHARCODE) {
288
- return false;
289
- }
290
- //look for first closing bracket
291
- while (((ct = getTChar()) !== TEMPLATE_END_CHARCODE) && ct !== -1) {
292
- }
293
- //look for second closing bracket
294
- while (((ct = getTChar()) !== TEMPLATE_END_CHARCODE) && ct !== -1) {
295
- }
296
- if (ct === -1) {
297
- return false;
298
- }
299
- //find the end of redaction
300
- while (((cr = getRChar()) === utils_1.REDACTION_CHAR_CODE) && cr !== -1) {
301
- }
302
- if (cr === -1) {
303
- //if there's nothing after template too then both ended at the end of strings
304
- return getTChar() === -1;
305
- }
306
- //rewind redacted string position back 1 char because we read one extra
307
- rs--;
308
- }
309
- else {
310
- return false;
311
- }
312
- }
313
- }
314
- function getTChar() {
315
- ts++;
316
- if (ts < templateString.length) {
317
- return templateString[ts];
318
- }
319
- else {
320
- return -1;
321
- }
322
- }
323
- function getRChar() {
324
- if (!redactedString) {
325
- return -1;
326
- }
327
- rs++;
328
- if (rs < redactedString.length) {
329
- return redactedString[rs];
330
- }
331
- else {
332
- return -1;
333
- }
334
- }
335
- return ts === templateString.length && rs === redactedString.length;
336
- }
337
- function generateRequstAndResponseFromTranscript(transcript, tlsVersion) {
338
- const allPackets = transcript;
339
- const packets = [];
340
- for (const b of allPackets) {
341
- if (b.message.type !== 'ciphertext'
342
- || !(0, utils_1.isApplicationData)(b.message, tlsVersion)) {
343
- continue;
344
- }
345
- const plaintext = tlsVersion === 'TLS1_3'
346
- ? b.message.plaintext.slice(0, -1)
347
- : b.message.plaintext;
348
- packets.push({
349
- message: plaintext,
350
- sender: b.sender
351
- });
352
- }
353
- const req = (0, utils_1.getHttpRequestDataFromTranscript)(packets);
354
- const responsePackets = (0, tls_1.concatenateUint8Arrays)(packets.filter(p => p.sender === 'server').map(p => p.message).filter(b => !b.every(b => b === utils_1.REDACTION_CHAR_CODE)));
355
- const res = parseHttpResponse(responsePackets);
356
- return { req, res };
357
- }
358
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/providers/httpb64/utils.ts"],"names":[],"mappings":"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"}
@@ -1,7 +0,0 @@
1
- import { IDecryptedTranscript } from '../../types';
2
- /**
3
- * Verifies server cert chain and removes handshake messages from transcript, returning new one
4
- * @param receipt
5
- * @param logger
6
- */
7
- export declare function verifyServerCertificates(receipt: IDecryptedTranscript, logger: any): Promise<IDecryptedTranscript>;
@@ -1,101 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.verifyServerCertificates = verifyServerCertificates;
4
- const tls_1 = require("@reclaimprotocol/tls");
5
- const parse_certificate_1 = require("@reclaimprotocol/tls/lib/utils/parse-certificate");
6
- const utils_1 = require("../../utils");
7
- const RECORD_LENGTH_BYTES = 3;
8
- /**
9
- * Verifies server cert chain and removes handshake messages from transcript, returning new one
10
- * @param receipt
11
- * @param logger
12
- */
13
- async function verifyServerCertificates(receipt, logger) {
14
- const handshakeMsgs = (0, utils_1.extractHandshakeFromTranscript)(receipt);
15
- let handshakeData = (0, tls_1.concatenateUint8Arrays)(handshakeMsgs.messages.map(m => m.message));
16
- let packetData;
17
- const handshakeRawMessages = [];
18
- const certificates = [];
19
- let cipherSuite = undefined;
20
- let serverRandom = undefined;
21
- let clientRandom = undefined;
22
- let certVerified = false;
23
- while ((packetData = readPacket()) && !certVerified) {
24
- const { type, content } = packetData;
25
- switch (type) {
26
- case tls_1.SUPPORTED_RECORD_TYPE_MAP.CLIENT_HELLO:
27
- const clientHello = (0, tls_1.parseClientHello)(handshakeRawMessages[0]);
28
- clientRandom = clientHello.serverRandom;
29
- break;
30
- case tls_1.SUPPORTED_RECORD_TYPE_MAP.SERVER_HELLO:
31
- const serverHello = await (0, tls_1.parseServerHello)(content);
32
- cipherSuite = serverHello.cipherSuite;
33
- serverRandom = serverHello.serverRandom;
34
- break;
35
- case tls_1.SUPPORTED_RECORD_TYPE_MAP.CERTIFICATE:
36
- const parseResult = (0, tls_1.parseCertificates)(content, { version: receipt.tlsVersion });
37
- certificates.push(...parseResult.certificates);
38
- break;
39
- case tls_1.SUPPORTED_RECORD_TYPE_MAP.CERTIFICATE_VERIFY:
40
- const signature = (0, tls_1.parseServerCertificateVerify)(content);
41
- if (!(certificates === null || certificates === void 0 ? void 0 : certificates.length)) {
42
- throw new Error('No provider certificates received');
43
- }
44
- const signatureData = await (0, tls_1.getSignatureDataTls13)(handshakeRawMessages.slice(0, -1), cipherSuite);
45
- await (0, tls_1.verifyCertificateSignature)({
46
- ...signature,
47
- publicKey: certificates[0].getPublicKey(),
48
- signatureData,
49
- });
50
- await (0, parse_certificate_1.verifyCertificateChain)(certificates, receipt.hostname);
51
- logger.info({ host: receipt.hostname }, 'verified provider certificate chain');
52
- certVerified = true;
53
- break;
54
- case tls_1.SUPPORTED_RECORD_TYPE_MAP.SERVER_KEY_SHARE:
55
- if (!(certificates === null || certificates === void 0 ? void 0 : certificates.length)) {
56
- throw new Error('No provider certificates received');
57
- }
58
- const keyShare = await (0, tls_1.processServerKeyShare)(content);
59
- const signatureData12 = await (0, tls_1.getSignatureDataTls12)({
60
- clientRandom: clientRandom,
61
- serverRandom: serverRandom,
62
- curveType: keyShare.publicKeyType,
63
- publicKey: keyShare.publicKey,
64
- });
65
- // verify signature
66
- await (0, tls_1.verifyCertificateSignature)({
67
- signature: keyShare.signatureBytes,
68
- algorithm: keyShare.signatureAlgorithm,
69
- publicKey: certificates[0].getPublicKey(),
70
- signatureData: signatureData12,
71
- });
72
- await (0, parse_certificate_1.verifyCertificateChain)(certificates, receipt.hostname);
73
- logger.info({ host: receipt.hostname }, 'verified provider certificate chain');
74
- certVerified = true;
75
- break;
76
- }
77
- }
78
- if (!certVerified) {
79
- throw new Error('No provider certificates received');
80
- }
81
- function readPacket() {
82
- if (!handshakeData.length) {
83
- return;
84
- }
85
- const type = handshakeData[0];
86
- const content = (0, tls_1.readWithLength)(handshakeData.slice(1), RECORD_LENGTH_BYTES);
87
- if (!content) {
88
- logger.warn('missing bytes from packet');
89
- return;
90
- }
91
- const totalLength = 1 + RECORD_LENGTH_BYTES + content.length;
92
- handshakeRawMessages.push(handshakeData.slice(0, totalLength));
93
- handshakeData = handshakeData.slice(totalLength);
94
- return { type, content };
95
- }
96
- return {
97
- tlsVersion: receipt.tlsVersion,
98
- hostname: receipt.hostname,
99
- transcript: receipt.transcript.slice(handshakeMsgs.lastMsgIndex)
100
- };
101
- }