@reclaimprotocol/attestor-core 3.1.0 → 4.0.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/lib/avs/contracts/index.js +18 -8
- package/lib/avs/utils/tasks.d.ts +1 -1
- package/lib/client/create-claim.d.ts +2 -2
- package/lib/client/create-claim.js +89 -33
- package/lib/client/utils/client-socket.d.ts +3 -1
- package/lib/client/utils/client-socket.js +25 -8
- package/lib/config/index.d.ts +4 -0
- package/lib/config/index.js +8 -3
- package/lib/index.js +18 -8
- package/lib/proto/api.d.ts +80 -2
- package/lib/proto/api.js +853 -101
- package/lib/providers/http/index.js +221 -128
- package/lib/providers/http/utils.d.ts +3 -6
- package/lib/providers/http/utils.js +13 -11
- package/lib/providers/index.js +1 -3
- package/lib/scripts/generate-receipt.js +6 -3
- package/lib/scripts/generate-toprf-keys.d.ts +1 -0
- package/lib/scripts/generate-toprf-keys.js +23 -0
- package/lib/server/create-server.js +14 -7
- package/lib/server/handlers/claimTunnel.js +33 -10
- package/lib/server/handlers/createTunnel.js +44 -8
- package/lib/server/handlers/disconnectTunnel.js +2 -2
- package/lib/server/handlers/index.js +4 -2
- package/lib/server/handlers/init.js +17 -2
- package/lib/server/handlers/toprf.d.ts +2 -0
- package/lib/server/handlers/toprf.js +21 -0
- package/lib/server/socket.d.ts +5 -3
- package/lib/server/socket.js +25 -5
- package/lib/server/tunnels/make-tcp-tunnel.js +10 -24
- package/lib/server/utils/apm.js +1 -1
- package/lib/server/utils/assert-valid-claim-request.d.ts +2 -2
- package/lib/server/utils/assert-valid-claim-request.js +17 -9
- package/lib/server/utils/dns.d.ts +1 -0
- package/lib/server/utils/dns.js +22 -0
- package/lib/server/utils/generics.d.ts +1 -1
- package/lib/tests/describe-with-server.d.ts +0 -2
- package/lib/tests/describe-with-server.js +1 -4
- package/lib/tests/mock-provider-server.d.ts +1 -1
- package/lib/tests/test.auth.d.ts +1 -0
- package/lib/tests/test.auth.js +75 -0
- package/lib/tests/test.bgp-listener.d.ts +1 -0
- package/lib/tests/test.bgp-listener.js +169 -0
- package/lib/tests/test.claim-creation.js +100 -7
- package/lib/tests/test.http-parser.d.ts +1 -1
- package/lib/tests/test.http-parser.js +7 -5
- package/lib/tests/test.http-provider-utils.js +155 -30
- package/lib/tests/test.http-provider.js +50 -7
- package/lib/tests/test.zk.js +54 -4
- package/lib/tests/utils.d.ts +6 -0
- package/lib/tests/utils.js +16 -1
- package/lib/types/bgp.d.ts +11 -0
- package/lib/types/bgp.js +3 -0
- package/lib/types/claims.d.ts +14 -5
- package/lib/types/client.d.ts +30 -3
- package/lib/types/general.d.ts +12 -0
- package/lib/types/handlers.d.ts +4 -4
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js +2 -1
- package/lib/types/providers.d.ts +9 -9
- package/lib/types/providers.gen.d.ts +12 -152
- package/lib/types/providers.gen.js +2 -6
- package/lib/types/zk.d.ts +11 -2
- package/lib/utils/auth.d.ts +7 -0
- package/lib/utils/auth.js +64 -0
- package/lib/utils/b64-json.d.ts +2 -0
- package/lib/utils/b64-json.js +23 -0
- package/lib/utils/bgp-listener.d.ts +7 -0
- package/lib/utils/bgp-listener.js +126 -0
- package/lib/utils/claims.js +3 -3
- package/lib/utils/generics.d.ts +5 -5
- package/lib/utils/generics.js +3 -3
- package/lib/utils/index.d.ts +2 -0
- package/lib/utils/index.js +3 -1
- package/lib/utils/redactions.d.ts +19 -6
- package/lib/utils/redactions.js +41 -4
- package/lib/utils/socket-base.d.ts +3 -2
- package/lib/utils/socket-base.js +7 -2
- package/lib/utils/ws.d.ts +5 -5
- package/lib/utils/ws.js +27 -10
- package/lib/utils/zk.d.ts +12 -7
- package/lib/utils/zk.js +197 -42
- package/lib/window-rpc/setup-window-rpc.js +29 -8
- package/lib/window-rpc/types.d.ts +16 -21
- package/lib/window-rpc/utils.d.ts +2 -1
- package/lib/window-rpc/utils.js +27 -1
- package/lib/window-rpc/window-rpc-zk.d.ts +8 -3
- package/lib/window-rpc/window-rpc-zk.js +58 -45
- package/package.json +24 -22
|
@@ -3,16 +3,12 @@
|
|
|
3
3
|
/* Generated file. Do not edit */
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.PROVIDER_SCHEMAS = exports.HttpProviderSecretParametersJson = exports.HttpProviderParametersJson = void 0;
|
|
6
|
-
exports.HttpProviderParametersJson = { "title": "HttpProviderParameters", "type": "object", "required": ["url", "method", "responseMatches"], "properties": { "url": { "type": "string", "format": "url", "description": "which URL does the request have to be made to Has to be a valid https URL for eg. https://amazon.in/orders?q=abcd" }, "method": { "type": "string", "enum": ["GET", "POST", "PUT", "PATCH"] }, "geoLocation": { "type": "string", "nullable": true, "pattern": "^[A-Za-z]{0,2}$", "description": "Specify the geographical location from where to proxy the request. 2-letter ISO country code" }, "headers": { "type": "object", "description": "Any additional headers to be sent with the request Note: these will be revealed to the attestor & won't be redacted from the transcript. To add hidden headers, use 'secretParams.headers' instead", "additionalProperties": { "type": "string" } }, "body": { "description": "Body of the HTTP request", "oneOf": [{ "type": "string", "format": "binary" }, { "type": "string" }] }, "writeRedactionMode": { "type": "string", "description": "If the API doesn't perform well with the \"key-update\" method of redaction, you can switch to \"zk\" mode by setting this to \"zk\"", "enum": ["zk", "key-update"] }, "additionalClientOptions": { "type": "object", "description": "Apply TLS configuration when creating the tunnel to the attestor.", "nullable": true, "properties": { "supportedProtocolVersions": { "type": "array", "minItems": 1, "uniqueItems": true, "items": { "type": "string", "enum": ["TLS1_2", "TLS1_3"] } } } }, "responseMatches": { "type": "array", "minItems": 1, "uniqueItems": true, "description": "The attestor will use this list to check that the redacted response does indeed match all the provided strings/regexes", "items": { "type": "object", "required": ["value", "type"], "properties": { "value": { "type": "string", "description": "\"regex\": the response must match the regex \"contains\": the response must contain the provided\n string exactly" }, "type": { "type": "string", "description": "The string/regex to match against", "enum": ["regex", "contains"] }, "invert": { "type": "boolean", "description": "Inverses the matching logic. Fail when match is found and proceed otherwise" } }, "additionalProperties": false } }, "responseRedactions": { "type": "array", "uniqueItems": true, "description": "which portions to select from a response. These are selected in order, xpath => jsonPath => regex * These redactions are done client side and only the selected portions are sent to the attestor. The attestor will only be able to see the selected portions alongside the first line of the HTTP response (i.e. \"HTTP/1.1 200 OK\") * To disable any redactions, pass an empty array", "items": { "type": "object", "properties": { "xPath": { "type": "string", "nullable": true, "description": "expect an HTML response, and to contain a certain xpath for eg. \"/html/body/div.a1/div.a2/span.a5\"" }, "jsonPath": { "type": "string", "nullable": true, "description": "expect a JSON response, retrieve the item at this path using dot notation for e.g. 'email.addresses.0'" }, "regex": { "type": "string", "nullable": true, "description": "select a regex match from the response" } }, "additionalProperties": false } }, "paramValues": { "type": "object", "description": "A map of parameter values which are user in form of {{param}} in URL, responseMatches, responseRedactions, body, geolocation. Those in URL, responseMatches & geo will be put into context and signed This value will NOT be included in provider hash", "additionalProperties": { "type": "string" } } }, "additionalProperties": false };
|
|
6
|
+
exports.HttpProviderParametersJson = { "title": "HttpProviderParameters", "type": "object", "required": ["url", "method", "responseMatches"], "properties": { "url": { "type": "string", "format": "url", "description": "which URL does the request have to be made to Has to be a valid https URL for eg. https://amazon.in/orders?q=abcd" }, "method": { "type": "string", "enum": ["GET", "POST", "PUT", "PATCH"] }, "geoLocation": { "type": "string", "nullable": true, "pattern": "^[A-Za-z]{0,2}$", "description": "Specify the geographical location from where to proxy the request. 2-letter ISO country code" }, "headers": { "type": "object", "description": "Any additional headers to be sent with the request Note: these will be revealed to the attestor & won't be redacted from the transcript. To add hidden headers, use 'secretParams.headers' instead", "additionalProperties": { "type": "string" } }, "body": { "description": "Body of the HTTP request", "oneOf": [{ "type": "string", "format": "binary" }, { "type": "string" }] }, "writeRedactionMode": { "type": "string", "description": "If the API doesn't perform well with the \"key-update\" method of redaction, you can switch to \"zk\" mode by setting this to \"zk\"", "enum": ["zk", "key-update"] }, "additionalClientOptions": { "type": "object", "description": "Apply TLS configuration when creating the tunnel to the attestor.", "nullable": true, "properties": { "supportedProtocolVersions": { "type": "array", "minItems": 1, "uniqueItems": true, "items": { "type": "string", "enum": ["TLS1_2", "TLS1_3"] } } } }, "responseMatches": { "type": "array", "minItems": 1, "uniqueItems": true, "description": "The attestor will use this list to check that the redacted response does indeed match all the provided strings/regexes", "items": { "type": "object", "required": ["value", "type"], "properties": { "value": { "type": "string", "description": "\"regex\": the response must match the regex \"contains\": the response must contain the provided\n string exactly" }, "type": { "type": "string", "description": "The string/regex to match against", "enum": ["regex", "contains"] }, "invert": { "type": "boolean", "description": "Inverses the matching logic. Fail when match is found and proceed otherwise" } }, "additionalProperties": false } }, "responseRedactions": { "type": "array", "uniqueItems": true, "description": "which portions to select from a response. These are selected in order, xpath => jsonPath => regex * These redactions are done client side and only the selected portions are sent to the attestor. The attestor will only be able to see the selected portions alongside the first line of the HTTP response (i.e. \"HTTP/1.1 200 OK\") * To disable any redactions, pass an empty array", "items": { "type": "object", "properties": { "xPath": { "type": "string", "nullable": true, "description": "expect an HTML response, and to contain a certain xpath for eg. \"/html/body/div.a1/div.a2/span.a5\"" }, "jsonPath": { "type": "string", "nullable": true, "description": "expect a JSON response, retrieve the item at this path using dot notation for e.g. 'email.addresses.0'" }, "regex": { "type": "string", "nullable": true, "description": "select a regex match from the response" }, "hash": { "type": "string", "description": "If provided, the value inside will be hashed instead of being redacted. Useful for cases where the data inside is an identifiying piece of information that you don't want to reveal to the attestor, eg. an email address.\nIf the hash function produces more bytes than the original value, the hash will be truncated.\nEg. if hash is enabled, the original value is \"hello\", and hashed is \"a1b2c\", then the attestor will only see \"a1b2c\".", "enum": ["oprf"] } }, "additionalProperties": false } }, "paramValues": { "type": "object", "description": "A map of parameter values which are user in form of {{param}} in URL, responseMatches, responseRedactions, body, geolocation. Those in URL, responseMatches & geo will be put into context and signed This value will NOT be included in provider hash", "additionalProperties": { "type": "string" } } }, "additionalProperties": false };
|
|
7
7
|
exports.HttpProviderSecretParametersJson = { "title": "HttpProviderSecretParameters", "type": "object", "description": "Secret parameters to be used with HTTP provider. None of the values in this object will be shown to the attestor", "properties": { "cookieStr": { "type": "string", "description": "cookie string for authorisation." }, "authorisationHeader": { "type": "string", "description": "authorisation header value" }, "headers": { "type": "object", "description": "Headers that need to be hidden from the attestor", "additionalProperties": { "type": "string" } }, "paramValues": { "type": "object", "description": "A map of parameter values which are user in form of {{param}} in body these parameters will NOT be shown to attestor and extracted", "additionalProperties": { "type": "string" } } }, "additionalProperties": false };
|
|
8
8
|
exports.PROVIDER_SCHEMAS = {
|
|
9
9
|
http: {
|
|
10
10
|
parameters: exports.HttpProviderParametersJson,
|
|
11
11
|
secretParameters: exports.HttpProviderSecretParametersJson
|
|
12
12
|
},
|
|
13
|
-
httpb64: {
|
|
14
|
-
parameters: exports.HttpProviderParametersJson,
|
|
15
|
-
secretParameters: exports.HttpProviderSecretParametersJson
|
|
16
|
-
},
|
|
17
13
|
};
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXJzLmdlbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9wcm92aWRlcnMuZ2VuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxvQkFBb0I7QUFDcEIsaUNBQWlDOzs7QUF3RnBCLFFBQUEsMEJBQTBCLEdBQUcsRUFBQyxPQUFPLEVBQUMsd0JBQXdCLEVBQUMsTUFBTSxFQUFDLFFBQVEsRUFBQyxVQUFVLEVBQUMsQ0FBQyxLQUFLLEVBQUMsUUFBUSxFQUFDLGlCQUFpQixDQUFDLEVBQUMsWUFBWSxFQUFDLEVBQUMsS0FBSyxFQUFDLEVBQUMsTUFBTSxFQUFDLFFBQVEsRUFBQyxRQUFRLEVBQUMsS0FBSyxFQUFDLGFBQWEsRUFBQyxtSEFBbUgsRUFBQyxFQUFDLFFBQVEsRUFBQyxFQUFDLE1BQU0sRUFBQyxRQUFRLEVBQUMsTUFBTSxFQUFDLENBQUMsS0FBSyxFQUFDLE1BQU0sRUFBQyxLQUFLLEVBQUMsT0FBTyxDQUFDLEVBQUMsRUFBQyxhQUFhLEVBQUMsRUFBQyxNQUFNLEVBQUMsUUFBUSxFQUFDLFVBQVUsRUFBQyxJQUFJLEVBQUMsU0FBUyxFQUFDLGlCQUFpQixFQUFDLGFBQWEsRUFBQyw4RkFBOEYsRUFBQyxFQUFDLFNBQVMsRUFBQyxFQUFDLE1BQU0sRUFBQyxRQUFRLEVBQUMsYUFBYSxFQUFDLG9NQUFvTSxFQUFDLHNCQUFzQixFQUFDLEVBQUMsTUFBTSxFQUFDLFFBQVEsRUFBQyxFQUFDLEVBQUMsTUFBTSxFQUFDLEVBQUMsYUFBYSxFQUFDLDBCQUEwQixFQUFDLE9BQU8sRUFBQyxDQUFDLEVBQUMsTUFBTSxFQUFDLFFBQVEsRUFBQyxRQUFRLEVBQUMsUUFBUSxFQUFDLEVBQUMsRUFBQyxNQUFNLEVBQUMsUUFBUSxFQUFDLENBQUMsRUFBQyxFQUFDLG9CQUFvQixFQUFDLEVBQUMsTUFBTSxFQUFDLFFBQVEsRUFBQyxhQUFhLEVBQUMsc0lBQXNJLEVBQUMsTUFBTSxFQUFDLENBQUMsSUFB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
|
package/lib/types/zk.d.ts
CHANGED
|
@@ -1,15 +1,24 @@
|
|
|
1
|
-
import { EncryptionAlgorithm, ZKEngine, ZKOperator } from '@reclaimprotocol/zk-symmetric-crypto';
|
|
1
|
+
import { EncryptionAlgorithm, OPRFOperator, ZKEngine, ZKOperator } from '@reclaimprotocol/zk-symmetric-crypto';
|
|
2
|
+
import { TOPRFPayload } from '../proto/api';
|
|
2
3
|
export type ZKOperators = {
|
|
3
4
|
[E in EncryptionAlgorithm]?: ZKOperator;
|
|
4
5
|
};
|
|
6
|
+
export type OPRFOperators = {
|
|
7
|
+
[E in EncryptionAlgorithm]?: OPRFOperator;
|
|
8
|
+
};
|
|
5
9
|
export type PrepareZKProofsBaseOpts = {
|
|
6
10
|
/** get ZK operator for specified algorithm */
|
|
7
11
|
zkOperators?: ZKOperators;
|
|
12
|
+
oprfOperators?: OPRFOperators;
|
|
8
13
|
/**
|
|
9
14
|
* max number of ZK proofs to generate concurrently
|
|
10
|
-
* @default
|
|
15
|
+
* @default 10
|
|
11
16
|
*/
|
|
12
17
|
zkProofConcurrency?: number;
|
|
13
18
|
maxZkChunks?: number;
|
|
14
19
|
zkEngine?: ZKEngine;
|
|
15
20
|
};
|
|
21
|
+
export type TOPRFProofParams = TOPRFPayload & {
|
|
22
|
+
mask: Uint8Array;
|
|
23
|
+
plaintext: Uint8Array;
|
|
24
|
+
};
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AuthenticatedUserData, AuthenticationRequest, ServiceSignatureType } from '../proto/api';
|
|
2
|
+
export declare function assertValidAuthRequest(request: AuthenticationRequest | undefined, signatureType: ServiceSignatureType): Promise<void>;
|
|
3
|
+
/**
|
|
4
|
+
* Create an authentication request with the given data and private key,
|
|
5
|
+
* which can then be used to authenticate with the service.
|
|
6
|
+
*/
|
|
7
|
+
export declare function createAuthRequest(_data: Partial<AuthenticatedUserData>, privateKey: string): Promise<AuthenticationRequest>;
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.assertValidAuthRequest = assertValidAuthRequest;
|
|
4
|
+
exports.createAuthRequest = createAuthRequest;
|
|
5
|
+
const ethers_1 = require("ethers");
|
|
6
|
+
const config_1 = require("../config");
|
|
7
|
+
const api_1 = require("../proto/api");
|
|
8
|
+
const env_1 = require("../utils/env");
|
|
9
|
+
const error_1 = require("../utils/error");
|
|
10
|
+
const generics_1 = require("../utils/generics");
|
|
11
|
+
const signatures_1 = require("../utils/signatures");
|
|
12
|
+
async function assertValidAuthRequest(request, signatureType) {
|
|
13
|
+
const publicKey = (0, env_1.getEnvVariable)('AUTHENTICATION_PUBLIC_KEY');
|
|
14
|
+
// nothing to verify
|
|
15
|
+
if (!request) {
|
|
16
|
+
// if pub key is provided -- but user didn't attempt to
|
|
17
|
+
// authenticate, then we should throw an error
|
|
18
|
+
if (publicKey) {
|
|
19
|
+
throw new error_1.AttestorError('ERROR_AUTHENTICATION_FAILED', 'User must be authenticated');
|
|
20
|
+
}
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
if (!publicKey) {
|
|
24
|
+
throw new error_1.AttestorError('ERROR_BAD_REQUEST', 'The attestor is not configured for authentication');
|
|
25
|
+
}
|
|
26
|
+
const { signature, data } = request;
|
|
27
|
+
if (!data) {
|
|
28
|
+
throw new error_1.AttestorError('ERROR_AUTHENTICATION_FAILED', 'Missing data in auth request');
|
|
29
|
+
}
|
|
30
|
+
if (data.expiresAt < (0, generics_1.unixTimestampSeconds)()) {
|
|
31
|
+
throw new error_1.AttestorError('ERROR_AUTHENTICATION_FAILED', 'Authentication request has expired');
|
|
32
|
+
}
|
|
33
|
+
const proto = api_1.AuthenticatedUserData.encode(data).finish();
|
|
34
|
+
const signatureAlg = signatures_1.SIGNATURES[signatureType];
|
|
35
|
+
const address = signatureAlg.getAddress(await ethers_1.ethers.utils.arrayify(publicKey));
|
|
36
|
+
const verified = await signatureAlg
|
|
37
|
+
.verify(proto, signature, address);
|
|
38
|
+
if (!verified) {
|
|
39
|
+
throw new error_1.AttestorError('ERROR_AUTHENTICATION_FAILED', 'Signature verification failed');
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Create an authentication request with the given data and private key,
|
|
44
|
+
* which can then be used to authenticate with the service.
|
|
45
|
+
*/
|
|
46
|
+
async function createAuthRequest(_data, privateKey) {
|
|
47
|
+
const createdAt = (0, generics_1.unixTimestampSeconds)();
|
|
48
|
+
const data = {
|
|
49
|
+
createdAt,
|
|
50
|
+
expiresAt: createdAt + config_1.DEFAULT_AUTH_EXPIRY_S,
|
|
51
|
+
id: '',
|
|
52
|
+
hostWhitelist: [],
|
|
53
|
+
..._data,
|
|
54
|
+
};
|
|
55
|
+
const proto = api_1.AuthenticatedUserData.encode(data).finish();
|
|
56
|
+
const signature = await signatures_1.SelectedServiceSignature
|
|
57
|
+
.sign(proto, privateKey);
|
|
58
|
+
const request = {
|
|
59
|
+
data,
|
|
60
|
+
signature
|
|
61
|
+
};
|
|
62
|
+
return request;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hdXRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBUUEsd0RBc0RDO0FBTUQsOENBcUJDO0FBekZELG1DQUErQjtBQUMvQix1Q0FBa0Q7QUFDbEQsdUNBQWtHO0FBQ2xHLHVDQUE4QztBQUM5QywyQ0FBK0M7QUFDL0MsaURBQXlEO0FBQ3pELHFEQUEyRTtBQUVwRSxLQUFLLFVBQVUsc0JBQXNCLENBQzNDLE9BQTBDLEVBQzFDLGFBQW1DO0lBRW5DLE1BQU0sU0FBUyxHQUFHLElBQUEsb0JBQWMsRUFBQywyQkFBMkIsQ0FBQyxDQUFBO0lBQzdELG9CQUFvQjtJQUNwQixJQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYix1REFBdUQ7UUFDdkQsOENBQThDO1FBQzlDLElBQUcsU0FBUyxFQUFFLENBQUM7WUFDZCxNQUFNLElBQUkscUJBQWEsQ0FDdEIsNkJBQTZCLEVBQzdCLDRCQUE0QixDQUM1QixDQUFBO1FBQ0YsQ0FBQztRQUVELE9BQU07SUFDUCxDQUFDO0lBRUQsSUFBRyxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLHFCQUFhLENBQ3RCLG1CQUFtQixFQUNuQixtREFBbUQsQ0FDbkQsQ0FBQTtJQUNGLENBQUM7SUFFRCxNQUFNLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxHQUFHLE9BQU8sQ0FBQTtJQUNuQyxJQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDVixNQUFNLElBQUkscUJBQWEsQ0FDdEIsNkJBQTZCLEVBQzdCLDhCQUE4QixDQUM5QixDQUFBO0lBQ0YsQ0FBQztJQUVELElBQUcsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFBLCtCQUFvQixHQUFFLEVBQUUsQ0FBQztRQUM1QyxNQUFNLElBQUkscUJBQWEsQ0FDdEIsNkJBQTZCLEVBQzdCLG9DQUFvQyxDQUNwQyxDQUFBO0lBQ0YsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLDJCQUFxQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUN6RCxNQUFNLFlBQVksR0FBRyx1QkFBVSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzlDLE1BQU0sT0FBTyxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQ3RDLE1BQU0sZUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQ3RDLENBQUE7SUFDRCxNQUFNLFFBQVEsR0FBRyxNQUFNLFlBQVk7U0FDakMsTUFBTSxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDbkMsSUFBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2QsTUFBTSxJQUFJLHFCQUFhLENBQ3RCLDZCQUE2QixFQUM3QiwrQkFBK0IsQ0FDL0IsQ0FBQTtJQUNGLENBQUM7QUFDRixDQUFDO0FBRUQ7OztHQUdHO0FBQ0ksS0FBSyxVQUFVLGlCQUFpQixDQUN0QyxLQUFxQyxFQUNyQyxVQUFrQjtJQUVsQixNQUFNLFNBQVMsR0FBRyxJQUFBLCtCQUFvQixHQUFFLENBQUE7SUFDeEMsTUFBTSxJQUFJLEdBQTBCO1FBQ25DLFNBQVM7UUFDVCxTQUFTLEVBQUUsU0FBUyxHQUFHLDhCQUFxQjtRQUM1QyxFQUFFLEVBQUUsRUFBRTtRQUNOLGFBQWEsRUFBRSxFQUFFO1FBQ2pCLEdBQUcsS0FBSztLQUNSLENBQUE7SUFDRCxNQUFNLEtBQUssR0FBRywyQkFBcUIsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDekQsTUFBTSxTQUFTLEdBQUcsTUFBTSxxQ0FBd0I7U0FDOUMsSUFBSSxDQUFDLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUN6QixNQUFNLE9BQU8sR0FBMEI7UUFDdEMsSUFBSTtRQUNKLFNBQVM7S0FDVCxDQUFBO0lBRUQsT0FBTyxPQUFPLENBQUE7QUFDZixDQUFDIn0=
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.B64_JSON_REVIVER = exports.B64_JSON_REPLACER = void 0;
|
|
4
|
+
const utils_1 = require("ethers/lib/utils");
|
|
5
|
+
const B64_JSON_REPLACER = (key, value) => {
|
|
6
|
+
if (value instanceof Uint8Array
|
|
7
|
+
|| (typeof value === 'object'
|
|
8
|
+
&& value
|
|
9
|
+
&& 'buffer' in value
|
|
10
|
+
&& value.buffer instanceof ArrayBuffer)) {
|
|
11
|
+
return { type: 'uint8array', value: utils_1.base64.encode(value) };
|
|
12
|
+
}
|
|
13
|
+
return value;
|
|
14
|
+
};
|
|
15
|
+
exports.B64_JSON_REPLACER = B64_JSON_REPLACER;
|
|
16
|
+
const B64_JSON_REVIVER = (key, value) => {
|
|
17
|
+
if ((value === null || value === void 0 ? void 0 : value.type) === 'uint8array') {
|
|
18
|
+
return utils_1.base64.decode(value.value);
|
|
19
|
+
}
|
|
20
|
+
return value;
|
|
21
|
+
};
|
|
22
|
+
exports.B64_JSON_REVIVER = B64_JSON_REVIVER;
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYjY0LWpzb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvYjY0LWpzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNENBQXlDO0FBRWxDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBVSxFQUFFLEVBQUU7SUFDNUQsSUFDQyxLQUFLLFlBQVksVUFBVTtXQUN4QixDQUNGLE9BQU8sS0FBSyxLQUFLLFFBQVE7ZUFDdEIsS0FBSztlQUNMLFFBQVEsSUFBSSxLQUFLO2VBQ2pCLEtBQUssQ0FBQyxNQUFNLFlBQVksV0FBVyxDQUN0QyxFQUNBLENBQUM7UUFDRixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsY0FBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFBO0lBQzNELENBQUM7SUFFRCxPQUFPLEtBQUssQ0FBQTtBQUNiLENBQUMsQ0FBQTtBQWRZLFFBQUEsaUJBQWlCLHFCQWM3QjtBQUVNLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBVSxFQUFFLEVBQUU7SUFDM0QsSUFBRyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxJQUFJLE1BQUssWUFBWSxFQUFFLENBQUM7UUFDakMsT0FBTyxjQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUE7QUFDYixDQUFDLENBQUE7QUFOWSxRQUFBLGdCQUFnQixvQkFNNUIifQ==
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { Logger } from 'pino';
|
|
2
|
+
import { BGPListener } from '../types';
|
|
3
|
+
/**
|
|
4
|
+
* Listens for BGP announcements and emits events whenever
|
|
5
|
+
* an announcement overlaps with a target IP.
|
|
6
|
+
*/
|
|
7
|
+
export declare function createBgpListener(logger: Logger): BGPListener;
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.createBgpListener = createBgpListener;
|
|
7
|
+
const ip_cidr_1 = __importDefault(require("ip-cidr"));
|
|
8
|
+
const config_1 = require("../config");
|
|
9
|
+
const ws_1 = require("../utils/ws");
|
|
10
|
+
const ANNOUNCEMENT_OVERLAP = 'announcement-overlap';
|
|
11
|
+
class BGPAnnouncementOverlapEvent extends Event {
|
|
12
|
+
constructor(data) {
|
|
13
|
+
super(ANNOUNCEMENT_OVERLAP);
|
|
14
|
+
this.data = data;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Listens for BGP announcements and emits events whenever
|
|
19
|
+
* an announcement overlaps with a target IP.
|
|
20
|
+
*/
|
|
21
|
+
function createBgpListener(logger) {
|
|
22
|
+
let ws;
|
|
23
|
+
let closed = false;
|
|
24
|
+
const targetIps = new Set();
|
|
25
|
+
const eventTarget = new EventTarget();
|
|
26
|
+
openWs();
|
|
27
|
+
return {
|
|
28
|
+
onOverlap(ips, callback) {
|
|
29
|
+
for (const ip of ips) {
|
|
30
|
+
targetIps.add(ip);
|
|
31
|
+
}
|
|
32
|
+
eventTarget.addEventListener(ANNOUNCEMENT_OVERLAP, _callback);
|
|
33
|
+
return () => {
|
|
34
|
+
for (const ip of ips) {
|
|
35
|
+
targetIps.delete(ip);
|
|
36
|
+
}
|
|
37
|
+
eventTarget.removeEventListener(ANNOUNCEMENT_OVERLAP, _callback);
|
|
38
|
+
};
|
|
39
|
+
function _callback(event) {
|
|
40
|
+
callback(event.data);
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
close() {
|
|
44
|
+
ws.onclose = null;
|
|
45
|
+
ws.onerror = null;
|
|
46
|
+
ws.close();
|
|
47
|
+
closed = true;
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
function openWs() {
|
|
51
|
+
logger.debug('connecting to BGP websocket');
|
|
52
|
+
ws = (0, ws_1.makeWebSocket)(config_1.BGP_WS_URL);
|
|
53
|
+
ws.onopen = onOpen;
|
|
54
|
+
ws.onerror = (err) => onClose(err);
|
|
55
|
+
ws.onclose = () => onClose(new Error('Unexpected close'));
|
|
56
|
+
ws.onmessage = ({ data }) => {
|
|
57
|
+
const str = typeof data === 'string' ? data : data.toString();
|
|
58
|
+
try {
|
|
59
|
+
onMessage(str);
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
logger.error({ data, err }, 'error processing BGP message');
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
function onOpen() {
|
|
67
|
+
const subscriptionMessage = {
|
|
68
|
+
type: 'ris_subscribe',
|
|
69
|
+
data: {
|
|
70
|
+
type: 'UPDATE',
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
ws.send(JSON.stringify(subscriptionMessage));
|
|
74
|
+
logger.info('connected to BGP websocket');
|
|
75
|
+
}
|
|
76
|
+
function onClose(err) {
|
|
77
|
+
if (closed) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
logger.info({ err }, 'BGP websocket closed');
|
|
81
|
+
if (!err) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
logger.info('reconnecting to BGP websocket');
|
|
85
|
+
openWs();
|
|
86
|
+
}
|
|
87
|
+
function onMessage(message) {
|
|
88
|
+
var _a, _b;
|
|
89
|
+
const data = JSON.parse(message);
|
|
90
|
+
const announcements = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.announcements;
|
|
91
|
+
logger.trace({ data }, 'got BGP update');
|
|
92
|
+
if (!Array.isArray(announcements)) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const asPath = (_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.path;
|
|
96
|
+
for (const announcement of announcements) {
|
|
97
|
+
const prefixes = announcement === null || announcement === void 0 ? void 0 : announcement.prefixes;
|
|
98
|
+
const nextHop = announcement === null || announcement === void 0 ? void 0 : announcement['next_hop'];
|
|
99
|
+
const hasPrefixes = (prefixes === null || prefixes === void 0 ? void 0 : prefixes.length) && (nextHop || asPath);
|
|
100
|
+
if (!hasPrefixes) {
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
for (const prefix of prefixes) {
|
|
104
|
+
if (!overlapsTargetIps(prefix)) {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
// emit event
|
|
108
|
+
eventTarget.dispatchEvent(new BGPAnnouncementOverlapEvent({ prefix }));
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
function overlapsTargetIps(prefix) {
|
|
113
|
+
// ignore all prefixes that end with /0
|
|
114
|
+
if (prefix.endsWith('/0')) {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
const cidr = new ip_cidr_1.default(prefix);
|
|
118
|
+
for (const ip of targetIps) {
|
|
119
|
+
if (cidr.contains(ip)) {
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmdwLWxpc3RlbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2JncC1saXN0ZW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWtCQSw4Q0F1SUM7QUF6SkQsc0RBQTBCO0FBRTFCLHVDQUF1QztBQUV2QyxxQ0FBNEM7QUFFNUMsTUFBTSxvQkFBb0IsR0FBRyxzQkFBc0IsQ0FBQTtBQUVuRCxNQUFNLDJCQUE0QixTQUFRLEtBQUs7SUFDOUMsWUFBNEIsSUFBZ0M7UUFDM0QsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUE7UUFEQSxTQUFJLEdBQUosSUFBSSxDQUE0QjtJQUU1RCxDQUFDO0NBQ0Q7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixpQkFBaUIsQ0FBQyxNQUFjO0lBQy9DLElBQUksRUFBb0MsQ0FBQTtJQUN4QyxJQUFJLE1BQU0sR0FBRyxLQUFLLENBQUE7SUFFbEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQTtJQUNuQyxNQUFNLFdBQVcsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBO0lBRXJDLE1BQU0sRUFBRSxDQUFBO0lBRVIsT0FBTztRQUNOLFNBQVMsQ0FBQyxHQUFHLEVBQUUsUUFBUTtZQUN0QixLQUFJLE1BQU0sRUFBRSxJQUFJLEdBQUcsRUFBRSxDQUFDO2dCQUNyQixTQUFTLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2xCLENBQUM7WUFFRCxXQUFXLENBQUMsZ0JBQWdCLENBQzNCLG9CQUFvQixFQUNwQixTQUFTLENBQ1QsQ0FBQTtZQUVELE9BQU8sR0FBRyxFQUFFO2dCQUNYLEtBQUksTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQ3JCLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUE7Z0JBQ3JCLENBQUM7Z0JBRUQsV0FBVyxDQUFDLG1CQUFtQixDQUM5QixvQkFBb0IsRUFDcEIsU0FBUyxDQUNULENBQUE7WUFDRixD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
|
package/lib/utils/claims.js
CHANGED
|
@@ -102,11 +102,11 @@ function hashProviderParams(params) {
|
|
|
102
102
|
const filteredParams = {
|
|
103
103
|
url: params.url,
|
|
104
104
|
method: params.method,
|
|
105
|
+
body: params.body,
|
|
105
106
|
responseMatches: params.responseMatches,
|
|
106
|
-
responseRedactions: params.responseRedactions
|
|
107
|
-
geoLocation: params.geoLocation
|
|
107
|
+
responseRedactions: params.responseRedactions
|
|
108
108
|
};
|
|
109
109
|
const serializedParams = canonicalStringify(filteredParams);
|
|
110
110
|
return ethers_1.utils.keccak256((0, tls_1.strToUint8Array)(serializedParams)).toLowerCase();
|
|
111
111
|
}
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhaW1zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NsYWltcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWFBLHdEQWNDO0FBWUQsZ0VBK0NDO0FBT0QsZ0VBaUJDO0FBTUQsZ0RBTUM7QUFFRCxnREFhQztBQXpJRCw4Q0FBc0Q7QUFDdEQsZ0VBQXVDO0FBQ3ZDLG1DQUE4QjtBQUM5Qix1Q0FBNkM7QUFDN0MsdUNBQW1EO0FBRW5ELHFEQUFpRDtBQUVqRDs7OztHQUlHO0FBQ0gsU0FBZ0Isc0JBQXNCLENBQUMsSUFBdUI7SUFDN0QsTUFBTSxVQUFVLEdBQUcsWUFBWSxJQUFJLElBQUk7UUFDdEMsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVO1FBQ2pCLENBQUMsQ0FBQywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNuQyxNQUFNLEtBQUssR0FBRztRQUNiLFVBQVU7UUFDViw0Q0FBNEM7UUFDNUMsOENBQThDO1FBQzlDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFO1FBQ3hCLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFO1FBQzFCLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFO0tBQ3JCLENBQUE7SUFFRCxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7QUFDeEIsQ0FBQztBQUVEOzs7Ozs7Ozs7R0FTRztBQUNJLEtBQUssVUFBVSwwQkFBMEIsQ0FDL0MsRUFDQyxVQUFVLEVBQ1YsR0FBRyxHQUFHLEVBQ3dCLEVBQy9CLFFBQVEsR0FBRyx5QkFBZ0I7SUFFM0IsSUFBRyxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUMxQyxDQUFDO0lBRUQsTUFBTSxFQUNMLGVBQWUsRUFDZixjQUFjLEVBQ2QsZUFBZSxFQUNmLEdBQUcsVUFBVSxDQUFBO0lBRWQsTUFBTSxFQUFFLE1BQU0s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
|
package/lib/utils/generics.d.ts
CHANGED
|
@@ -26,14 +26,14 @@ export declare function getZkAlgorithmForCipherSuite(cipherSuite: CipherSuite):
|
|
|
26
26
|
* @param content content w/o header
|
|
27
27
|
* @param cipherSuite
|
|
28
28
|
*/
|
|
29
|
-
export declare function getPureCiphertext(content: Uint8Array, cipherSuite: CipherSuite): Uint8Array
|
|
29
|
+
export declare function getPureCiphertext(content: Uint8Array, cipherSuite: CipherSuite): Uint8Array<ArrayBufferLike>;
|
|
30
30
|
/**
|
|
31
31
|
* Get the 8 byte IV part that's stored in the record for some cipher suites
|
|
32
32
|
* @param content content w/o header
|
|
33
33
|
* @param cipherSuite
|
|
34
34
|
*/
|
|
35
|
-
export declare function getRecordIV(content: Uint8Array, cipherSuite: CipherSuite): Uint8Array
|
|
36
|
-
export declare function getProviderValue<P, T>(params: P, fn: ProviderField<P, T
|
|
35
|
+
export declare function getRecordIV(content: Uint8Array, cipherSuite: CipherSuite): Uint8Array<ArrayBuffer>;
|
|
36
|
+
export declare function getProviderValue<P, S, T>(params: P, fn: ProviderField<P, S, T>, secretParams?: S): T;
|
|
37
37
|
export declare function generateRpcMessageId(): number;
|
|
38
38
|
/**
|
|
39
39
|
* Random session ID for a WebSocket client.
|
|
@@ -89,7 +89,7 @@ export declare function getRpcRequest(msg: RPCMessage): {
|
|
|
89
89
|
* and returns them. Removes the "contentType" suffix from the message.
|
|
90
90
|
* in TLS 1.3
|
|
91
91
|
*/
|
|
92
|
-
export declare function extractApplicationDataFromTranscript({ transcript, tlsVersion }: IDecryptedTranscript): Transcript<Uint8Array
|
|
92
|
+
export declare function extractApplicationDataFromTranscript({ transcript, tlsVersion }: IDecryptedTranscript): Transcript<Uint8Array<ArrayBufferLike>>;
|
|
93
93
|
export type HandshakeTranscript<T> = {
|
|
94
94
|
sender: 'client' | 'server';
|
|
95
95
|
index: number;
|
|
@@ -98,7 +98,7 @@ export type HandshakeTranscript<T> = {
|
|
|
98
98
|
export declare function extractHandshakeFromTranscript({ transcript, tlsVersion }: {
|
|
99
99
|
transcript: IDecryptedTranscriptMessage[];
|
|
100
100
|
tlsVersion: TLSProtocolVersion;
|
|
101
|
-
}): HandshakeTranscript<Uint8Array
|
|
101
|
+
}): HandshakeTranscript<Uint8Array<ArrayBufferLike>>;
|
|
102
102
|
export declare function decryptDirect(directReveal: any, cipherSuite: CipherSuite, recordHeader: Uint8Array, serverTlsVersion: TLSProtocolVersion, content: Uint8Array): Promise<{
|
|
103
103
|
plaintext: Uint8Array;
|
|
104
104
|
iv: Uint8Array;
|
package/lib/utils/generics.js
CHANGED
|
@@ -124,10 +124,10 @@ function getRecordIV(content, cipherSuite) {
|
|
|
124
124
|
const recordIvLength = 12 - fixedIvLength;
|
|
125
125
|
return content.slice(0, recordIvLength);
|
|
126
126
|
}
|
|
127
|
-
function getProviderValue(params, fn) {
|
|
127
|
+
function getProviderValue(params, fn, secretParams) {
|
|
128
128
|
return typeof fn === 'function'
|
|
129
129
|
// @ts-ignore
|
|
130
|
-
? fn(params)
|
|
130
|
+
? fn(params, secretParams)
|
|
131
131
|
: fn;
|
|
132
132
|
}
|
|
133
133
|
function generateRpcMessageId() {
|
|
@@ -345,4 +345,4 @@ function ethersStructToPlainObject(struct) {
|
|
|
345
345
|
}
|
|
346
346
|
return obj;
|
|
347
347
|
}
|
|
348
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../src/utils/generics.ts"],"names":[],"mappings":"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"}
|
|
348
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../src/utils/generics.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/index.d.ts
CHANGED
package/lib/utils/index.js
CHANGED
|
@@ -24,4 +24,6 @@ __exportStar(require("./error"), exports);
|
|
|
24
24
|
__exportStar(require("./prepare-packets"), exports);
|
|
25
25
|
__exportStar(require("./validation"), exports);
|
|
26
26
|
__exportStar(require("./signatures"), exports);
|
|
27
|
-
|
|
27
|
+
__exportStar(require("./auth"), exports);
|
|
28
|
+
__exportStar(require("./b64-json"), exports);
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUEwQjtBQUMxQiwyQ0FBd0I7QUFDeEIsK0NBQTRCO0FBQzVCLGdEQUE2QjtBQUM3Qix1Q0FBb0I7QUFDcEIsMkNBQXdCO0FBQ3hCLDBDQUF1QjtBQUN2QixvREFBaUM7QUFDakMsK0NBQTRCO0FBQzVCLCtDQUE0QjtBQUM1Qix5Q0FBc0I7QUFDdEIsNkNBQTBCIn0=
|
|
@@ -1,6 +1,15 @@
|
|
|
1
|
-
import type { ArraySlice } from '../types';
|
|
1
|
+
import type { ArraySlice, RedactedOrHashedArraySlice, TOPRFProofParams } from '../types';
|
|
2
2
|
export declare const REDACTION_CHAR = "*";
|
|
3
3
|
export declare const REDACTION_CHAR_CODE: number;
|
|
4
|
+
type SliceWithReveal<T> = {
|
|
5
|
+
block: T;
|
|
6
|
+
redactedPlaintext: Uint8Array;
|
|
7
|
+
/**
|
|
8
|
+
* If the block has some TOPRF claims -- they'll be set here
|
|
9
|
+
*/
|
|
10
|
+
toprfs?: TOPRFProofParams[];
|
|
11
|
+
};
|
|
12
|
+
export type RevealedSlices<T> = 'all' | SliceWithReveal<T>[];
|
|
4
13
|
/**
|
|
5
14
|
* Check if a redacted string is congruent with the original string.
|
|
6
15
|
* @param redacted the redacted content, redacted content is replaced by '*'
|
|
@@ -31,11 +40,15 @@ export declare function isFullyRedacted<T extends string | Uint8Array>(redacted:
|
|
|
31
40
|
*/
|
|
32
41
|
export declare function getBlocksToReveal<T extends {
|
|
33
42
|
plaintext: Uint8Array;
|
|
34
|
-
}>(blocks: T[], redact: (total: Uint8Array) =>
|
|
35
|
-
block: T;
|
|
36
|
-
redactedPlaintext: Uint8Array;
|
|
37
|
-
}[] | "all";
|
|
43
|
+
}>(blocks: T[], redact: (total: Uint8Array) => RedactedOrHashedArraySlice[], performOprf: (plaintext: Uint8Array) => Promise<TOPRFProofParams>): Promise<"all" | SliceWithReveal<T>[]>;
|
|
38
44
|
/**
|
|
39
45
|
* Redact the following slices from the total
|
|
40
46
|
*/
|
|
41
|
-
export declare function redactSlices(total: Uint8Array, slices: ArraySlice[]): Uint8Array
|
|
47
|
+
export declare function redactSlices(total: Uint8Array, slices: ArraySlice[]): Uint8Array<ArrayBuffer>;
|
|
48
|
+
/**
|
|
49
|
+
* Converts the binary hash to an ASCII string of the expected length.
|
|
50
|
+
* If the hash is shorter than the expected length, it will be padded with
|
|
51
|
+
* '0' characters. If it's longer, it will be truncated.
|
|
52
|
+
*/
|
|
53
|
+
export declare function binaryHashToStr(hash: Uint8Array, expLength: number): string;
|
|
54
|
+
export {};
|
package/lib/utils/redactions.js
CHANGED
|
@@ -5,6 +5,8 @@ exports.isRedactionCongruent = isRedactionCongruent;
|
|
|
5
5
|
exports.isFullyRedacted = isFullyRedacted;
|
|
6
6
|
exports.getBlocksToReveal = getBlocksToReveal;
|
|
7
7
|
exports.redactSlices = redactSlices;
|
|
8
|
+
exports.binaryHashToStr = binaryHashToStr;
|
|
9
|
+
const wire_1 = require("@bufbuild/protobuf/wire");
|
|
8
10
|
const tls_1 = require("@reclaimprotocol/tls");
|
|
9
11
|
exports.REDACTION_CHAR = '*';
|
|
10
12
|
exports.REDACTION_CHAR_CODE = exports.REDACTION_CHAR.charCodeAt(0);
|
|
@@ -56,7 +58,7 @@ function isFullyRedacted(redacted) {
|
|
|
56
58
|
* @param redact function that returns the redactions
|
|
57
59
|
* @returns blocks to reveal
|
|
58
60
|
*/
|
|
59
|
-
function getBlocksToReveal(blocks, redact) {
|
|
61
|
+
async function getBlocksToReveal(blocks, redact, performOprf) {
|
|
60
62
|
const slicesWithReveal = blocks.map(block => ({
|
|
61
63
|
block,
|
|
62
64
|
// copy the plaintext to avoid mutating the original
|
|
@@ -71,16 +73,43 @@ function getBlocksToReveal(blocks, redact) {
|
|
|
71
73
|
let cursorInBlock = 0;
|
|
72
74
|
let cursor = 0;
|
|
73
75
|
for (const redaction of redactions) {
|
|
74
|
-
redactBlocks(redaction);
|
|
76
|
+
await redactBlocks(redaction);
|
|
75
77
|
}
|
|
76
78
|
// only reveal blocks that have some data to reveal,
|
|
77
79
|
// or are completely plaintext
|
|
78
80
|
return slicesWithReveal
|
|
79
81
|
.filter(s => !isFullyRedacted(s.redactedPlaintext));
|
|
80
|
-
function redactBlocks(slice) {
|
|
82
|
+
async function redactBlocks(slice) {
|
|
81
83
|
while (cursor < slice.fromIndex) {
|
|
82
84
|
advance();
|
|
83
85
|
}
|
|
86
|
+
if (slice.hash) {
|
|
87
|
+
const plaintext = total.slice(slice.fromIndex, slice.toIndex);
|
|
88
|
+
const { nullifier, responses, mask } = await performOprf(plaintext);
|
|
89
|
+
// set the TOPRF claim on the first blocks this
|
|
90
|
+
// redaction covers
|
|
91
|
+
const toprf = {
|
|
92
|
+
nullifier,
|
|
93
|
+
responses,
|
|
94
|
+
dataLocation: {
|
|
95
|
+
fromIndex: cursorInBlock,
|
|
96
|
+
length: slice.toIndex - slice.fromIndex
|
|
97
|
+
},
|
|
98
|
+
mask,
|
|
99
|
+
plaintext
|
|
100
|
+
};
|
|
101
|
+
const block = slicesWithReveal[blockIdx];
|
|
102
|
+
block.toprfs || (block.toprfs = []);
|
|
103
|
+
block.toprfs.push(toprf);
|
|
104
|
+
const nullifierStr = binaryHashToStr(nullifier, toprf.dataLocation.length);
|
|
105
|
+
let i = 0;
|
|
106
|
+
while (cursor < slice.toIndex) {
|
|
107
|
+
slicesWithReveal[blockIdx].redactedPlaintext[cursorInBlock]
|
|
108
|
+
= nullifierStr.charCodeAt(i);
|
|
109
|
+
advance();
|
|
110
|
+
i += 1;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
84
113
|
while (cursor < slice.toIndex) {
|
|
85
114
|
slicesWithReveal[blockIdx]
|
|
86
115
|
.redactedPlaintext[cursorInBlock] = exports.REDACTION_CHAR_CODE;
|
|
@@ -108,4 +137,12 @@ function redactSlices(total, slices) {
|
|
|
108
137
|
}
|
|
109
138
|
return redacted;
|
|
110
139
|
}
|
|
111
|
-
|
|
140
|
+
/**
|
|
141
|
+
* Converts the binary hash to an ASCII string of the expected length.
|
|
142
|
+
* If the hash is shorter than the expected length, it will be padded with
|
|
143
|
+
* '0' characters. If it's longer, it will be truncated.
|
|
144
|
+
*/
|
|
145
|
+
function binaryHashToStr(hash, expLength) {
|
|
146
|
+
return (0, wire_1.base64Encode)(hash).padEnd(expLength, '0').slice(0, expLength);
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkYWN0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9yZWRhY3Rpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXVCQSxvREFnQkM7QUFLRCwwQ0FhQztBQW9CRCw4Q0EwRkM7QUFLRCxvQ0FVQztBQU9ELDBDQUVDO0FBL0xELGtEQUFzRDtBQUN0RCw4Q0FBNkQ7QUFHaEQsUUFBQSxjQUFjLEdBQUcsR0FBRyxDQUFBO0FBQ3BCLFFBQUEsbUJBQW1CLEdBQUcsc0JBQWMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFhL0Q7Ozs7R0FJRztBQUNILFNBQWdCLG9CQUFvQixDQUNuQyxRQUFXLEVBQ1gsUUFBVztJQUVYLCtDQUErQztJQUMvQyxLQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBQyxDQUFDLEdBQUcsUUFBUSxDQUFDLE1BQU0sRUFBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUMzQixNQUFNLE9BQU8sR0FBRyxPQUFPLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztlQUNuQyxDQUFDLE9BQU8sT0FBTyxLQUFLLFFBQVEsSUFBSSxPQUFPLEtBQUssc0JBQWMsQ0FBQztlQUMzRCxDQUFDLE9BQU8sT0FBTyxLQUFLLFFBQVEsSUFBSSxPQUFPLEtBQUssMkJBQW1CLENBQUMsQ0FBQTtRQUNwRSxJQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDYixPQUFPLEtBQUssQ0FBQTtRQUNiLENBQUM7SUFDRixDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUE7QUFDWixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFnQixlQUFlLENBQzlCLFFBQVc7SUFFWCxLQUFJLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1FBQy9CLElBQ0MsT0FBTyxLQUFLLHNCQUFjO2VBQ3ZCLE9BQU8sS0FBSywyQkFBbUIsRUFDakMs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
|