@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
package/lib/server/socket.js
CHANGED
|
@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AttestorServerSocket = void 0;
|
|
4
4
|
const message_handler_1 = require("../client/utils/message-handler");
|
|
5
5
|
const handlers_1 = require("../server/handlers");
|
|
6
|
+
const apm_1 = require("../server/utils/apm");
|
|
6
7
|
const generics_1 = require("../server/utils/generics");
|
|
7
8
|
const utils_1 = require("../utils");
|
|
8
9
|
const socket_base_1 = require("../utils/socket-base");
|
|
9
10
|
const util_1 = require("util");
|
|
10
11
|
class AttestorServerSocket extends socket_base_1.AttestorSocket {
|
|
11
|
-
constructor(socket, sessionId, logger) {
|
|
12
|
+
constructor(socket, sessionId, bgpListener, logger) {
|
|
12
13
|
// @ts-ignore
|
|
13
14
|
super(socket, {}, logger);
|
|
14
15
|
this.sessionId = sessionId;
|
|
16
|
+
this.bgpListener = bgpListener;
|
|
15
17
|
this.tunnels = {};
|
|
16
18
|
// handle RPC requests
|
|
17
19
|
this.addEventListener('rpc-request', handleRpcRequest.bind(this));
|
|
@@ -33,14 +35,17 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
|
|
|
33
35
|
}
|
|
34
36
|
return tunnel;
|
|
35
37
|
}
|
|
36
|
-
|
|
38
|
+
removeTunnel(tunnelId) {
|
|
39
|
+
delete this.tunnels[tunnelId];
|
|
40
|
+
}
|
|
41
|
+
static async acceptConnection(socket, { req, logger, bgpListener }) {
|
|
37
42
|
// promisify ws.send -- so the sendMessage method correctly
|
|
38
43
|
// awaits the send operation
|
|
39
44
|
const bindSend = socket.send.bind(socket);
|
|
40
45
|
socket.send = (0, util_1.promisify)(bindSend);
|
|
41
46
|
const sessionId = (0, utils_1.generateSessionId)();
|
|
42
47
|
logger = logger.child({ sessionId });
|
|
43
|
-
const client = new AttestorServerSocket(socket, sessionId, logger);
|
|
48
|
+
const client = new AttestorServerSocket(socket, sessionId, bgpListener, logger);
|
|
44
49
|
try {
|
|
45
50
|
const initMsgs = (0, generics_1.getInitialMessagesFromQuery)(req);
|
|
46
51
|
logger.trace({ initMsgs: initMsgs.length }, 'new connection, validating...');
|
|
@@ -76,20 +81,35 @@ async function handleTunnelMessage({ data: { tunnelId, message } }) {
|
|
|
76
81
|
}
|
|
77
82
|
}
|
|
78
83
|
async function handleRpcRequest({ data: { data, requestId, respond, type } }) {
|
|
84
|
+
var _a, _b;
|
|
79
85
|
const logger = this.logger.child({
|
|
80
86
|
rpc: type,
|
|
81
87
|
requestId
|
|
82
88
|
});
|
|
89
|
+
const apm = (0, apm_1.getApm)();
|
|
90
|
+
const tx = apm === null || apm === void 0 ? void 0 : apm.startTransaction(type);
|
|
91
|
+
tx === null || tx === void 0 ? void 0 : tx.setLabel('requestId', requestId);
|
|
92
|
+
tx === null || tx === void 0 ? void 0 : tx.setLabel('sessionId', this.sessionId.toString());
|
|
93
|
+
const userId = (_b = (_a = this.metadata.auth) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.id;
|
|
94
|
+
if (userId) {
|
|
95
|
+
tx === null || tx === void 0 ? void 0 : tx.setLabel('authUserId', userId);
|
|
96
|
+
}
|
|
83
97
|
try {
|
|
84
98
|
logger.debug({ data }, 'handling RPC request');
|
|
85
99
|
const handler = handlers_1.HANDLERS[type];
|
|
86
|
-
const res = await handler(data, { client: this, logger });
|
|
100
|
+
const res = await handler(data, { client: this, logger, tx });
|
|
87
101
|
await respond(res);
|
|
88
102
|
logger.debug({ res }, 'handled RPC request');
|
|
103
|
+
tx === null || tx === void 0 ? void 0 : tx.setOutcome('success');
|
|
89
104
|
}
|
|
90
105
|
catch (err) {
|
|
91
106
|
logger.error({ err }, 'error in RPC request');
|
|
92
107
|
respond(utils_1.AttestorError.fromError(err));
|
|
108
|
+
tx === null || tx === void 0 ? void 0 : tx.setOutcome('failure');
|
|
109
|
+
apm === null || apm === void 0 ? void 0 : apm.captureError(err, { parent: tx });
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
tx === null || tx === void 0 ? void 0 : tx.end();
|
|
93
113
|
}
|
|
94
114
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9zb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQWdFO0FBRWhFLGtEQUE4QztBQUM5Qyw4Q0FBNkM7QUFDN0Msd0RBQXVFO0FBRXZFLHFDQUE0RDtBQUM1RCx1REFBc0Q7QUFDdEQsK0JBQWdDO0FBR2hDLE1BQWEsb0JBQXFCLFNBQVEsNEJBQWM7SUFJdkQsWUFDQyxNQUFVLEVBQ0gsU0FBaUIsRUFDakIsV0FBb0MsRUFDM0MsTUFBYztRQUVkLGFBQWE7UUFDYixLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUxsQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBQ2pCLGdCQUFXLEdBQVgsV0FBVyxDQUF5QjtRQUw1QyxZQUFPLEdBQXFDLEVBQUUsQ0FBQTtRQVU3QyxzQkFBc0I7UUFDdEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtRQUNqRSw0Q0FBNEM7UUFDNUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGdCQUFnQixFQUFFLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO1FBQ3ZFLHNEQUFzRDtRQUN0RCxnREFBZ0Q7UUFDaEQsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHVCQUF1QixFQUFFLEdBQUcsRUFBRTtZQUNuRCxLQUFJLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDcEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtnQkFDckMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7WUFDakQsQ0FBQztRQUNGLENBQUMsQ0FBQyxDQUFBO0lBQ0gsQ0FB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O1FBQzVDLEVBQUUsYUFBRixFQUFFLHVCQUFGLEVBQUUsQ0FBRSxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDMUIsQ0FBQztJQUFDLE9BQU0sR0FBRyxFQUFFLENBQUM7UUFDYixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUsc0JBQXNCLENBQUMsQ0FBQTtRQUM3QyxPQUFPLENBQUMscUJBQWEsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtRQUNyQyxFQUFFLGFBQUYsRUFBRSx1QkFBRixFQUFFLENBQUUsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBRXpCLEdBQUcsYUFBSCxHQUFHLHVCQUFILEdBQUcsQ0FBRSxZQUFZLENBQUMsR0FBRyxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDdkMsQ0FBQztZQUFTLENBQUM7UUFDVixFQUFFLGFBQUYsRUFBRSx1QkFBRixFQUFFLENBQUUsR0FBRyxFQUFFLENBQUE7SUFDVixDQUFDO0FBQ0YsQ0FBQyJ9
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.makeTcpTunnel = void 0;
|
|
4
|
-
const dns_1 = require("dns");
|
|
5
4
|
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
6
5
|
const net_1 = require("net");
|
|
7
6
|
const config_1 = require("../../config");
|
|
7
|
+
const dns_1 = require("../../server/utils/dns");
|
|
8
8
|
const iso_1 = require("../../server/utils/iso");
|
|
9
9
|
const utils_1 = require("../../utils");
|
|
10
10
|
const env_1 = require("../../utils/env");
|
|
@@ -24,8 +24,9 @@ const HTTPS_PROXY_URL = (0, env_1.getEnvVariable)('HTTPS_PROXY_URL');
|
|
|
24
24
|
const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
|
|
25
25
|
const transcript = [];
|
|
26
26
|
const socket = await connectTcp({ ...opts, logger });
|
|
27
|
+
let closed = false;
|
|
27
28
|
socket.once('error', close);
|
|
28
|
-
socket.once('
|
|
29
|
+
socket.once('close', () => close(undefined));
|
|
29
30
|
socket.on('data', message => {
|
|
30
31
|
onMessage === null || onMessage === void 0 ? void 0 : onMessage(message);
|
|
31
32
|
transcript.push({ sender: 'server', message });
|
|
@@ -48,20 +49,20 @@ const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
|
|
|
48
49
|
},
|
|
49
50
|
close,
|
|
50
51
|
};
|
|
51
|
-
function close(
|
|
52
|
-
if (
|
|
52
|
+
function close(err) {
|
|
53
|
+
if (closed) {
|
|
53
54
|
return;
|
|
54
55
|
}
|
|
55
|
-
logger.debug({ err
|
|
56
|
+
logger.debug({ err }, 'closing socket');
|
|
57
|
+
closed = true;
|
|
56
58
|
socket.end(() => {
|
|
57
59
|
// Do nothing
|
|
58
60
|
});
|
|
59
|
-
onClose === null || onClose === void 0 ? void 0 : onClose(
|
|
61
|
+
onClose === null || onClose === void 0 ? void 0 : onClose(err);
|
|
60
62
|
onClose = undefined;
|
|
61
63
|
}
|
|
62
64
|
};
|
|
63
65
|
exports.makeTcpTunnel = makeTcpTunnel;
|
|
64
|
-
setDnsServers();
|
|
65
66
|
async function connectTcp({ host, port, geoLocation, logger }) {
|
|
66
67
|
let connectTimeout;
|
|
67
68
|
let socket;
|
|
@@ -112,7 +113,7 @@ async function getSocket(opts) {
|
|
|
112
113
|
|| ((_a = err.data) === null || _a === void 0 ? void 0 : _a.code) !== 403) {
|
|
113
114
|
throw err;
|
|
114
115
|
}
|
|
115
|
-
const addrs = await resolveHostnames(opts.host);
|
|
116
|
+
const addrs = await (0, dns_1.resolveHostnames)(opts.host);
|
|
116
117
|
logger.info({ addrs, host: opts.host }, 'failed to connect due to restricted IP, trying via raw addr');
|
|
117
118
|
for (const addr of addrs) {
|
|
118
119
|
try {
|
|
@@ -164,19 +165,4 @@ async function _getSocket({ host, port, geoLocation, logger }) {
|
|
|
164
165
|
});
|
|
165
166
|
return proxySocket;
|
|
166
167
|
}
|
|
167
|
-
|
|
168
|
-
return new Promise((_resolve, reject) => {
|
|
169
|
-
(0, dns_1.resolve)(hostname, (err, addresses) => {
|
|
170
|
-
if (err) {
|
|
171
|
-
reject(new Error(`Could not resolve hostname: ${hostname}, ${err.message}`));
|
|
172
|
-
}
|
|
173
|
-
else {
|
|
174
|
-
_resolve(addresses);
|
|
175
|
-
}
|
|
176
|
-
});
|
|
177
|
-
});
|
|
178
|
-
}
|
|
179
|
-
function setDnsServers() {
|
|
180
|
-
(0, dns_1.setServers)(config_1.DNS_SERVERS);
|
|
181
|
-
}
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10Y3AtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90dW5uZWxzL21ha2UtdGNwLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBeUM7QUFDekMseURBQW1EO0FBRW5ELDZCQUE0QjtBQUM1Qix1Q0FBK0Q7QUFFL0QsOENBQXlEO0FBR3pELHFDQUF5QztBQUN6Qyx1Q0FBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGlCQUFpQixDQUFDLENBQUE7QUFLekQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSSxNQUFNLGFBQWEsR0FBaUQsS0FBSyxFQUFDLEVBQ2hGLE9BQU8sRUFDUCxTQUFTLEVBQ1QsTUFBTSxFQUNOLEdBQUcsSUFBSSxFQUNQLEVBQUUsRUFBRTtJQUNKLE1BQU0sVUFBVSxHQUFzQyxFQUFFLENBQUE7SUFDeEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXBELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO0lBQzFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxFQUFFO1FBQzNCLFNBQVMsYUFBVCxTQUFTLHVCQUFULFNBQVMsQ0FBRyxPQUFPLENBQUMsQ0FBQTtRQUNwQixVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQy9DLENBQUMsQ0FBQyxDQUFBO0lBRUYsT0FBTztRQUNOLFVBQVU7UUFDVixhQUFhLEVBQUUsSUFBSTtRQUNuQixLQUFLLENBQUMsS0FBSyxDQUFD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
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10Y3AtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90dW5uZWxzL21ha2UtdGNwLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBbUQ7QUFFbkQsNkJBQTRCO0FBQzVCLHVDQUFrRDtBQUVsRCw4Q0FBdUQ7QUFDdkQsOENBQXlEO0FBR3pELHFDQUF5QztBQUN6Qyx1Q0FBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGlCQUFpQixDQUFDLENBQUE7QUFLekQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSSxNQUFNLGFBQWEsR0FBaUQsS0FBSyxFQUFDLEVBQ2hGLE9BQU8sRUFDUCxTQUFTLEVBQ1QsTUFBTSxFQUNOLEdBQUcsSUFBSSxFQUNQLEVBQUUsRUFBRTtJQUNKLE1BQU0sVUFBVSxHQUFzQyxFQUFFLENBQUE7SUFDeEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXBELElBQUksTUFBTSxHQUFHLEtBQUssQ0FBQTtJQUVsQixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUMzQixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRTtRQUMzQixTQUFTLGFBQVQsU0FBUyx1QkFBVCxTQUFTLENBQUcsT0FBTyxDQUFDLENBQUE7UUFDcEIsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUMvQyxDQUFDLENBQUMsQ0FBQTtJQUVGLE9BQU87UUFDTixVQUFVO1FBQ1YsYUFBYSxFQUFF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
|
package/lib/server/utils/apm.js
CHANGED
|
@@ -27,7 +27,7 @@ function getApm() {
|
|
|
27
27
|
|| '0.1');
|
|
28
28
|
apm = elastic_apm_node_1.default.start({
|
|
29
29
|
serviceName: 'reclaim_attestor',
|
|
30
|
-
serviceVersion: '
|
|
30
|
+
serviceVersion: '4.0.0',
|
|
31
31
|
transactionSampleRate: sampleRate,
|
|
32
32
|
instrumentIncomingHTTPRequests: false,
|
|
33
33
|
instrument: true,
|
|
@@ -19,7 +19,7 @@ export declare function assertValidClaimRequest(request: ClaimTunnelRequest, met
|
|
|
19
19
|
* Verify that the transcript contains a valid claim
|
|
20
20
|
* for the provider.
|
|
21
21
|
*/
|
|
22
|
-
export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T): Promise<T>;
|
|
22
|
+
export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T, logger: Logger): Promise<T>;
|
|
23
23
|
/**
|
|
24
24
|
* Verify that the transcript provided by the client
|
|
25
25
|
* matches the transcript of the tunnel, the server
|
|
@@ -27,4 +27,4 @@ export declare function assertValidProviderTranscript<T extends ProviderClaimInf
|
|
|
27
27
|
*/
|
|
28
28
|
export declare function assertTranscriptsMatch(clientTranscript: ClaimTunnelRequest['transcript'], tunnelTranscript: TCPSocketProperties['transcript']): void;
|
|
29
29
|
export declare function decryptTranscript(transcript: ClaimTunnelRequest['transcript'], logger: Logger, zkEngine: ZKEngine, serverIV: Uint8Array, clientIV: Uint8Array): Promise<IDecryptedTranscript>;
|
|
30
|
-
export declare function getWithoutHeader(message: Uint8Array): Uint8Array
|
|
30
|
+
export declare function getWithoutHeader(message: Uint8Array): Uint8Array<ArrayBuffer>;
|
|
@@ -50,7 +50,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
|
|
|
50
50
|
}
|
|
51
51
|
// get all application data messages
|
|
52
52
|
const applData = (0, utils_1.extractApplicationDataFromTranscript)(receipt);
|
|
53
|
-
const newData = await assertValidProviderTranscript(applData, data);
|
|
53
|
+
const newData = await assertValidProviderTranscript(applData, data, logger);
|
|
54
54
|
if (newData !== data) {
|
|
55
55
|
logger.info({ newData }, 'updated claim info');
|
|
56
56
|
}
|
|
@@ -60,7 +60,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
|
|
|
60
60
|
* Verify that the transcript contains a valid claim
|
|
61
61
|
* for the provider.
|
|
62
62
|
*/
|
|
63
|
-
async function assertValidProviderTranscript(applData, info) {
|
|
63
|
+
async function assertValidProviderTranscript(applData, info, logger) {
|
|
64
64
|
var _a;
|
|
65
65
|
const providerName = info.provider;
|
|
66
66
|
const provider = providers_1.providers[providerName];
|
|
@@ -70,7 +70,7 @@ async function assertValidProviderTranscript(applData, info) {
|
|
|
70
70
|
const params = (0, generics_1.niceParseJsonObject)(info.parameters, 'params');
|
|
71
71
|
const ctx = (0, generics_1.niceParseJsonObject)(info.context, 'context');
|
|
72
72
|
(0, utils_1.assertValidateProviderParams)(providerName, params);
|
|
73
|
-
const rslt = await provider.assertValidProviderReceipt(applData, params);
|
|
73
|
+
const rslt = await provider.assertValidProviderReceipt(applData, params, logger);
|
|
74
74
|
const extractedParameters = (rslt === null || rslt === void 0 ? void 0 : rslt.extractedParameters) || {};
|
|
75
75
|
if (!Object.keys(extractedParameters).length) {
|
|
76
76
|
return info;
|
|
@@ -117,7 +117,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
|
|
|
117
117
|
let serverRecordNumber = clientRecordNumber;
|
|
118
118
|
transcript = transcript.slice(nextMsgIndex);
|
|
119
119
|
const decryptedTranscript = [];
|
|
120
|
-
for (const [i, { sender, message, reveal: { zkReveal, directReveal } = {} }] of transcript.entries()) {
|
|
120
|
+
for (const [i, { sender, message, reveal: { zkReveal, directReveal } = {} }] of transcript.entries()) {
|
|
121
|
+
//start with first message after last handshake message
|
|
121
122
|
await getDecryptedMessage(sender, message, directReveal, zkReveal, i);
|
|
122
123
|
}
|
|
123
124
|
return {
|
|
@@ -128,7 +129,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
|
|
|
128
129
|
async function getDecryptedMessage(sender, message, directReveal, zkReveal, i) {
|
|
129
130
|
var _a, _b;
|
|
130
131
|
try {
|
|
131
|
-
const isServer = sender === api_1.TranscriptMessageSenderType
|
|
132
|
+
const isServer = sender === api_1.TranscriptMessageSenderType
|
|
133
|
+
.TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER;
|
|
132
134
|
const recordHeader = message.slice(0, 5);
|
|
133
135
|
const content = getWithoutHeader(message);
|
|
134
136
|
if (isServer) {
|
|
@@ -153,8 +155,13 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
|
|
|
153
155
|
logger,
|
|
154
156
|
cipherSuite,
|
|
155
157
|
zkEngine: zkEngine,
|
|
156
|
-
iv: sender === api_1.TranscriptMessageSenderType
|
|
157
|
-
|
|
158
|
+
iv: sender === api_1.TranscriptMessageSenderType
|
|
159
|
+
.TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER
|
|
160
|
+
? serverIV
|
|
161
|
+
: clientIV,
|
|
162
|
+
recordNumber: isServer
|
|
163
|
+
? serverRecordNumber
|
|
164
|
+
: clientRecordNumber
|
|
158
165
|
});
|
|
159
166
|
plaintext = result.redactedPlaintext;
|
|
160
167
|
redacted = false;
|
|
@@ -165,7 +172,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
|
|
|
165
172
|
plaintextLength = plaintext.length;
|
|
166
173
|
}
|
|
167
174
|
decryptedTranscript.push({
|
|
168
|
-
sender: sender === api_1.TranscriptMessageSenderType
|
|
175
|
+
sender: sender === api_1.TranscriptMessageSenderType
|
|
176
|
+
.TRANSCRIPT_MESSAGE_SENDER_TYPE_CLIENT
|
|
169
177
|
? 'client'
|
|
170
178
|
: 'server',
|
|
171
179
|
redacted,
|
|
@@ -186,4 +194,4 @@ function getWithoutHeader(message) {
|
|
|
186
194
|
// strip the record header (xx 03 03 xx xx)
|
|
187
195
|
return message.slice(5);
|
|
188
196
|
}
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assert-valid-claim-request.js","sourceRoot":"","sources":["../../../src/server/utils/assert-valid-claim-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function resolveHostnames(hostname: string): Promise<string[]>;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveHostnames = resolveHostnames;
|
|
4
|
+
const dns_1 = require("dns");
|
|
5
|
+
const config_1 = require("../../config");
|
|
6
|
+
setDnsServers();
|
|
7
|
+
async function resolveHostnames(hostname) {
|
|
8
|
+
return new Promise((_resolve, reject) => {
|
|
9
|
+
(0, dns_1.resolve)(hostname, (err, addresses) => {
|
|
10
|
+
if (err) {
|
|
11
|
+
reject(new Error(`Could not resolve hostname: ${hostname}, ${err.message}`));
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
_resolve(addresses);
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
function setDnsServers() {
|
|
20
|
+
(0, dns_1.setServers)(config_1.DNS_SERVERS);
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci91dGlscy9kbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFLQSw0Q0FjQztBQW5CRCw2QkFBeUM7QUFDekMsdUNBQXdDO0FBRXhDLGFBQWEsRUFBRSxDQUFBO0FBRVIsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFFBQWdCO0lBQ3RELE9BQU8sSUFBSSxPQUFPLENBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDakQsSUFBQSxhQUFPLEVBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxFQUFFO1lBQ3BDLElBQUcsR0FBRyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUNMLElBQUksS0FBSyxDQUNSLCtCQUErQixRQUFRLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUN6RCxDQUNELENBQUE7WUFDRixDQUFDO2lCQUFNLENBQUM7Z0JBQ1AsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3BCLENBQUM7UUFDRixDQUFDLENBQUMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMsYUFBYTtJQUNyQixJQUFBLGdCQUFVLEVBQUMsb0JBQVcsQ0FBQyxDQUFBO0FBQ3hCLENBQUMifQ==
|
|
@@ -3,7 +3,7 @@ import { ServiceSignatureType } from '../../proto/api';
|
|
|
3
3
|
/**
|
|
4
4
|
* Sign message using the PRIVATE_KEY env var.
|
|
5
5
|
*/
|
|
6
|
-
export declare function signAsAttestor(data: Uint8Array | string, scheme: ServiceSignatureType): Uint8Array | Promise<Uint8Array
|
|
6
|
+
export declare function signAsAttestor(data: Uint8Array | string, scheme: ServiceSignatureType): Uint8Array<ArrayBufferLike> | Promise<Uint8Array<ArrayBufferLike>>;
|
|
7
7
|
/**
|
|
8
8
|
* Obtain the address on chain, from the PRIVATE_KEY env var.
|
|
9
9
|
*/
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ZKEngine } from '@reclaimprotocol/zk-symmetric-crypto';
|
|
2
1
|
import { AttestorClient } from '../client/utils/client-socket';
|
|
3
2
|
import { createMockServer } from '../tests/mock-provider-server';
|
|
4
3
|
import { IAttestorServerSocket } from '../types';
|
|
@@ -12,7 +11,6 @@ type ServerOpts = {
|
|
|
12
11
|
mockHttpsServer: ReturnType<typeof createMockServer>;
|
|
13
12
|
mockhttpsServerPort: number;
|
|
14
13
|
serverUrl: string;
|
|
15
|
-
zkEngine: ZKEngine;
|
|
16
14
|
};
|
|
17
15
|
/**
|
|
18
16
|
* Boots up a attestor server, a mock https server,
|
|
@@ -8,7 +8,6 @@ const mock_provider_server_1 = require("../tests/mock-provider-server");
|
|
|
8
8
|
const mocks_1 = require("../tests/mocks");
|
|
9
9
|
const utils_1 = require("../tests/utils");
|
|
10
10
|
const utils_2 = require("../utils");
|
|
11
|
-
const ws_1 = require("ws");
|
|
12
11
|
/**
|
|
13
12
|
* Boots up a attestor server, a mock https server,
|
|
14
13
|
* and a client that is renewed for each test.
|
|
@@ -35,7 +34,6 @@ const describeWithServer = (name, fn) => describe(name, () => {
|
|
|
35
34
|
client = new client_socket_1.AttestorClient({
|
|
36
35
|
logger: utils_2.logger.child({ client: 1 }),
|
|
37
36
|
url: wsServerUrl,
|
|
38
|
-
Websocket: ws_1.WebSocket
|
|
39
37
|
});
|
|
40
38
|
await client.waitForInit();
|
|
41
39
|
});
|
|
@@ -55,7 +53,6 @@ const describeWithServer = (name, fn) => describe(name, () => {
|
|
|
55
53
|
},
|
|
56
54
|
mockHttpsServer,
|
|
57
55
|
mockhttpsServerPort: httpsServerPort,
|
|
58
|
-
zkEngine: 'snarkjs'
|
|
59
56
|
});
|
|
60
57
|
function getClientOnServer() {
|
|
61
58
|
var _a;
|
|
@@ -64,4 +61,4 @@ const describeWithServer = (name, fn) => describe(name, () => {
|
|
|
64
61
|
}
|
|
65
62
|
});
|
|
66
63
|
exports.describeWithServer = describeWithServer;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVzY3JpYmUtd2l0aC1zZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdHMvZGVzY3JpYmUtd2l0aC1zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0VBQStEO0FBQy9ELHVDQUF3QztBQUN4Qyx1Q0FBeUM7QUFDekMseUVBQWlFO0FBQ2pFLDJDQUE4QztBQUM5QywyQ0FBaUU7QUFFakUscUNBQWtDO0FBZ0JsQzs7O0dBR0c7QUFDSSxNQUFNLGtCQUFrQixHQUFHLENBQ2pDLElBQVksRUFDWixFQUE4QixFQUM3QixFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUU7SUFDeEIsSUFBSSxRQUF5QixDQUFBO0lBRTdCLElBQUksV0FBbUIsQ0FBQTtJQUV2QixJQUFJLGFBQXFCLENBQUE7SUFDekIsSUFBSSxNQUFzQixDQUFBO0lBRTFCLE1BQU0sWUFBWSxHQUFHLElBQUEscUJBQWEsR0FBRSxDQUFBO0lBQ3BDLE1BQU0sZUFBZSxHQUFHLElBQUEscUJBQWEsR0FBRSxDQUFBO0lBRXZDLE1BQU0sZUFBZSxHQUFHLElBQUEsdUNBQWdCLEVBQUMsZUFBZSxDQUFDLENBQUE7SUFFekQsU0FBUyxDQUFDLEtBQUssSUFBRyxFQUFFO1FBQ25CLFFBQVEsR0FBRyxNQUFNLElBQUEscUJBQVksRUFBQyxZQUFZLENBQUMsQ0FBQTtRQUMzQyxXQUFXLEdBQUcsa0JBQWtCLFlBQVksR0FBRyxvQkFBVyxFQUFFLENBQUE7SUFDN0QsQ0FBQyxDQUFDLENBQUE7SUFFRixRQUFRLENBQUMsR0FBRyxFQUFFO1FBQ2IsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2hCLGVBQWUsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDL0IsQ0FBQyxDQUFDLENBQUE7SUFFRixVQUFVLENBQUMsS0FBSyxJQUFHLEVBQUU7UUFDcEIsb0JBQVksQ0FBQyxTQUFTLEVBQUUsQ0FBQTtRQUV4QixhQUFhLEdBQUcsSUFBQSx3QkFBZ0IsR0FBRSxDQUFBO1FBQ2xDLE1BQU0sR0FBRyxJQUFJLDhCQUFjLENBQUM7WUFDM0IsTUFBTSxFQUFFLGNBQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDbkMsR0FBRyxFQUFFLFdBQVc7U0FDaEIsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsS0FBSyxJQUFHLEVBQUU7UUFDbkIsTUFBTSxNQUFNLENBQUMsbUJBQW1CLEVBQUUsQ0FBQTtJQUNuQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQztRQUNGLGlCQUFpQjtRQUNqQixJQUFJLE1BQU07WUFDVCxPQUFPLE1BQU0sQ0FBQTtRQUNkLENBQUM7UUFDRCxJQUFJLGFBQWE7WUFDaEIsT0FBTyxhQUFhLENBQUE7UUFDckIsQ0FBQztRQUNELElBQUksU0FBUztZQUNaLE9BQU8sV0FBVyxDQUFBO1FBQ25CLENBQUM7UUFDRCxlQUFlO1FBQ2YsbUJBQW1CLEVBQUUsZUFBZTtLQUNwQyxDQUFDLENBQUE7SUFFRixTQUFTLGlCQUFpQjs7UUFDekIsTUFBTSxhQUFhLEdBQUcsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQWdCLENBQUE7UUFDbkUsT0FBTyxNQUFBLGFBQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsMENBQUUsWUFBWSxDQUFBO0lBQzFDLENBQUM7QUFDRixDQUFDLENBQUMsQ0FBQTtBQTVEVyxRQUFBLGtCQUFrQixzQkE0RDdCIn0=
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
*/
|
|
10
10
|
export declare function createMockServer(port: number): {
|
|
11
11
|
server: import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
|
|
12
|
-
tlsSessionStore: Record<string, Buffer
|
|
12
|
+
tlsSessionStore: Record<string, Buffer<ArrayBufferLike>>;
|
|
13
13
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const ethers_1 = require("ethers");
|
|
4
|
+
const client_1 = require("../client");
|
|
5
|
+
const config_1 = require("../config");
|
|
6
|
+
const providers_1 = require("../providers");
|
|
7
|
+
const server_1 = require("../server");
|
|
8
|
+
const mock_provider_server_1 = require("../tests/mock-provider-server");
|
|
9
|
+
const utils_1 = require("../tests/utils");
|
|
10
|
+
const utils_2 = require("../utils");
|
|
11
|
+
describe('Authentication Tests', () => {
|
|
12
|
+
const authKp = ethers_1.ethers.Wallet.createRandom();
|
|
13
|
+
let wsServer;
|
|
14
|
+
let wsServerUrl;
|
|
15
|
+
let claimUrl;
|
|
16
|
+
let privateKeyHex;
|
|
17
|
+
const wsServerPort = (0, utils_1.getRandomPort)();
|
|
18
|
+
const httpsServerPort = (0, utils_1.getRandomPort)();
|
|
19
|
+
const mockHttpsServer = (0, mock_provider_server_1.createMockServer)(httpsServerPort);
|
|
20
|
+
beforeAll(async () => {
|
|
21
|
+
wsServer = await (0, server_1.createServer)(wsServerPort);
|
|
22
|
+
wsServerUrl = `ws://localhost:${wsServerPort}${config_1.WS_PATHNAME}`;
|
|
23
|
+
process.env.AUTHENTICATION_PUBLIC_KEY = authKp.publicKey;
|
|
24
|
+
claimUrl = `https://localhost:${httpsServerPort}/me`;
|
|
25
|
+
privateKeyHex = (0, utils_1.randomPrivateKey)();
|
|
26
|
+
// we need to disable certificate verification
|
|
27
|
+
// for testing purposes
|
|
28
|
+
providers_1.providers.http.additionalClientOptions = {
|
|
29
|
+
verifyServerCertificate: false
|
|
30
|
+
};
|
|
31
|
+
});
|
|
32
|
+
afterAll(() => {
|
|
33
|
+
delete process.env.AUTHENTICATION_PUBLIC_KEY;
|
|
34
|
+
wsServer.close();
|
|
35
|
+
mockHttpsServer.server.close();
|
|
36
|
+
});
|
|
37
|
+
it('should fail to create a claim w/o authentication', async () => {
|
|
38
|
+
await expect(createClaim(undefined)).rejects.toMatchObject({
|
|
39
|
+
message: 'User must be authenticated'
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
it('should block claim creation if host not in whitelist', async () => {
|
|
43
|
+
const auth = await (0, utils_2.createAuthRequest)({ id: '1234', hostWhitelist: ['api.abcd.com'] }, authKp.privateKey);
|
|
44
|
+
await expect(createClaim(auth)).rejects.toMatchObject({
|
|
45
|
+
message: 'Host \"localhost\" not allowed by auth request'
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
it('should create claim after authentication', async () => {
|
|
49
|
+
const auth = await (0, utils_2.createAuthRequest)({ id: '1234', hostWhitelist: ['localhost'] }, authKp.privateKey);
|
|
50
|
+
await createClaim(auth);
|
|
51
|
+
});
|
|
52
|
+
function createClaim(authRequest) {
|
|
53
|
+
const user = 'testing-123';
|
|
54
|
+
return (0, client_1.createClaimOnAttestor)({
|
|
55
|
+
name: 'http',
|
|
56
|
+
params: {
|
|
57
|
+
url: claimUrl,
|
|
58
|
+
method: 'GET',
|
|
59
|
+
responseRedactions: [],
|
|
60
|
+
responseMatches: [
|
|
61
|
+
{
|
|
62
|
+
type: 'contains',
|
|
63
|
+
value: `${user}@mock.com`
|
|
64
|
+
}
|
|
65
|
+
]
|
|
66
|
+
},
|
|
67
|
+
secretParams: {
|
|
68
|
+
authorisationHeader: `Bearer ${user}`
|
|
69
|
+
},
|
|
70
|
+
ownerPrivateKey: privateKeyHex,
|
|
71
|
+
client: { url: wsServerUrl, authRequest }
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5hdXRoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RzL3Rlc3QuYXV0aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUErQjtBQUMvQix1Q0FBa0Q7QUFDbEQsdUNBQXdDO0FBRXhDLDZDQUF5QztBQUN6Qyx1Q0FBeUM7QUFDekMseUVBQWlFO0FBQ2pFLDJDQUFpRTtBQUNqRSxxQ0FBNkM7QUFHN0MsUUFBUSxDQUFDLHNCQUFzQixFQUFFLEdBQUcsRUFBRTtJQUVyQyxNQUFNLE1BQU0sR0FBRyxlQUFNLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFBO0lBQzNDLElBQUksUUFBeUIsQ0FBQTtJQUU3QixJQUFJLFdBQW1CLENBQUE7SUFDdkIsSUFBSSxRQUFnQixDQUFBO0lBQ3BCLElBQUksYUFBcUIsQ0FBQTtJQUV6QixNQUFNLFlBQVksR0FBRyxJQUFBLHFCQUFhLEdBQUUsQ0FBQTtJQUNwQyxNQUFNLGVBQWUsR0FBRyxJQUFBLHFCQUFhLEdBQUUsQ0FBQTtJQUV2QyxNQUFNLGVBQWUsR0FBRyxJQUFBLHVDQUFnQixFQUFDLGVBQWUsQ0FBQyxDQUFBO0lBRXpELFNBQVMsQ0FBQyxLQUFLLElBQUcsRUFBRTtRQUNuQixRQUFRLEdBQUcsTUFBTSxJQUFBLHFCQUFZLEVBQUMsWUFBWSxDQUFDLENBQUE7UUFDM0MsV0FBVyxHQUFHLGtCQUFrQixZQUFZLEdBQUcsb0JBQVcsRUFBRSxDQUFBO1FBQzVELE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQTtRQUN4RCxRQUFRLEdBQUcscUJBQXFCLGVBQWUsS0FBSyxDQUFBO1FBQ3BELGFBQWEsR0FBRyxJQUFBLHdCQUFnQixHQUFFLENBQUE7UUFFbEMsOENBQThDO1FBQzlDLHVCQUF1QjtRQUN2QixxQkFBUyxDQUFDLElBQUksQ0FBQyx1QkFBdUIsR0FBRztZQUN4Qyx1QkFBdUIsRUFBRSxLQUFLO1NBQzlCLENBQUE7SUFDRixDQUFDLENBQUMsQ0FBQTtJQUVGLFFBQVEsQ0FBQyxHQUFHLEVBQUU7UUFDYixPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUE7UUFDNUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2hCLGVBQWUsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDL0IsQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsa0RBQWtELEVBQUUsS0FBSyxJQUFHLEVBQUU7UUFDaEUsTUFBTSxNQUFNLENBQ1gsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUN0QixDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUM7WUFDdkIsT0FBTyxFQUFFLDRCQUE0QjtTQUNyQyxDQUFDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyxzREFBc0QsRUFBRSxLQUFLLElBQUcsRUFBRTtRQUNwRSxNQUFNLElBQUksR0FBRyxNQUFNLElBQUEseUJBQWlCLEVBQ25DLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsQ0FBQyxjQUFjLENBQUMsRUFBRSxFQUMvQyxNQUFNLENBQUMsVUFBVSxDQUNqQixDQUFBO1FBRUQsTUFBTSxNQUFNLENBQ1gsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUNqQixDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUM7WUFDdkIsT0FBTyxFQUFFLGdEQUFnRDtTQUN6RCxDQUFDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywwQ0FBMEMsRUFBRSxLQUFLLElBQUcsRUFBRTtRQUN4RCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUEseUJBQWlCLEVBQ25DLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxFQUM1QyxNQUFNLENBQUMsVUFBVSxDQUNqQixDQUFBO1FBRUQsTUFBTSxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDeEIsQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLFdBQVcsQ0FBQyxXQUE4QztRQUNsRSxNQUFNLElBQUksR0FBRyxhQUFhLENBQUE7UUFDMUIsT0FBTyxJQUFBLDhCQUFxQixFQUFDO1lBQzVCLElBQUksRUFBRSxNQUFNO1lBQ1osTUFBTSxFQUFFO2dCQUNQLEdBQUcsRUFBRSxRQUFRO2dCQUNiLE1BQU0sRUFBRSxLQUFLO2dCQUNiLGtCQUFrQixFQUFFLEVBQUU7Z0JBQ3RCLGVBQWUsRUFBRTtvQkFDaEI7d0JBQ0MsSUFBSSxFQUFFLFVBQVU7d0JBQ2hCLEtBQUssRUFBRSxHQUFHLElBQUksV0FBVztxQkFDekI7aUJBQ0Q7YUFDRDtZQUNELFlBQVksRUFBRTtnQkFDYixtQkFBbUIsRUFBRSxVQUFVLElBQUksRUFBRTthQUNyQztZQUNELGVBQWUsRUFBRSxhQUFhO1lBQzlCLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFO1NBQ3pDLENBQUMsQ0FBQTtJQUNILENBQUM7QUFDRixDQUFDLENBQUMsQ0FBQSJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|