@reclaimprotocol/attestor-core 4.0.0 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/avs/tests/test.operator.js +4 -4
- package/lib/client/create-claim.js +19 -9
- package/lib/client/tunnels/make-rpc-tcp-tunnel.js +3 -3
- package/lib/client/tunnels/make-rpc-tls-tunnel.js +3 -3
- package/lib/client/utils/message-handler.js +2 -2
- package/lib/config/index.d.ts +5 -2
- package/lib/config/index.js +5 -4
- package/lib/proto/api.d.ts +1 -0
- package/lib/proto/api.js +7 -1
- package/lib/providers/http/index.js +43 -10
- package/lib/scripts/check-avs-registration.js +2 -2
- package/lib/scripts/generate-provider-types.js +2 -2
- package/lib/scripts/generate-toprf-keys.js +2 -2
- package/lib/scripts/register-avs-operator.js +2 -2
- package/lib/scripts/start-server.js +10 -3
- package/lib/scripts/update-avs-metadata.js +2 -2
- package/lib/scripts/verify-root-ca.js +2 -2
- package/lib/scripts/whitelist-operator.js +2 -2
- package/lib/server/handlers/claimTunnel.js +2 -2
- package/lib/server/handlers/createTunnel.js +3 -3
- package/lib/server/socket.js +4 -4
- package/lib/server/tunnels/make-tcp-tunnel.js +15 -8
- package/lib/server/utils/apm.js +8 -4
- package/lib/server/utils/assert-valid-claim-request.d.ts +2 -2
- package/lib/server/utils/assert-valid-claim-request.js +14 -11
- package/lib/tests/test.claim-creation.js +2 -2
- package/lib/tests/test.http-provider-utils.js +382 -229
- package/lib/tests/test.http-provider.js +30 -2
- package/lib/tests/test.rpc-tunnel.js +10 -6
- package/lib/tests/test.zk.d.ts +1 -1
- package/lib/tests/test.zk.js +127 -9
- package/lib/types/providers.d.ts +18 -3
- package/lib/types/providers.gen.d.ts +2 -3
- package/lib/types/providers.gen.js +2 -2
- package/lib/types/tunnel.d.ts +2 -2
- package/lib/types/zk.d.ts +0 -1
- package/lib/utils/http-parser.d.ts +4 -0
- package/lib/utils/http-parser.js +4 -2
- package/lib/utils/zk.d.ts +1 -1
- package/lib/utils/zk.js +94 -55
- package/lib/window-rpc/utils.js +2 -2
- package/package.json +4 -3
- package/lib/providers/httpb64/index.d.ts +0 -3
- package/lib/providers/httpb64/index.js +0 -209
- package/lib/providers/httpb64/utils.d.ts +0 -77
- package/lib/providers/httpb64/utils.js +0 -358
- package/lib/server/utils/verify-server-certificates.d.ts +0 -7
- package/lib/server/utils/verify-server-certificates.js +0 -101
package/lib/utils/zk.js
CHANGED
|
@@ -17,7 +17,7 @@ const logger_1 = require("../utils/logger");
|
|
|
17
17
|
const redactions_1 = require("../utils/redactions");
|
|
18
18
|
const ZK_CONCURRENCY = +((0, env_1.getEnvVariable)('ZK_CONCURRENCY')
|
|
19
19
|
|| config_1.DEFAULT_ZK_CONCURRENCY);
|
|
20
|
-
async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY,
|
|
20
|
+
async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY, cipherSuite, zkEngine = 'snarkjs' }) {
|
|
21
21
|
const { default: PQueue } = await import('p-queue');
|
|
22
22
|
const zkQueue = new PQueue({
|
|
23
23
|
concurrency: zkProofConcurrency,
|
|
@@ -25,7 +25,7 @@ async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logge
|
|
|
25
25
|
});
|
|
26
26
|
const packetsToProve = [];
|
|
27
27
|
logger = (logger || logger_1.logger).child({ module: 'zk', zkEngine: zkEngine });
|
|
28
|
-
let
|
|
28
|
+
let zkProofsToGen = 0;
|
|
29
29
|
return {
|
|
30
30
|
/**
|
|
31
31
|
* Adds the given packet to the list of packets to
|
|
@@ -39,69 +39,91 @@ async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logge
|
|
|
39
39
|
}
|
|
40
40
|
const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
|
|
41
41
|
const chunkSizeBytes = getChunkSizeBytes(alg);
|
|
42
|
-
//const { redactedPlaintext } = reveal
|
|
43
42
|
const key = await tls_1.crypto.exportKey(packet.encKey);
|
|
44
43
|
const iv = packet.iv;
|
|
45
44
|
const ciphertext = (0, generics_1.getPureCiphertext)(packet.ciphertext, cipherSuite);
|
|
46
|
-
const chunks = Math.ceil(ciphertext.length / chunkSizeBytes);
|
|
47
45
|
const packetToProve = {
|
|
48
46
|
onGeneratedProofs,
|
|
49
47
|
algorithm: alg,
|
|
50
48
|
proofsToGenerate: [],
|
|
51
49
|
iv: packet.fixedIv,
|
|
52
50
|
};
|
|
53
|
-
const
|
|
51
|
+
const slicesDone = [];
|
|
54
52
|
// first we'll handle all TOPRF blocks
|
|
55
53
|
// we do these first, because they can span multiple chunks
|
|
56
54
|
// & we need to be able to span the right chunks
|
|
57
55
|
for (const toprf of toprfs || []) {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
56
|
+
const fromIndex = getIdealOffsetForToprfBlock(alg, toprf);
|
|
57
|
+
const toIndex = Math.min(fromIndex + chunkSizeBytes, ciphertext.length);
|
|
58
|
+
// ensure this OPRF block doesn't overlap with any other OPRF block
|
|
59
|
+
const slice = { fromIndex, toIndex };
|
|
60
|
+
assertNoOverlapOprf(slice);
|
|
61
|
+
addProofsToGenerate(slice, {
|
|
64
62
|
...toprf,
|
|
65
63
|
dataLocation: {
|
|
66
64
|
...toprf.dataLocation,
|
|
67
|
-
fromIndex: toprf.dataLocation.fromIndex
|
|
65
|
+
fromIndex: toprf.dataLocation.fromIndex - fromIndex
|
|
68
66
|
}
|
|
69
67
|
});
|
|
70
68
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
69
|
+
// now we'll go through the rest of the ciphertext, and add proofs
|
|
70
|
+
// for the sections that haven't been covered by the TOPRF blocks
|
|
71
|
+
const slicesCp = sortSlices(slicesDone.slice());
|
|
72
|
+
let fromIndex = 0;
|
|
73
|
+
for (const done of slicesCp) {
|
|
74
|
+
if (done.fromIndex > fromIndex) {
|
|
75
|
+
addProofsToGenerate({
|
|
76
|
+
fromIndex,
|
|
77
|
+
toIndex: done.fromIndex
|
|
78
|
+
});
|
|
75
79
|
}
|
|
76
|
-
|
|
80
|
+
fromIndex = done.toIndex;
|
|
81
|
+
}
|
|
82
|
+
if (fromIndex < ciphertext.length) {
|
|
83
|
+
addProofsToGenerate({
|
|
84
|
+
fromIndex,
|
|
85
|
+
toIndex: ciphertext.length
|
|
86
|
+
});
|
|
77
87
|
}
|
|
78
88
|
// generate proofs in order of start index
|
|
79
89
|
packetToProve.proofsToGenerate
|
|
80
90
|
.sort((a, b) => a.startIdx - b.startIdx);
|
|
81
91
|
packetsToProve.push(packetToProve);
|
|
82
|
-
function
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
toprf,
|
|
91
|
-
});
|
|
92
|
-
if (!proofParams) {
|
|
93
|
-
return;
|
|
92
|
+
function assertNoOverlapOprf(slice) {
|
|
93
|
+
for (const done of slicesDone) {
|
|
94
|
+
if (
|
|
95
|
+
// 1d box overlap
|
|
96
|
+
slice.fromIndex < done.toIndex
|
|
97
|
+
&& slice.toIndex > done.fromIndex) {
|
|
98
|
+
throw new error_1.AttestorError('ERROR_BAD_REQUEST', 'Single chunk has multiple OPRFs');
|
|
99
|
+
}
|
|
94
100
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
101
|
+
}
|
|
102
|
+
function addProofsToGenerate({ fromIndex, toIndex }, toprf) {
|
|
103
|
+
for (let i = fromIndex; i < toIndex; i += chunkSizeBytes) {
|
|
104
|
+
const slice = {
|
|
105
|
+
fromIndex: i,
|
|
106
|
+
toIndex: Math.min(i + chunkSizeBytes, toIndex)
|
|
107
|
+
};
|
|
108
|
+
slicesDone.push(slice);
|
|
109
|
+
const proofParams = getProofGenerationParamsForSlice({
|
|
110
|
+
key,
|
|
111
|
+
iv,
|
|
112
|
+
ciphertext,
|
|
113
|
+
redactedPlaintext,
|
|
114
|
+
slice,
|
|
115
|
+
toprf,
|
|
116
|
+
});
|
|
117
|
+
if (!proofParams) {
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
packetToProve.proofsToGenerate.push(proofParams);
|
|
121
|
+
zkProofsToGen += 1;
|
|
100
122
|
}
|
|
101
123
|
}
|
|
102
124
|
},
|
|
103
125
|
getTotalChunksToProve() {
|
|
104
|
-
return
|
|
126
|
+
return zkProofsToGen;
|
|
105
127
|
},
|
|
106
128
|
async generateProofs(onChunkDone) {
|
|
107
129
|
var _a;
|
|
@@ -126,13 +148,10 @@ async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logge
|
|
|
126
148
|
}
|
|
127
149
|
}
|
|
128
150
|
await Promise.all(tasks);
|
|
129
|
-
logger === null || logger === void 0 ? void 0 : logger.info({
|
|
130
|
-
durationMs: Date.now() - start,
|
|
131
|
-
chunks: zkChunksToProve,
|
|
132
|
-
}, 'generated ZK proofs');
|
|
151
|
+
logger === null || logger === void 0 ? void 0 : logger.info({ durationMs: Date.now() - start, zkProofsToGen }, 'generated ZK proofs');
|
|
133
152
|
// reset the packets to prove
|
|
134
153
|
packetsToProve.splice(0, packetsToProve.length);
|
|
135
|
-
|
|
154
|
+
zkProofsToGen = 0;
|
|
136
155
|
// release ZK resources to free up memory
|
|
137
156
|
const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
|
|
138
157
|
const zkOperator = await getZkOperatorForAlgorithm(alg);
|
|
@@ -203,8 +222,6 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
203
222
|
* in the proofs
|
|
204
223
|
*/
|
|
205
224
|
const realRedactedPlaintext = new Uint8Array(ciphertext.length).fill(redactions_1.REDACTION_CHAR_CODE);
|
|
206
|
-
const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
|
|
207
|
-
const chunkSizeBytes = getChunkSizeBytes(alg);
|
|
208
225
|
await Promise.all(proofs.map(async (proof, i) => {
|
|
209
226
|
try {
|
|
210
227
|
await verifyProofPacket(proof);
|
|
@@ -253,7 +270,6 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
253
270
|
if (!(0, redactions_1.isRedactionCongruent)(comparePlaintext, decryptedRedactedCiphertext)) {
|
|
254
271
|
throw new Error('redacted ciphertext not congruent');
|
|
255
272
|
}
|
|
256
|
-
const chunkIndex = startIdx / chunkSizeBytes;
|
|
257
273
|
let nonce = (0, tls_1.concatenateUint8Arrays)([iv, recordIV]);
|
|
258
274
|
if (!recordIV.length) {
|
|
259
275
|
nonce = (0, tls_1.generateIV)(nonce, recordNumber);
|
|
@@ -269,7 +285,7 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
269
285
|
publicInput: {
|
|
270
286
|
ciphertext: ciphertextChunk,
|
|
271
287
|
iv: nonce,
|
|
272
|
-
|
|
288
|
+
offsetBytes: startIdx
|
|
273
289
|
},
|
|
274
290
|
logger,
|
|
275
291
|
...(toprf
|
|
@@ -297,6 +313,8 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
297
313
|
|| makeDefaultOPRFOperator(algorithm, zkEngine, logger);
|
|
298
314
|
}
|
|
299
315
|
}
|
|
316
|
+
// the chunk size of the ZK circuit in bytes
|
|
317
|
+
// this will be >= the block size
|
|
300
318
|
function getChunkSizeBytes(alg) {
|
|
301
319
|
const { chunkSize, bitsPerWord } = zk_symmetric_crypto_1.CONFIG[alg];
|
|
302
320
|
return chunkSize * bitsPerWord / 8;
|
|
@@ -374,14 +392,9 @@ function getEngineProto(engine) {
|
|
|
374
392
|
}
|
|
375
393
|
throw new Error(`Unknown ZK engine: ${engine}`);
|
|
376
394
|
}
|
|
377
|
-
function
|
|
378
|
-
const
|
|
379
|
-
const
|
|
380
|
-
const endIdx = (offsetChunks + 1) * chunkSize;
|
|
381
|
-
const ciphertextChunk = ciphertext
|
|
382
|
-
.slice(startIdx, endIdx);
|
|
383
|
-
const plaintextChunk = redactedPlaintext
|
|
384
|
-
.slice(startIdx, endIdx);
|
|
395
|
+
function getProofGenerationParamsForSlice({ key, iv, ciphertext, redactedPlaintext, slice: { fromIndex, toIndex }, toprf, }) {
|
|
396
|
+
const ciphertextChunk = ciphertext.slice(fromIndex, toIndex);
|
|
397
|
+
const plaintextChunk = redactedPlaintext.slice(fromIndex, toIndex);
|
|
385
398
|
if ((0, redactions_1.isFullyRedacted)(plaintextChunk)) {
|
|
386
399
|
return;
|
|
387
400
|
}
|
|
@@ -395,11 +408,37 @@ function getProofGenerationParamsForChunk(algorithm, { key, iv, ciphertext, reda
|
|
|
395
408
|
}
|
|
396
409
|
}
|
|
397
410
|
return {
|
|
398
|
-
startIdx,
|
|
411
|
+
startIdx: fromIndex,
|
|
399
412
|
redactedPlaintext: plaintextChunk,
|
|
400
413
|
privateInput: { key },
|
|
401
|
-
publicInput: { ciphertext: ciphertextChunk, iv,
|
|
414
|
+
publicInput: { ciphertext: ciphertextChunk, iv, offsetBytes: fromIndex },
|
|
402
415
|
toprf
|
|
403
416
|
};
|
|
404
417
|
}
|
|
405
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}
|
|
418
|
+
/**
|
|
419
|
+
* Get the ideal location to generate a ZK proof for a TOPRF block.
|
|
420
|
+
* Ideally it should be put into a slice that's a divisor of the chunk size,
|
|
421
|
+
* as that'll minimize the number of proofs that need to be generated.
|
|
422
|
+
* @returns the offset in bytes
|
|
423
|
+
*/
|
|
424
|
+
function getIdealOffsetForToprfBlock(alg, { dataLocation }) {
|
|
425
|
+
const chunkSizeBytes = getChunkSizeBytes(alg);
|
|
426
|
+
const offsetChunks = Math.floor(dataLocation.fromIndex / chunkSizeBytes) * chunkSizeBytes;
|
|
427
|
+
const endOffsetChunks = Math.floor((dataLocation.fromIndex + dataLocation.length) / chunkSizeBytes);
|
|
428
|
+
// happy case -- the OPRF block fits into a single chunk, that's a
|
|
429
|
+
// divisor of the chunk size
|
|
430
|
+
if (endOffsetChunks === offsetChunks) {
|
|
431
|
+
return offsetChunks * chunkSizeBytes;
|
|
432
|
+
}
|
|
433
|
+
const blockSizeBytes = (0, zk_symmetric_crypto_1.getBlockSizeBytes)(alg);
|
|
434
|
+
const offsetBytes = Math.floor(dataLocation.fromIndex / blockSizeBytes) * blockSizeBytes;
|
|
435
|
+
if ((dataLocation.fromIndex + dataLocation.length) - offsetBytes
|
|
436
|
+
> chunkSizeBytes) {
|
|
437
|
+
throw new error_1.AttestorError('ERROR_BAD_REQUEST', 'OPRF data cannot fit into a single chunk');
|
|
438
|
+
}
|
|
439
|
+
return offsetBytes;
|
|
440
|
+
}
|
|
441
|
+
function sortSlices(slices) {
|
|
442
|
+
return slices.sort((a, b) => a.fromIndex - b.fromIndex);
|
|
443
|
+
}
|
|
444
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}
|
package/lib/window-rpc/utils.js
CHANGED
|
@@ -24,7 +24,7 @@ async function getCurrentMemoryUsage() {
|
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
try {
|
|
27
|
-
const result =
|
|
27
|
+
const result = performance.measureUserAgentSpecificMemory();
|
|
28
28
|
const totalmb = Math.round(result.bytes / 1024 / 1024);
|
|
29
29
|
return {
|
|
30
30
|
available: true,
|
|
@@ -99,4 +99,4 @@ function waitForResponse(type, requestId, bridge, timeoutMs = 60000) {
|
|
|
99
99
|
});
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2luZG93LXJwYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU9BLHNEQStCQztBQUVELG9EQUVDO0FBTUQsMERBSUM7QUFFRCw0REFzQkM7QUFFRCwwQ0FxQ0M7QUFuSEQsbUNBQStCO0FBQy9CLHVDQUF3QztBQUV4QyxxQ0FBcUU7QUFHckUscUJBQXFCO0FBQ2QsS0FBSyxVQUFVLHFCQUFxQjtJQUMxQyxJQUFHLENBQUMsTUFBTSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDaEMsT0FBTztZQUNOLFNBQVMsRUFBRSxLQUFLO1lBQ2hCLE9BQU8sRUFBRSxzQ0FBc0M7U0FDL0MsQ0FBQTtJQUNGLENBQUM7U0FBTSxJQUFHLENBQUMsV0FBVyxDQUFDLDhCQUE4QixFQUFFLENBQUM7UUFDdkQsT0FBTztZQUNOLFNBQVMsRUFBRSxLQUFLO1lBQ2hCLE9BQU8sRUFBRSxxRUFBcUU7U0FDOUUsQ0FBQTtJQUNGLENBQUM7U0FBTSxDQUFDO1FBQ1AsSUFBSSxDQUFDO1lBQ0osTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLDhCQUE4QixFQUFFLENBQUE7WUFDM0QsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxHQUFHLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQTtZQUV0RCxPQUFPO2dCQUNOLFNBQVMsRUFBRSxJQUFJO2dCQUNmLE9BQU8sRUFBRSxHQUFHLE9BQU8sSUFBSTthQUN2QixDQUFBO1FBQ0YsQ0FBQztRQUFDLE9BQU0sS0FBSyxFQUFFLENBQUM7WUFDZixJQUFHLEtBQUssWUFBWSxZQUFZLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxlQUFlLEVBQUUsQ0FBQztnQkFDcEUsT0FBTztvQkFDTixTQUFTLEVBQUUsS0FBSztvQkFDaEIsT0FBTyxFQUFFLFFBQVEsS0FBSyxDQUFDLE9BQU8sR0FBRztpQkFDakMsQ0FB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reclaimprotocol/attestor-core",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index",
|
|
6
6
|
"scripts": {
|
|
@@ -30,7 +30,8 @@
|
|
|
30
30
|
"start:chain": "bash ./avs/utils/anvil/start-anvil-chain-with-el-and-avs-deployed.sh",
|
|
31
31
|
"commitlint": "commitlint --edit",
|
|
32
32
|
"download:zk-files": "node node_modules/@reclaimprotocol/zk-symmetric-crypto/lib/scripts/download-files",
|
|
33
|
-
"generate:toprf-keys": "npm run run:tsc -- src/scripts/generate-toprf-keys.ts"
|
|
33
|
+
"generate:toprf-keys": "npm run run:tsc -- src/scripts/generate-toprf-keys.ts",
|
|
34
|
+
"publish:pkg": "npm publish --access public"
|
|
34
35
|
},
|
|
35
36
|
"files": [
|
|
36
37
|
"lib/*"
|
|
@@ -66,7 +67,7 @@
|
|
|
66
67
|
"@commitlint/cli": "^17.8.1",
|
|
67
68
|
"@commitlint/config-conventional": "^17.8.1",
|
|
68
69
|
"@reclaimprotocol/tls": "github:reclaimprotocol/tls",
|
|
69
|
-
"@reclaimprotocol/zk-symmetric-crypto": "^3.0.
|
|
70
|
+
"@reclaimprotocol/zk-symmetric-crypto": "^3.0.5",
|
|
70
71
|
"ajv": "^8.17.1",
|
|
71
72
|
"canonicalize": "^2.0.0",
|
|
72
73
|
"dotenv": "^16.4.6",
|
|
@@ -1,209 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tls_1 = require("@reclaimprotocol/tls");
|
|
4
|
-
const utils_1 = require("ethers/lib/utils");
|
|
5
|
-
const config_1 = require("../../config");
|
|
6
|
-
const utils_2 = require("../../providers/http/utils");
|
|
7
|
-
const utils_3 = require("../../utils");
|
|
8
|
-
const HTTP_BASE64_PROVIDER = {
|
|
9
|
-
hostPort: getHostPort,
|
|
10
|
-
writeRedactionMode(params) {
|
|
11
|
-
return ('writeRedactionMode' in params)
|
|
12
|
-
? params.writeRedactionMode
|
|
13
|
-
: undefined;
|
|
14
|
-
},
|
|
15
|
-
geoLocation(params) {
|
|
16
|
-
return ('geoLocation' in params)
|
|
17
|
-
? getGeoLocation(params)
|
|
18
|
-
: undefined;
|
|
19
|
-
},
|
|
20
|
-
additionalClientOptions(params) {
|
|
21
|
-
let defaultOptions = {
|
|
22
|
-
applicationLayerProtocols: ['http/1.1']
|
|
23
|
-
};
|
|
24
|
-
if ('additionalClientOptions' in params) {
|
|
25
|
-
defaultOptions = {
|
|
26
|
-
...defaultOptions,
|
|
27
|
-
...params.additionalClientOptions
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
return defaultOptions;
|
|
31
|
-
},
|
|
32
|
-
createRequest(secretParams, params) {
|
|
33
|
-
if (!secretParams.cookieStr &&
|
|
34
|
-
!secretParams.authorisationHeader &&
|
|
35
|
-
!secretParams.headers) {
|
|
36
|
-
throw new Error('auth parameters are not set');
|
|
37
|
-
}
|
|
38
|
-
const pubHeaders = params.headers || {};
|
|
39
|
-
const secHeaders = { ...secretParams.headers };
|
|
40
|
-
if (secretParams.cookieStr) {
|
|
41
|
-
secHeaders['Cookie'] = secretParams.cookieStr;
|
|
42
|
-
}
|
|
43
|
-
if (secretParams.authorisationHeader) {
|
|
44
|
-
secHeaders['Authorization'] = secretParams.authorisationHeader;
|
|
45
|
-
}
|
|
46
|
-
const hasUserAgent = Object.keys(pubHeaders)
|
|
47
|
-
.some(k => k.toLowerCase() === 'user-agent') ||
|
|
48
|
-
Object.keys(secHeaders)
|
|
49
|
-
.some(k => k.toLowerCase() === 'user-agent');
|
|
50
|
-
if (!hasUserAgent) {
|
|
51
|
-
//only set user-agent if not set by provider
|
|
52
|
-
pubHeaders['User-Agent'] = config_1.RECLAIM_USER_AGENT;
|
|
53
|
-
}
|
|
54
|
-
const url = new URL(params.url);
|
|
55
|
-
const { pathname } = url;
|
|
56
|
-
const searchParams = params.url.includes('?') ? params.url.split('?')[1] : '';
|
|
57
|
-
utils_3.logger.info({ url: params.url, path: pathname, query: searchParams.toString() });
|
|
58
|
-
const body = params.body instanceof Uint8Array
|
|
59
|
-
? params.body
|
|
60
|
-
: (0, tls_1.strToUint8Array)(params.body || '');
|
|
61
|
-
const contentLength = body.length;
|
|
62
|
-
const reqLine = `${params.method} ${pathname}${(searchParams === null || searchParams === void 0 ? void 0 : searchParams.length) ? '?' + searchParams : ''} HTTP/1.1`;
|
|
63
|
-
const secHeadersList = (0, utils_2.buildHeaders)(secHeaders);
|
|
64
|
-
utils_3.logger.info({ requestLine: reqLine });
|
|
65
|
-
const httpReqHeaderStr = [
|
|
66
|
-
reqLine,
|
|
67
|
-
`Host: ${getHostHeaderString(url)}`,
|
|
68
|
-
`Content-Length: ${contentLength}`,
|
|
69
|
-
'Connection: close',
|
|
70
|
-
//no compression
|
|
71
|
-
'Accept-Encoding: identity',
|
|
72
|
-
...(0, utils_2.buildHeaders)(pubHeaders),
|
|
73
|
-
...secHeadersList,
|
|
74
|
-
'\r\n',
|
|
75
|
-
].join('\r\n');
|
|
76
|
-
const headerStr = (0, tls_1.strToUint8Array)(httpReqHeaderStr);
|
|
77
|
-
const data = (0, tls_1.concatenateUint8Arrays)([headerStr, body]);
|
|
78
|
-
// hide all secret headers
|
|
79
|
-
const secHeadersStr = secHeadersList.join('\r\n');
|
|
80
|
-
const tokenStartIndex = (0, utils_3.findIndexInUint8Array)(data, (0, tls_1.strToUint8Array)(secHeadersStr));
|
|
81
|
-
const redactions = [
|
|
82
|
-
{
|
|
83
|
-
fromIndex: tokenStartIndex,
|
|
84
|
-
toIndex: tokenStartIndex + secHeadersStr.length,
|
|
85
|
-
}
|
|
86
|
-
];
|
|
87
|
-
return {
|
|
88
|
-
data,
|
|
89
|
-
redactions: redactions,
|
|
90
|
-
};
|
|
91
|
-
},
|
|
92
|
-
getResponseRedactions() {
|
|
93
|
-
return [];
|
|
94
|
-
},
|
|
95
|
-
assertValidProviderReceipt(receipt, params) {
|
|
96
|
-
var _a;
|
|
97
|
-
const extractedParams = {};
|
|
98
|
-
const req = (0, utils_3.getHttpRequestDataFromTranscript)(receipt);
|
|
99
|
-
if (req.method !== params.method.toLowerCase()) {
|
|
100
|
-
throw new Error(`Invalid method: ${req.method}`);
|
|
101
|
-
}
|
|
102
|
-
const url = new URL(params.url);
|
|
103
|
-
const { protocol, pathname } = url;
|
|
104
|
-
if (protocol !== 'https:') {
|
|
105
|
-
utils_3.logger.error('params URL: %s', params.url);
|
|
106
|
-
throw new Error(`Expected protocol: https, found: ${protocol}`);
|
|
107
|
-
}
|
|
108
|
-
const searchParams = params.url.includes('?') ? params.url.split('?')[1] : '';
|
|
109
|
-
const expectedPath = pathname + ((searchParams === null || searchParams === void 0 ? void 0 : searchParams.length) ? '?' + searchParams : '');
|
|
110
|
-
if (req.url !== expectedPath) {
|
|
111
|
-
utils_3.logger.error('params URL: %s', params.url);
|
|
112
|
-
throw new Error(`Expected path: ${expectedPath}, found: ${req.url}`);
|
|
113
|
-
}
|
|
114
|
-
const expectedHostStr = getHostHeaderString(url);
|
|
115
|
-
if (req.headers.host !== expectedHostStr) {
|
|
116
|
-
throw new Error(`Expected host: ${expectedHostStr}, found: ${req.headers.host}`);
|
|
117
|
-
}
|
|
118
|
-
const connectionHeader = req.headers['connection'];
|
|
119
|
-
if (connectionHeader !== 'close') {
|
|
120
|
-
throw new Error(`Connection header must be "close", got "${connectionHeader}"`);
|
|
121
|
-
}
|
|
122
|
-
const serverBlocks = receipt
|
|
123
|
-
.filter(s => s.sender === 'server')
|
|
124
|
-
.map((r) => r.message)
|
|
125
|
-
.filter(b => !b.every(b => b === utils_3.REDACTION_CHAR_CODE)); // filter out fully redacted blocks
|
|
126
|
-
const response = concatArrays(...serverBlocks);
|
|
127
|
-
const res = (0, utils_2.parseHttpResponse)(response);
|
|
128
|
-
if (((res.statusCode / 100) >> 0) !== 2) {
|
|
129
|
-
throw new Error(`Provider returned ${res.statusCode} ${res.statusMessage} error`);
|
|
130
|
-
}
|
|
131
|
-
const bodyStartIdx = (_a = res.bodyStartIndex) !== null && _a !== void 0 ? _a : 0;
|
|
132
|
-
if (bodyStartIdx < 4) {
|
|
133
|
-
utils_3.logger.error({ response: (0, utils_3.uint8ArrayToBinaryStr)(response) });
|
|
134
|
-
throw new Error('Failed to find response body');
|
|
135
|
-
}
|
|
136
|
-
extractedParams['data'] = utils_1.base64.encode(res.body);
|
|
137
|
-
return { extractedParameters: extractedParams };
|
|
138
|
-
},
|
|
139
|
-
};
|
|
140
|
-
function concatArrays(...bufs) {
|
|
141
|
-
const totalSize = bufs.reduce((acc, e) => acc + e.length, 0);
|
|
142
|
-
const merged = new Uint8Array(totalSize);
|
|
143
|
-
let lenDone = 0;
|
|
144
|
-
for (const array of bufs) {
|
|
145
|
-
merged.set(array, lenDone);
|
|
146
|
-
lenDone += array.length;
|
|
147
|
-
}
|
|
148
|
-
return merged;
|
|
149
|
-
}
|
|
150
|
-
function getHostPort(params) {
|
|
151
|
-
const { host } = new URL(getURL(params));
|
|
152
|
-
if (!host) {
|
|
153
|
-
throw new Error('url is incorrect');
|
|
154
|
-
}
|
|
155
|
-
return host;
|
|
156
|
-
}
|
|
157
|
-
/**
|
|
158
|
-
* Obtain the host header string from the URL.
|
|
159
|
-
* https://stackoverflow.com/a/3364396
|
|
160
|
-
*/
|
|
161
|
-
function getHostHeaderString(url) {
|
|
162
|
-
const host = url.hostname;
|
|
163
|
-
const port = url.port;
|
|
164
|
-
return port && +port !== config_1.DEFAULT_HTTPS_PORT
|
|
165
|
-
? `${host}:${port}`
|
|
166
|
-
: host;
|
|
167
|
-
}
|
|
168
|
-
const paramsRegex = /\{\{([^{}]+)}}/sgi;
|
|
169
|
-
function getGeoLocation(v2Params) {
|
|
170
|
-
if (v2Params === null || v2Params === void 0 ? void 0 : v2Params.geoLocation) {
|
|
171
|
-
const paramNames = new Set();
|
|
172
|
-
let geo = v2Params.geoLocation;
|
|
173
|
-
//extract param names
|
|
174
|
-
let match = null;
|
|
175
|
-
while (match = paramsRegex.exec(geo)) {
|
|
176
|
-
paramNames.add(match[1]);
|
|
177
|
-
}
|
|
178
|
-
for (const pn of paramNames) {
|
|
179
|
-
if (v2Params.paramValues && pn in v2Params.paramValues) {
|
|
180
|
-
geo = geo.replaceAll(`{{${pn}}}`, v2Params.paramValues[pn].toString());
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
183
|
-
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
return geo;
|
|
187
|
-
}
|
|
188
|
-
return undefined;
|
|
189
|
-
}
|
|
190
|
-
function getURL(v2Params) {
|
|
191
|
-
let hostPort = v2Params === null || v2Params === void 0 ? void 0 : v2Params.url;
|
|
192
|
-
const paramNames = new Set();
|
|
193
|
-
//extract param names
|
|
194
|
-
let match = null;
|
|
195
|
-
while (match = paramsRegex.exec(hostPort)) {
|
|
196
|
-
paramNames.add(match[1]);
|
|
197
|
-
}
|
|
198
|
-
for (const pn of paramNames) {
|
|
199
|
-
if (v2Params.paramValues && pn in v2Params.paramValues) {
|
|
200
|
-
hostPort = hostPort.replaceAll(`{{${pn}}}`, v2Params.paramValues[pn].toString());
|
|
201
|
-
}
|
|
202
|
-
else {
|
|
203
|
-
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
return hostPort;
|
|
207
|
-
}
|
|
208
|
-
exports.default = HTTP_BASE64_PROVIDER;
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/httpb64/index.ts"],"names":[],"mappings":"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"}
|