@reclaimprotocol/attestor-core 4.0.3 → 5.0.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +660 -660
- package/README.md +1 -2
- package/lib/avs/abis/avsDirectoryABI.js +341 -342
- package/lib/avs/abis/delegationABI.js +4 -5
- package/lib/avs/abis/registryABI.js +722 -723
- package/lib/avs/client/create-claim-on-avs.d.ts +5 -5
- package/lib/avs/client/create-claim-on-avs.js +160 -139
- package/lib/avs/config.d.ts +1 -1
- package/lib/avs/config.js +25 -23
- package/lib/avs/contracts/ReclaimServiceManager.d.ts +436 -532
- package/lib/avs/contracts/ReclaimServiceManager.js +0 -3
- package/lib/avs/contracts/common.d.ts +40 -11
- package/lib/avs/contracts/common.js +0 -3
- package/lib/avs/contracts/factories/ReclaimServiceManager__factory.d.ts +13 -11
- package/lib/avs/contracts/factories/ReclaimServiceManager__factory.js +1157 -1148
- package/lib/avs/contracts/factories/index.d.ts +1 -1
- package/lib/avs/contracts/factories/index.js +4 -9
- package/lib/avs/contracts/index.d.ts +3 -3
- package/lib/avs/contracts/index.js +6 -40
- package/lib/avs/types/index.d.ts +6 -6
- package/lib/avs/types/index.js +0 -3
- package/lib/avs/utils/contracts.d.ts +14 -14
- package/lib/avs/utils/contracts.js +50 -35
- package/lib/avs/utils/register.d.ts +3 -3
- package/lib/avs/utils/register.js +71 -79
- package/lib/avs/utils/tasks.d.ts +4 -4
- package/lib/avs/utils/tasks.js +44 -41
- package/lib/client/create-claim.d.ts +2 -2
- package/lib/client/create-claim.js +437 -400
- package/lib/client/index.d.ts +3 -3
- package/lib/client/index.js +3 -20
- package/lib/client/tunnels/make-rpc-tcp-tunnel.d.ts +2 -2
- package/lib/client/tunnels/make-rpc-tcp-tunnel.js +49 -56
- package/lib/client/tunnels/make-rpc-tls-tunnel.d.ts +4 -3
- package/lib/client/tunnels/make-rpc-tls-tunnel.js +123 -131
- package/lib/client/utils/attestor-pool.d.ts +3 -1
- package/lib/client/utils/attestor-pool.js +21 -25
- package/lib/client/utils/client-socket.d.ts +4 -4
- package/lib/client/utils/client-socket.js +114 -94
- package/lib/client/utils/message-handler.d.ts +2 -2
- package/lib/client/utils/message-handler.js +89 -86
- package/lib/config/index.d.ts +6 -3
- package/lib/config/index.js +60 -37
- package/lib/external-rpc/benchmark.d.ts +1 -0
- package/lib/external-rpc/benchmark.js +82 -0
- package/lib/external-rpc/event-bus.d.ts +7 -0
- package/lib/external-rpc/event-bus.js +17 -0
- package/lib/external-rpc/global.d.js +0 -0
- package/lib/external-rpc/handle-incoming-msg.d.ts +2 -0
- package/lib/external-rpc/handle-incoming-msg.js +241 -0
- package/lib/external-rpc/index.d.ts +3 -0
- package/lib/external-rpc/index.js +3 -0
- package/lib/external-rpc/jsc-polyfills/1.d.ts +14 -0
- package/lib/external-rpc/jsc-polyfills/1.js +80 -0
- package/lib/external-rpc/jsc-polyfills/2.js +15 -0
- package/lib/external-rpc/jsc-polyfills/event.d.ts +10 -0
- package/lib/external-rpc/jsc-polyfills/event.js +19 -0
- package/lib/external-rpc/jsc-polyfills/index.d.ts +2 -0
- package/lib/external-rpc/jsc-polyfills/index.js +2 -0
- package/lib/external-rpc/jsc-polyfills/ws.d.ts +21 -0
- package/lib/external-rpc/jsc-polyfills/ws.js +83 -0
- package/lib/external-rpc/setup-browser.d.ts +6 -0
- package/lib/external-rpc/setup-browser.js +33 -0
- package/lib/external-rpc/setup-jsc.d.ts +24 -0
- package/lib/external-rpc/setup-jsc.js +22 -0
- package/lib/{window-rpc → external-rpc}/types.d.ts +56 -35
- package/lib/external-rpc/types.js +0 -0
- package/lib/external-rpc/utils.d.ts +20 -0
- package/lib/external-rpc/utils.js +100 -0
- package/lib/external-rpc/zk.d.ts +14 -0
- package/lib/external-rpc/zk.js +58 -0
- package/lib/index.d.ts +8 -9
- package/lib/index.js +12 -49
- package/lib/mechain/abis/governanceABI.js +460 -461
- package/lib/mechain/abis/taskABI.js +505 -506
- package/lib/mechain/client/create-claim-on-mechain.d.ts +3 -3
- package/lib/mechain/client/create-claim-on-mechain.js +31 -30
- package/lib/mechain/client/index.d.ts +1 -1
- package/lib/mechain/client/index.js +1 -18
- package/lib/mechain/constants/index.js +8 -7
- package/lib/mechain/index.d.ts +2 -2
- package/lib/mechain/index.js +2 -19
- package/lib/mechain/types/index.d.ts +2 -2
- package/lib/mechain/types/index.js +0 -3
- package/lib/proto/api.d.ts +182 -39
- package/lib/proto/api.js +4105 -3555
- package/lib/proto/tee-bundle.d.ts +156 -0
- package/lib/proto/tee-bundle.js +1296 -0
- package/lib/providers/http/index.d.ts +16 -1
- package/lib/providers/http/index.js +603 -576
- package/lib/providers/http/patch-parse5-tree.d.ts +6 -0
- package/lib/providers/http/patch-parse5-tree.js +34 -0
- package/lib/providers/http/utils.d.ts +7 -4
- package/lib/providers/http/utils.js +240 -317
- package/lib/providers/index.d.ts +1 -1
- package/lib/providers/index.js +5 -9
- package/lib/scripts/check-avs-registration.d.ts +1 -1
- package/lib/scripts/check-avs-registration.js +24 -25
- package/lib/scripts/fallbacks/crypto.d.ts +1 -0
- package/lib/scripts/fallbacks/crypto.js +4 -0
- package/lib/scripts/fallbacks/empty.d.ts +3 -0
- package/lib/scripts/fallbacks/empty.js +4 -0
- package/lib/scripts/fallbacks/re2.d.ts +1 -0
- package/lib/scripts/fallbacks/re2.js +7 -0
- package/lib/scripts/fallbacks/snarkjs.d.ts +1 -0
- package/lib/scripts/fallbacks/snarkjs.js +10 -0
- package/lib/scripts/fallbacks/stwo.d.ts +6 -0
- package/lib/scripts/fallbacks/stwo.js +159 -0
- package/lib/scripts/generate-provider-types.js +92 -73
- package/lib/scripts/generate-receipt.d.ts +2 -2
- package/lib/scripts/generate-receipt.js +94 -83
- package/lib/scripts/generate-toprf-keys.js +17 -16
- package/lib/scripts/jsc-cli-rpc.d.ts +1 -0
- package/lib/scripts/jsc-cli-rpc.js +35 -0
- package/lib/scripts/register-avs-operator.d.ts +1 -1
- package/lib/scripts/register-avs-operator.js +3 -7
- package/lib/scripts/start-server.d.ts +1 -1
- package/lib/scripts/start-server.js +9 -11
- package/lib/scripts/update-avs-metadata.d.ts +1 -1
- package/lib/scripts/update-avs-metadata.js +17 -19
- package/lib/scripts/utils.js +8 -9
- package/lib/scripts/whitelist-operator.d.ts +1 -1
- package/lib/scripts/whitelist-operator.js +13 -15
- package/lib/server/create-server.d.ts +3 -2
- package/lib/server/create-server.js +98 -85
- package/lib/server/handlers/claimTeeBundle.d.ts +6 -0
- package/lib/server/handlers/claimTeeBundle.js +232 -0
- package/lib/server/handlers/claimTunnel.d.ts +1 -1
- package/lib/server/handlers/claimTunnel.js +75 -73
- package/lib/server/handlers/completeClaimOnChain.d.ts +1 -1
- package/lib/server/handlers/completeClaimOnChain.js +27 -26
- package/lib/server/handlers/createClaimOnChain.d.ts +1 -1
- package/lib/server/handlers/createClaimOnChain.js +30 -29
- package/lib/server/handlers/createTaskOnMechain.d.ts +1 -1
- package/lib/server/handlers/createTaskOnMechain.js +54 -49
- package/lib/server/handlers/createTunnel.d.ts +1 -1
- package/lib/server/handlers/createTunnel.js +91 -94
- package/lib/server/handlers/disconnectTunnel.d.ts +1 -1
- package/lib/server/handlers/disconnectTunnel.js +6 -8
- package/lib/server/handlers/fetchCertificateBytes.d.ts +2 -0
- package/lib/server/handlers/fetchCertificateBytes.js +57 -0
- package/lib/server/handlers/index.d.ts +1 -1
- package/lib/server/handlers/index.js +24 -21
- package/lib/server/handlers/init.d.ts +1 -1
- package/lib/server/handlers/init.js +31 -34
- package/lib/server/handlers/toprf.d.ts +1 -1
- package/lib/server/handlers/toprf.js +17 -19
- package/lib/server/index.d.ts +4 -4
- package/lib/server/index.js +4 -21
- package/lib/server/socket.d.ts +7 -7
- package/lib/server/socket.js +104 -106
- package/lib/server/tunnels/make-tcp-tunnel.d.ts +5 -3
- package/lib/server/tunnels/make-tcp-tunnel.js +189 -162
- package/lib/server/utils/apm.d.ts +1 -1
- package/lib/server/utils/apm.js +26 -40
- package/lib/server/utils/assert-valid-claim-request.d.ts +6 -5
- package/lib/server/utils/assert-valid-claim-request.js +339 -185
- package/lib/server/utils/config-env.js +4 -7
- package/lib/server/utils/dns.js +18 -16
- package/lib/server/utils/gcp-attestation.d.ts +17 -0
- package/lib/server/utils/gcp-attestation.js +237 -0
- package/lib/server/utils/generics.d.ts +3 -3
- package/lib/server/utils/generics.js +37 -51
- package/lib/server/utils/iso.js +255 -256
- package/lib/server/utils/keep-alive.d.ts +2 -2
- package/lib/server/utils/keep-alive.js +36 -40
- package/lib/server/utils/nitro-attestation.d.ts +33 -0
- package/lib/server/utils/nitro-attestation.js +249 -0
- package/lib/server/utils/oprf-raw.d.ts +21 -0
- package/lib/server/utils/oprf-raw.js +61 -0
- package/lib/server/utils/process-handshake.d.ts +3 -3
- package/lib/server/utils/process-handshake.js +217 -175
- package/lib/server/utils/proxy-session.d.ts +1 -0
- package/lib/server/utils/proxy-session.js +6 -0
- package/lib/server/utils/tee-oprf-mpc-verification.d.ts +16 -0
- package/lib/server/utils/tee-oprf-mpc-verification.js +86 -0
- package/lib/server/utils/tee-oprf-verification.d.ts +24 -0
- package/lib/server/utils/tee-oprf-verification.js +151 -0
- package/lib/server/utils/tee-transcript-reconstruction.d.ts +24 -0
- package/lib/server/utils/tee-transcript-reconstruction.js +140 -0
- package/lib/server/utils/tee-verification.d.ts +28 -0
- package/lib/server/utils/tee-verification.js +358 -0
- package/lib/{utils → server/utils}/validation.d.ts +1 -1
- package/lib/server/utils/validation.js +45 -0
- package/lib/types/bgp.js +0 -3
- package/lib/types/claims.d.ts +7 -10
- package/lib/types/claims.js +0 -3
- package/lib/types/client.d.ts +5 -5
- package/lib/types/client.js +0 -3
- package/lib/types/general.d.ts +29 -4
- package/lib/types/general.js +0 -3
- package/lib/types/handlers.d.ts +3 -3
- package/lib/types/handlers.js +0 -3
- package/lib/types/index.d.ts +10 -10
- package/lib/types/index.js +10 -27
- package/lib/types/providers.d.ts +15 -4
- package/lib/types/providers.gen.d.ts +15 -1
- package/lib/types/providers.gen.js +15 -13
- package/lib/types/providers.js +0 -3
- package/lib/types/rpc.d.ts +2 -2
- package/lib/types/rpc.js +0 -3
- package/lib/types/signatures.js +0 -3
- package/lib/types/tunnel.d.ts +2 -2
- package/lib/types/tunnel.js +0 -3
- package/lib/types/zk.d.ts +17 -2
- package/lib/types/zk.js +0 -3
- package/lib/utils/auth.d.ts +2 -1
- package/lib/utils/auth.js +66 -59
- package/lib/utils/b64-json.js +13 -19
- package/lib/utils/bgp-listener.d.ts +1 -1
- package/lib/utils/bgp-listener.js +111 -114
- package/lib/utils/claims.d.ts +3 -3
- package/lib/utils/claims.js +78 -101
- package/lib/utils/env.js +15 -16
- package/lib/utils/error.d.ts +6 -7
- package/lib/utils/error.js +50 -39
- package/lib/utils/generics.d.ts +15 -13
- package/lib/utils/generics.js +217 -297
- package/lib/utils/http-parser.d.ts +1 -1
- package/lib/utils/http-parser.js +186 -237
- package/lib/utils/index.d.ts +13 -12
- package/lib/utils/index.js +13 -29
- package/lib/utils/logger.d.ts +1 -1
- package/lib/utils/logger.js +69 -87
- package/lib/utils/prepare-packets.d.ts +3 -3
- package/lib/utils/prepare-packets.js +66 -58
- package/lib/utils/redactions.d.ts +20 -1
- package/lib/utils/redactions.js +116 -129
- package/lib/utils/retries.d.ts +1 -1
- package/lib/utils/retries.js +24 -26
- package/lib/utils/signatures/eth.d.ts +1 -1
- package/lib/utils/signatures/eth.js +28 -30
- package/lib/utils/signatures/index.d.ts +3 -3
- package/lib/utils/signatures/index.js +11 -10
- package/lib/utils/socket-base.d.ts +6 -5
- package/lib/utils/socket-base.js +89 -88
- package/lib/utils/tls.d.ts +1 -1
- package/lib/utils/tls.js +54 -28
- package/lib/utils/ws.d.ts +1 -6
- package/lib/utils/ws.js +17 -33
- package/lib/utils/zk.d.ts +28 -12
- package/lib/utils/zk.js +587 -406
- package/package.json +72 -60
- package/lib/avs/tests/test.operator.d.ts +0 -11
- package/lib/avs/tests/test.operator.js +0 -313
- package/lib/avs/tests/utils.d.ts +0 -2
- package/lib/avs/tests/utils.js +0 -50
- package/lib/scripts/verify-root-ca.d.ts +0 -1
- package/lib/scripts/verify-root-ca.js +0 -51
- package/lib/tests/describe-with-server.d.ts +0 -20
- package/lib/tests/describe-with-server.js +0 -64
- package/lib/tests/mock-provider-server.d.ts +0 -13
- package/lib/tests/mock-provider-server.js +0 -65
- package/lib/tests/mocks.d.ts +0 -4
- package/lib/tests/mocks.js +0 -23
- package/lib/tests/test.auth.js +0 -75
- package/lib/tests/test.bgp-listener.js +0 -169
- package/lib/tests/test.claim-creation.js +0 -280
- package/lib/tests/test.http-parser.d.ts +0 -1
- package/lib/tests/test.http-parser.js +0 -120
- package/lib/tests/test.http-provider-utils.js +0 -2416
- package/lib/tests/test.http-provider.d.ts +0 -1
- package/lib/tests/test.http-provider.js +0 -114
- package/lib/tests/test.rpc-communication.d.ts +0 -1
- package/lib/tests/test.rpc-communication.js +0 -64
- package/lib/tests/test.rpc-tunnel.d.ts +0 -1
- package/lib/tests/test.rpc-tunnel.js +0 -172
- package/lib/tests/test.signatures.d.ts +0 -1
- package/lib/tests/test.signatures.js +0 -24
- package/lib/tests/test.tcp-tunnel.d.ts +0 -1
- package/lib/tests/test.tcp-tunnel.js +0 -64
- package/lib/tests/test.zk.d.ts +0 -1
- package/lib/tests/test.zk.js +0 -337
- package/lib/tests/utils.d.ts +0 -18
- package/lib/tests/utils.js +0 -64
- package/lib/utils/atomic-operations.d.ts +0 -24
- package/lib/utils/atomic-operations.js +0 -65
- package/lib/utils/benchmark.d.ts +0 -1
- package/lib/utils/benchmark.js +0 -70
- package/lib/utils/connection-state-machine.d.ts +0 -43
- package/lib/utils/connection-state-machine.js +0 -129
- package/lib/utils/resource-monitor.d.ts +0 -61
- package/lib/utils/resource-monitor.js +0 -107
- package/lib/utils/validation.js +0 -46
- package/lib/window-rpc/index.d.ts +0 -3
- package/lib/window-rpc/index.js +0 -20
- package/lib/window-rpc/setup-window-rpc.d.ts +0 -5
- package/lib/window-rpc/setup-window-rpc.js +0 -291
- package/lib/window-rpc/types.js +0 -3
- package/lib/window-rpc/utils.d.ts +0 -14
- package/lib/window-rpc/utils.js +0 -102
- package/lib/window-rpc/window-rpc-zk.d.ts +0 -15
- package/lib/window-rpc/window-rpc-zk.js +0 -85
- /package/lib/{tests/test.auth.d.ts → external-rpc/jsc-polyfills/2.d.ts} +0 -0
- /package/lib/{tests/test.bgp-listener.d.ts → scripts/build-browser.d.ts} +0 -0
- /package/lib/{tests/test.claim-creation.d.ts → scripts/build-jsc.d.ts} +0 -0
- /package/lib/{tests/test.http-provider-utils.d.ts → scripts/build-lib.d.ts} +0 -0
|
@@ -1,613 +1,640 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
import { areUint8ArraysEqual, concatenateUint8Arrays, uint8ArrayToBinaryStr } from "@reclaimprotocol/tls";
|
|
2
|
+
import { encodeBase64 } from "ethers";
|
|
3
|
+
import { DEFAULT_HTTPS_PORT, RECLAIM_USER_AGENT } from "../../config/index.js";
|
|
4
|
+
import { AttestorVersion } from "../../proto/api.js";
|
|
5
|
+
import {
|
|
6
|
+
buildHeaders,
|
|
7
|
+
convertResponsePosToAbsolutePos,
|
|
8
|
+
extractHTMLElementsIndexes,
|
|
9
|
+
extractJSONValueIndexes,
|
|
10
|
+
getRedactionsForChunkHeaders,
|
|
11
|
+
makeRegex,
|
|
12
|
+
matchRedactedStrings,
|
|
13
|
+
parseHttpResponse
|
|
14
|
+
} from "../../providers/http/utils.js";
|
|
15
|
+
import { isValidProxySessionId } from "../../server/utils/proxy-session.js";
|
|
16
|
+
import {
|
|
17
|
+
findIndexInUint8Array,
|
|
18
|
+
getHttpRequestDataFromTranscript,
|
|
19
|
+
logger,
|
|
20
|
+
REDACTION_CHAR_CODE,
|
|
21
|
+
strToUint8Array,
|
|
22
|
+
uint8ArrayToStr
|
|
23
|
+
} from "../../utils/index.js";
|
|
24
|
+
const OK_HTTP_HEADER = "HTTP/1.1 200";
|
|
25
|
+
const dateHeaderRegex = "[dD]ate: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), (?:[0-3][0-9]) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (?:[0-9]{4}) (?:[01][0-9]|2[0-3])(?::[0-5][0-9]){2} GMT)";
|
|
26
|
+
const dateDiff = 1e3 * 60 * 10;
|
|
12
27
|
const HTTP_PROVIDER = {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
switch (type) {
|
|
275
|
-
case 'regex':
|
|
276
|
-
const regexRes = (0, utils_2.makeRegex)(value).exec(res);
|
|
277
|
-
const match = regexRes !== null;
|
|
278
|
-
if (match === inv) { // if both true or both false then fail
|
|
279
|
-
throw new Error('Invalid receipt.'
|
|
280
|
-
+ ` Regex "${value}" ${invert ? 'matched' : "didn't match"}`);
|
|
281
|
-
}
|
|
282
|
-
if (!match) {
|
|
283
|
-
continue;
|
|
284
|
-
}
|
|
285
|
-
const groups = regexRes === null || regexRes === void 0 ? void 0 : regexRes.groups;
|
|
286
|
-
for (const paramName in groups || []) {
|
|
287
|
-
if (paramName in extractedParams) {
|
|
288
|
-
throw new Error(`Duplicate parameter ${paramName}`);
|
|
289
|
-
}
|
|
290
|
-
extractedParams[paramName] = groups[paramName];
|
|
291
|
-
}
|
|
292
|
-
break;
|
|
293
|
-
case 'contains':
|
|
294
|
-
const includes = res.includes(value);
|
|
295
|
-
if (includes === inv) {
|
|
296
|
-
throw new Error(`Invalid receipt. Response ${invert ? 'contains' : 'does not contain'} "${value}"`);
|
|
297
|
-
}
|
|
298
|
-
break;
|
|
299
|
-
default:
|
|
300
|
-
throw new Error(`Invalid response match type ${type}`);
|
|
28
|
+
hostPort: getHostPort,
|
|
29
|
+
writeRedactionMode(params) {
|
|
30
|
+
return "writeRedactionMode" in params ? params.writeRedactionMode : void 0;
|
|
31
|
+
},
|
|
32
|
+
geoLocation(params, secretParams) {
|
|
33
|
+
return "geoLocation" in params ? getGeoLocation(params, secretParams) : void 0;
|
|
34
|
+
},
|
|
35
|
+
proxySessionId(params, secretParams) {
|
|
36
|
+
return "proxySessionId" in params ? getProxySessionId(params, secretParams) : void 0;
|
|
37
|
+
},
|
|
38
|
+
additionalClientOptions(params) {
|
|
39
|
+
let defaultOptions = {
|
|
40
|
+
applicationLayerProtocols: ["http/1.1"]
|
|
41
|
+
};
|
|
42
|
+
if ("additionalClientOptions" in params) {
|
|
43
|
+
defaultOptions = {
|
|
44
|
+
...defaultOptions,
|
|
45
|
+
...params.additionalClientOptions
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
return defaultOptions;
|
|
49
|
+
},
|
|
50
|
+
createRequest(secretParams, params, logger2) {
|
|
51
|
+
if (!secretParams.cookieStr && !secretParams.authorisationHeader && !secretParams.headers) {
|
|
52
|
+
throw new Error("auth parameters are not set");
|
|
53
|
+
}
|
|
54
|
+
const pubHeaders = params.headers || {};
|
|
55
|
+
const secHeaders = { ...secretParams.headers };
|
|
56
|
+
if (secretParams.cookieStr) {
|
|
57
|
+
secHeaders["Cookie"] = secretParams.cookieStr;
|
|
58
|
+
}
|
|
59
|
+
if (secretParams.authorisationHeader) {
|
|
60
|
+
secHeaders["Authorization"] = secretParams.authorisationHeader;
|
|
61
|
+
}
|
|
62
|
+
const hasUserAgent = Object.keys(pubHeaders).some((k) => k.toLowerCase() === "user-agent") || Object.keys(secHeaders).some((k) => k.toLowerCase() === "user-agent");
|
|
63
|
+
if (!hasUserAgent) {
|
|
64
|
+
pubHeaders["User-Agent"] = RECLAIM_USER_AGENT;
|
|
65
|
+
}
|
|
66
|
+
const newParams = substituteParamValues(params, secretParams);
|
|
67
|
+
params = newParams.newParams;
|
|
68
|
+
const url = new URL(params.url);
|
|
69
|
+
const { pathname } = url;
|
|
70
|
+
const searchParams = params.url.includes("?") ? params.url.split("?")[1] : "";
|
|
71
|
+
logger2.info({ url: params.url, path: pathname, query: searchParams.toString() });
|
|
72
|
+
const body = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
|
|
73
|
+
const contentLength = body.length;
|
|
74
|
+
const reqLine = `${params.method} ${pathname}${searchParams?.length ? "?" + searchParams : ""} HTTP/1.1`;
|
|
75
|
+
const secHeadersList = buildHeaders(secHeaders);
|
|
76
|
+
logger2.info({ requestLine: reqLine });
|
|
77
|
+
const httpReqHeaderStr = [
|
|
78
|
+
reqLine,
|
|
79
|
+
`Host: ${getHostHeaderString(url)}`,
|
|
80
|
+
`Content-Length: ${contentLength}`,
|
|
81
|
+
"Connection: close",
|
|
82
|
+
//no compression
|
|
83
|
+
"Accept-Encoding: identity",
|
|
84
|
+
...buildHeaders(pubHeaders),
|
|
85
|
+
...secHeadersList,
|
|
86
|
+
"\r\n"
|
|
87
|
+
].join("\r\n");
|
|
88
|
+
const headerStr = strToUint8Array(httpReqHeaderStr);
|
|
89
|
+
const data = concatenateUint8Arrays([headerStr, body]);
|
|
90
|
+
const secHeadersStr = secHeadersList.join("\r\n");
|
|
91
|
+
const tokenStartIndex = findIndexInUint8Array(data, strToUint8Array(secHeadersStr));
|
|
92
|
+
const redactions = [
|
|
93
|
+
{
|
|
94
|
+
fromIndex: tokenStartIndex,
|
|
95
|
+
toIndex: tokenStartIndex + secHeadersStr.length
|
|
96
|
+
}
|
|
97
|
+
];
|
|
98
|
+
if (newParams.hiddenBodyParts?.length > 0) {
|
|
99
|
+
for (const hiddenBodyPart of newParams.hiddenBodyParts) {
|
|
100
|
+
if (hiddenBodyPart.length) {
|
|
101
|
+
redactions.push({
|
|
102
|
+
fromIndex: headerStr.length + hiddenBodyPart.index,
|
|
103
|
+
toIndex: headerStr.length + hiddenBodyPart.index + hiddenBodyPart.length
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
if (newParams.hiddenURLParts?.length > 0) {
|
|
109
|
+
for (const hiddenURLPart of newParams.hiddenURLParts) {
|
|
110
|
+
if (hiddenURLPart.length) {
|
|
111
|
+
redactions.push({
|
|
112
|
+
fromIndex: hiddenURLPart.index,
|
|
113
|
+
toIndex: hiddenURLPart.index + hiddenURLPart.length
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
redactions.sort((a, b) => a.toIndex - b.toIndex);
|
|
119
|
+
return {
|
|
120
|
+
data,
|
|
121
|
+
redactions
|
|
122
|
+
};
|
|
123
|
+
},
|
|
124
|
+
getResponseRedactions({ response, params: rawParams, logger: logger2, ctx }) {
|
|
125
|
+
logger2.debug({ response: encodeBase64(response), params: rawParams });
|
|
126
|
+
const res = parseHttpResponse(response);
|
|
127
|
+
if (!rawParams.responseRedactions?.length) {
|
|
128
|
+
return [];
|
|
129
|
+
}
|
|
130
|
+
if (res.statusCode / 100 >> 0 !== 2) {
|
|
131
|
+
logger2.error({ response: encodeBase64(response), params: rawParams });
|
|
132
|
+
throw new Error(
|
|
133
|
+
`Expected status 2xx, got ${res.statusCode} (${res.statusMessage})`
|
|
134
|
+
);
|
|
135
|
+
}
|
|
136
|
+
const newParams = substituteParamValues(rawParams, void 0, true);
|
|
137
|
+
const params = newParams.newParams;
|
|
138
|
+
const headerEndIndex = res.statusLineEndIndex;
|
|
139
|
+
const bodyStartIdx = res.bodyStartIndex ?? 0;
|
|
140
|
+
if (bodyStartIdx < 4) {
|
|
141
|
+
logger2.error({ response: encodeBase64(response) });
|
|
142
|
+
throw new Error("Failed to find response body");
|
|
143
|
+
}
|
|
144
|
+
const reveals = [
|
|
145
|
+
{ fromIndex: 0, toIndex: headerEndIndex }
|
|
146
|
+
];
|
|
147
|
+
if (shouldRevealCrlf(ctx)) {
|
|
148
|
+
const crlfs = response.slice(res.headerEndIdx, res.headerEndIdx + 4);
|
|
149
|
+
if (!areUint8ArraysEqual(crlfs, strToUint8Array("\r\n\r\n"))) {
|
|
150
|
+
logger2.error({ response: encodeBase64(response) });
|
|
151
|
+
throw new Error(
|
|
152
|
+
`Failed to find header/body separator at index ${res.headerEndIdx}`
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
reveals.push({ fromIndex: res.headerEndIdx, toIndex: res.headerEndIdx + 4 });
|
|
157
|
+
if (res.headerIndices["date"]) {
|
|
158
|
+
reveals.push(res.headerIndices["date"]);
|
|
159
|
+
}
|
|
160
|
+
const body = uint8ArrayToBinaryStr(res.body);
|
|
161
|
+
const redactions = [];
|
|
162
|
+
for (const rs of params.responseRedactions || []) {
|
|
163
|
+
const processor = processRedactionRequest(
|
|
164
|
+
body,
|
|
165
|
+
rs,
|
|
166
|
+
bodyStartIdx,
|
|
167
|
+
res.chunks
|
|
168
|
+
);
|
|
169
|
+
for (const { reveal, redactions: reds } of processor) {
|
|
170
|
+
reveals.push(reveal);
|
|
171
|
+
redactions.push(...reds);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
reveals.sort((a, b) => a.toIndex - b.toIndex);
|
|
175
|
+
if (reveals.length > 1) {
|
|
176
|
+
let currentIndex = 0;
|
|
177
|
+
for (const r of reveals) {
|
|
178
|
+
if (currentIndex < r.fromIndex) {
|
|
179
|
+
redactions.push({ fromIndex: currentIndex, toIndex: r.fromIndex });
|
|
180
|
+
}
|
|
181
|
+
currentIndex = r.toIndex;
|
|
182
|
+
}
|
|
183
|
+
redactions.push({ fromIndex: currentIndex, toIndex: response.length });
|
|
184
|
+
}
|
|
185
|
+
for (const r of reveals) {
|
|
186
|
+
if (!r.hash) {
|
|
187
|
+
continue;
|
|
188
|
+
}
|
|
189
|
+
redactions.push(r);
|
|
190
|
+
}
|
|
191
|
+
redactions.sort((a, b) => a.toIndex - b.toIndex);
|
|
192
|
+
return redactions;
|
|
193
|
+
},
|
|
194
|
+
assertValidProviderReceipt({ receipt, params: paramsAny, logger: logger2, ctx }) {
|
|
195
|
+
logTranscript();
|
|
196
|
+
let extractedParams = {};
|
|
197
|
+
const secretParams = "secretParams" in paramsAny ? paramsAny.secretParams : void 0;
|
|
198
|
+
const newParams = substituteParamValues(paramsAny, secretParams, !secretParams);
|
|
199
|
+
const params = newParams.newParams;
|
|
200
|
+
extractedParams = { ...extractedParams, ...newParams.extractedValues };
|
|
201
|
+
const req = getHttpRequestDataFromTranscript(receipt);
|
|
202
|
+
if (req.method !== params.method.toLowerCase()) {
|
|
203
|
+
throw new Error(`Invalid method: ${req.method}`);
|
|
204
|
+
}
|
|
205
|
+
const url = new URL(params.url);
|
|
206
|
+
const { protocol, pathname } = url;
|
|
207
|
+
if (protocol !== "https:") {
|
|
208
|
+
logger2.error("params URL: %s", params.url);
|
|
209
|
+
throw new Error(`Expected protocol: https, found: ${protocol}`);
|
|
210
|
+
}
|
|
211
|
+
const searchParams = params.url.includes("?") ? params.url.split("?")[1] : "";
|
|
212
|
+
const expectedPath = pathname.replaceAll("%7B", "{").replaceAll("%7D", "}") + (searchParams?.length ? "?" + searchParams : "");
|
|
213
|
+
if (!matchRedactedStrings(strToUint8Array(expectedPath), strToUint8Array(req.url))) {
|
|
214
|
+
logger2.error("params URL: %s", params.url);
|
|
215
|
+
throw new Error(`Expected path: ${expectedPath}, found: ${req.url}`);
|
|
216
|
+
}
|
|
217
|
+
const expectedHostStr = getHostHeaderString(url);
|
|
218
|
+
if (req.headers.host !== expectedHostStr) {
|
|
219
|
+
throw new Error(`Expected host: ${expectedHostStr}, found: ${req.headers.host}`);
|
|
220
|
+
}
|
|
221
|
+
const connectionHeader = req.headers["connection"];
|
|
222
|
+
if (connectionHeader !== "close") {
|
|
223
|
+
throw new Error(`Connection header must be "close", got "${connectionHeader}"`);
|
|
224
|
+
}
|
|
225
|
+
const serverBlocks = receipt.filter((s) => s.sender === "server").map((r) => r.message).filter((b) => !b.every((b2) => b2 === REDACTION_CHAR_CODE));
|
|
226
|
+
const response = concatArrays(...serverBlocks);
|
|
227
|
+
let res;
|
|
228
|
+
res = uint8ArrayToStr(response);
|
|
229
|
+
const okRegex = makeRegex("^HTTP\\/1.1 2\\d{2}");
|
|
230
|
+
const matchRes = okRegex.exec(res);
|
|
231
|
+
if (!matchRes) {
|
|
232
|
+
const statusRegex = makeRegex("^HTTP\\/1.1 (\\d{3})");
|
|
233
|
+
const matchRes2 = statusRegex.exec(res);
|
|
234
|
+
if (matchRes2 && matchRes2.length > 1) {
|
|
235
|
+
throw new Error(`Provider returned error ${matchRes2[1]}`);
|
|
236
|
+
}
|
|
237
|
+
let lineEnd = res.indexOf("*");
|
|
238
|
+
if (lineEnd === -1) {
|
|
239
|
+
lineEnd = res.indexOf("\n");
|
|
240
|
+
}
|
|
241
|
+
if (lineEnd === -1) {
|
|
242
|
+
lineEnd = OK_HTTP_HEADER.length;
|
|
243
|
+
}
|
|
244
|
+
throw new Error(
|
|
245
|
+
`Response did not start with "HTTP/1.1 2XX" got "${res.slice(0, lineEnd)}"`
|
|
246
|
+
);
|
|
247
|
+
}
|
|
248
|
+
let bodyStart;
|
|
249
|
+
if (shouldRevealCrlf(ctx)) {
|
|
250
|
+
bodyStart = res.indexOf("\r\n\r\n", OK_HTTP_HEADER.length) + 4;
|
|
251
|
+
if (bodyStart < 4) {
|
|
252
|
+
throw new Error("Response body start not found");
|
|
253
|
+
}
|
|
254
|
+
} else {
|
|
255
|
+
bodyStart = OK_HTTP_HEADER.length;
|
|
256
|
+
}
|
|
257
|
+
const dateHeader = makeRegex(dateHeaderRegex).exec(res);
|
|
258
|
+
if (dateHeader && dateHeader.length > 1) {
|
|
259
|
+
const serverDate = new Date(dateHeader[1]);
|
|
260
|
+
if (Date.now() - serverDate.getTime() > dateDiff) {
|
|
261
|
+
logger2.info({ dateHeader: dateHeader[0], current: Date.now() }, "date header is off");
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
const paramBody = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
|
|
265
|
+
if (paramBody.length > 0 && !matchRedactedStrings(paramBody, req.body)) {
|
|
266
|
+
throw new Error("request body mismatch");
|
|
267
|
+
}
|
|
268
|
+
if (!secretParams) {
|
|
269
|
+
res = res.slice(bodyStart).replace(/(\*){3,}/g, "");
|
|
270
|
+
}
|
|
271
|
+
for (const { type, value, invert } of params.responseMatches || []) {
|
|
272
|
+
const inv = Boolean(invert);
|
|
273
|
+
switch (type) {
|
|
274
|
+
case "regex":
|
|
275
|
+
const regexRes = makeRegex(value).exec(res);
|
|
276
|
+
const match = regexRes !== null;
|
|
277
|
+
if (match === inv) {
|
|
278
|
+
throw new Error(
|
|
279
|
+
`Invalid receipt. Regex "${value}" ${invert ? "matched" : "didn't match"}`
|
|
280
|
+
);
|
|
281
|
+
}
|
|
282
|
+
if (!match) {
|
|
283
|
+
continue;
|
|
284
|
+
}
|
|
285
|
+
const groups = regexRes?.groups;
|
|
286
|
+
for (const paramName in groups || []) {
|
|
287
|
+
if (paramName in extractedParams) {
|
|
288
|
+
throw new Error(`Duplicate parameter ${paramName}`);
|
|
301
289
|
}
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
const merged = new Uint8Array(totalSize);
|
|
306
|
-
let lenDone = 0;
|
|
307
|
-
for (const array of bufs) {
|
|
308
|
-
merged.set(array, lenDone);
|
|
309
|
-
lenDone += array.length;
|
|
290
|
+
const value2 = groups?.[paramName];
|
|
291
|
+
if (typeof value2 !== "string") {
|
|
292
|
+
continue;
|
|
310
293
|
}
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
294
|
+
extractedParams[paramName] = value2;
|
|
295
|
+
}
|
|
296
|
+
break;
|
|
297
|
+
case "contains":
|
|
298
|
+
const includes = res.includes(value);
|
|
299
|
+
if (includes === inv) {
|
|
300
|
+
throw new Error(
|
|
301
|
+
`Invalid receipt. Response ${invert ? "contains" : "does not contain"} "${value}"`
|
|
302
|
+
);
|
|
303
|
+
}
|
|
304
|
+
break;
|
|
305
|
+
default:
|
|
306
|
+
throw new Error(`Invalid response match type ${type}`);
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
function concatArrays(...bufs) {
|
|
310
|
+
const totalSize = bufs.reduce((acc, e) => acc + e.length, 0);
|
|
311
|
+
const merged = new Uint8Array(totalSize);
|
|
312
|
+
let lenDone = 0;
|
|
313
|
+
for (const array of bufs) {
|
|
314
|
+
merged.set(array, lenDone);
|
|
315
|
+
lenDone += array.length;
|
|
316
|
+
}
|
|
317
|
+
return merged;
|
|
318
|
+
}
|
|
319
|
+
return { extractedParameters: extractedParams };
|
|
320
|
+
function logTranscript() {
|
|
321
|
+
const clientMsgs = receipt.filter((s) => s.sender === "client").map((m) => m.message);
|
|
322
|
+
const serverMsgs = receipt.filter((s) => s.sender === "server").map((m) => m.message);
|
|
323
|
+
const clientTranscript = encodeBase64(concatenateUint8Arrays(clientMsgs));
|
|
324
|
+
const serverTranscript = encodeBase64(concatenateUint8Arrays(serverMsgs));
|
|
325
|
+
logger2.debug({ request: clientTranscript, response: serverTranscript, params: paramsAny });
|
|
326
|
+
}
|
|
327
|
+
}
|
|
322
328
|
};
|
|
323
|
-
// revealing CRLF is a breaking change -- and should only be done
|
|
324
|
-
// if the client's version supports it
|
|
325
329
|
function shouldRevealCrlf({ version }) {
|
|
326
|
-
|
|
330
|
+
return version >= AttestorVersion.ATTESTOR_VERSION_2_0_1;
|
|
327
331
|
}
|
|
328
332
|
function getHostPort(params, secretParams) {
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
333
|
+
const { host } = new URL(getURL(params, secretParams));
|
|
334
|
+
if (!host) {
|
|
335
|
+
throw new Error("url is incorrect");
|
|
336
|
+
}
|
|
337
|
+
return host;
|
|
334
338
|
}
|
|
335
|
-
/**
|
|
336
|
-
* Obtain the host header string from the URL.
|
|
337
|
-
* https://stackoverflow.com/a/3364396
|
|
338
|
-
*/
|
|
339
339
|
function getHostHeaderString(url) {
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
? `${host}:${port}`
|
|
344
|
-
: host;
|
|
340
|
+
const host = url.hostname;
|
|
341
|
+
const port = url.port;
|
|
342
|
+
return port && +port !== DEFAULT_HTTPS_PORT ? `${host}:${port}` : host;
|
|
345
343
|
}
|
|
346
344
|
const paramsRegex = /{{([^{}]+)}}/sgi;
|
|
347
345
|
function* processRedactionRequest(body, rs, bodyStartIdx, resChunks) {
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
yield* processJsonPath();
|
|
359
|
-
}
|
|
360
|
-
else if (rs.regex) {
|
|
361
|
-
yield* processRegexp();
|
|
362
|
-
}
|
|
363
|
-
else {
|
|
364
|
-
yield* addRedaction();
|
|
365
|
-
}
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
else if (rs.jsonPath) {
|
|
346
|
+
let element = body;
|
|
347
|
+
let elementIdx = 0;
|
|
348
|
+
let elementLength = -1;
|
|
349
|
+
if (rs.xPath) {
|
|
350
|
+
const indexes = extractHTMLElementsIndexes(body, rs.xPath, !!rs.jsonPath);
|
|
351
|
+
for (const { start, end } of indexes) {
|
|
352
|
+
element = body.slice(start, end);
|
|
353
|
+
elementIdx = start;
|
|
354
|
+
elementLength = end - start;
|
|
355
|
+
if (rs.jsonPath) {
|
|
369
356
|
yield* processJsonPath();
|
|
357
|
+
} else if (rs.regex) {
|
|
358
|
+
yield* processRegexp();
|
|
359
|
+
} else {
|
|
360
|
+
yield* addRedaction();
|
|
361
|
+
}
|
|
370
362
|
}
|
|
371
|
-
|
|
363
|
+
} else if (rs.jsonPath) {
|
|
364
|
+
yield* processJsonPath();
|
|
365
|
+
} else if (rs.regex) {
|
|
366
|
+
yield* processRegexp();
|
|
367
|
+
} else {
|
|
368
|
+
throw new Error(
|
|
369
|
+
"Expected either xPath, jsonPath or regex for redaction"
|
|
370
|
+
);
|
|
371
|
+
}
|
|
372
|
+
function* processJsonPath() {
|
|
373
|
+
const jsonPathIndexes = extractJSONValueIndexes(element, rs.jsonPath);
|
|
374
|
+
const eIndex = elementIdx;
|
|
375
|
+
for (const ji of jsonPathIndexes) {
|
|
376
|
+
const jStart = ji.start;
|
|
377
|
+
const jEnd = ji.end;
|
|
378
|
+
element = body.slice(eIndex + jStart, eIndex + jEnd);
|
|
379
|
+
elementIdx = eIndex + jStart;
|
|
380
|
+
elementLength = jEnd - jStart;
|
|
381
|
+
if (rs.regex) {
|
|
372
382
|
yield* processRegexp();
|
|
383
|
+
} else {
|
|
384
|
+
yield* addRedaction();
|
|
385
|
+
}
|
|
373
386
|
}
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
// eslint-disable-next-line max-depth
|
|
388
|
-
if (rs.regex) {
|
|
389
|
-
yield* processRegexp();
|
|
390
|
-
}
|
|
391
|
-
else {
|
|
392
|
-
yield* addRedaction();
|
|
393
|
-
}
|
|
394
|
-
}
|
|
387
|
+
}
|
|
388
|
+
function* processRegexp() {
|
|
389
|
+
logger.debug({
|
|
390
|
+
element: encodeBase64(strToUint8Array(element)),
|
|
391
|
+
body: encodeBase64(strToUint8Array(body))
|
|
392
|
+
});
|
|
393
|
+
const regexp = makeRegex(rs.regex);
|
|
394
|
+
const elem = element || body;
|
|
395
|
+
const match = regexp.exec(elem);
|
|
396
|
+
if (!match?.[0]) {
|
|
397
|
+
throw new Error(
|
|
398
|
+
`regexp ${rs.regex} does not match found element '${encodeBase64(strToUint8Array(elem))}'`
|
|
399
|
+
);
|
|
395
400
|
}
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
element = match[0];
|
|
408
|
-
if (rs.hash && (!match.groups || Object.keys(match.groups).length > 1)) {
|
|
409
|
-
throw new Error('Exactly one named capture group is needed per hashed redaction');
|
|
410
|
-
}
|
|
411
|
-
// if there are groups in the regex,
|
|
412
|
-
// we'll only hash the group values
|
|
413
|
-
if (!rs.hash || !match.groups) {
|
|
414
|
-
yield* addRedaction();
|
|
415
|
-
return;
|
|
416
|
-
}
|
|
417
|
-
const fullStr = match[0];
|
|
418
|
-
const grp = Object.values(match.groups)[0];
|
|
419
|
-
const grpIdx = fullStr.indexOf(grp);
|
|
420
|
-
// don't hash the entire regex, we'll hash the group values
|
|
421
|
-
elementLength = grpIdx;
|
|
422
|
-
element = fullStr.slice(0, grpIdx);
|
|
423
|
-
yield* addRedaction(null);
|
|
424
|
-
elementIdx += grpIdx;
|
|
425
|
-
element = grp;
|
|
426
|
-
elementLength = grp.length;
|
|
427
|
-
const reveal = getReveal(elementIdx, elementLength, rs.hash);
|
|
428
|
-
const chunkReds = (0, utils_2.getRedactionsForChunkHeaders)(reveal.fromIndex, reveal.toIndex, resChunks);
|
|
429
|
-
if (chunkReds.length) {
|
|
430
|
-
throw new Error('Hash redactions cannot be performed if '
|
|
431
|
-
+ 'the redacted string is split between 2'
|
|
432
|
-
+ ' or more HTTP chunks');
|
|
433
|
-
}
|
|
434
|
-
yield { reveal, redactions: chunkReds };
|
|
435
|
-
elementIdx += grp.length;
|
|
436
|
-
element = fullStr.slice(grpIdx + grp.length);
|
|
437
|
-
elementLength = element.length;
|
|
438
|
-
yield* addRedaction(null);
|
|
439
|
-
}
|
|
440
|
-
// eslint-disable-next-line unicorn/consistent-function-scoping
|
|
441
|
-
function* addRedaction(hash = rs.hash, _resChunks = resChunks) {
|
|
442
|
-
if (elementIdx < 0 || !elementLength) {
|
|
443
|
-
return;
|
|
444
|
-
}
|
|
445
|
-
const reveal = getReveal(elementIdx, elementLength, hash || undefined);
|
|
446
|
-
yield {
|
|
447
|
-
reveal,
|
|
448
|
-
redactions: (0, utils_2.getRedactionsForChunkHeaders)(reveal.fromIndex, reveal.toIndex, _resChunks)
|
|
449
|
-
};
|
|
401
|
+
elementIdx += match.index;
|
|
402
|
+
elementLength = regexp.lastIndex - match.index;
|
|
403
|
+
element = match[0];
|
|
404
|
+
if (rs.hash && (!match.groups || Object.keys(match.groups).length > 1)) {
|
|
405
|
+
throw new Error(
|
|
406
|
+
"Exactly one named capture group is needed per hashed redaction"
|
|
407
|
+
);
|
|
408
|
+
}
|
|
409
|
+
if (!rs.hash || !match.groups) {
|
|
410
|
+
yield* addRedaction();
|
|
411
|
+
return;
|
|
450
412
|
}
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
413
|
+
const fullStr = match[0];
|
|
414
|
+
const grp = Object.values(match.groups)[0];
|
|
415
|
+
const grpIdx = fullStr.indexOf(grp);
|
|
416
|
+
elementLength = grpIdx;
|
|
417
|
+
element = fullStr.slice(0, grpIdx);
|
|
418
|
+
yield* addRedaction(null);
|
|
419
|
+
elementIdx += grpIdx;
|
|
420
|
+
element = grp;
|
|
421
|
+
elementLength = grp.length;
|
|
422
|
+
const reveal = getReveal(elementIdx, elementLength, rs.hash);
|
|
423
|
+
const chunkReds = getRedactionsForChunkHeaders(reveal.fromIndex, reveal.toIndex, resChunks);
|
|
424
|
+
if (chunkReds.length) {
|
|
425
|
+
throw new Error(
|
|
426
|
+
"Hash redactions cannot be performed if the redacted string is split between 2 or more HTTP chunks"
|
|
427
|
+
);
|
|
455
428
|
}
|
|
429
|
+
yield { reveal, redactions: chunkReds };
|
|
430
|
+
elementIdx += grp.length;
|
|
431
|
+
element = fullStr.slice(grpIdx + grp.length);
|
|
432
|
+
elementLength = element.length;
|
|
433
|
+
yield* addRedaction(null);
|
|
434
|
+
}
|
|
435
|
+
function* addRedaction(hash = rs.hash, _resChunks = resChunks) {
|
|
436
|
+
if (elementIdx < 0 || !elementLength) {
|
|
437
|
+
return;
|
|
438
|
+
}
|
|
439
|
+
const reveal = getReveal(elementIdx, elementLength, hash || void 0);
|
|
440
|
+
yield {
|
|
441
|
+
reveal,
|
|
442
|
+
redactions: getRedactionsForChunkHeaders(
|
|
443
|
+
reveal.fromIndex,
|
|
444
|
+
reveal.toIndex,
|
|
445
|
+
_resChunks
|
|
446
|
+
)
|
|
447
|
+
};
|
|
448
|
+
}
|
|
449
|
+
function getReveal(startIdx, len, hash) {
|
|
450
|
+
const from = convertResponsePosToAbsolutePos(
|
|
451
|
+
startIdx,
|
|
452
|
+
bodyStartIdx,
|
|
453
|
+
resChunks
|
|
454
|
+
);
|
|
455
|
+
const to = convertResponsePosToAbsolutePos(
|
|
456
|
+
startIdx + len,
|
|
457
|
+
bodyStartIdx,
|
|
458
|
+
resChunks
|
|
459
|
+
);
|
|
460
|
+
return { fromIndex: from, toIndex: to, hash };
|
|
461
|
+
}
|
|
456
462
|
}
|
|
457
463
|
function substituteParamValues(currentParams, secretParams, ignoreMissingParams) {
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
}
|
|
464
|
+
const params = JSON.parse(JSON.stringify(currentParams));
|
|
465
|
+
let extractedValues = {};
|
|
466
|
+
const hiddenURLParts = [];
|
|
467
|
+
const urlParams = extractAndReplaceTemplateValues(params.url, ignoreMissingParams);
|
|
468
|
+
if (urlParams) {
|
|
469
|
+
params.url = urlParams.newParam;
|
|
470
|
+
extractedValues = { ...urlParams.extractedValues };
|
|
471
|
+
if (urlParams.hiddenParts.length) {
|
|
472
|
+
const host = getHostHeaderString(new URL(params.url));
|
|
473
|
+
const offset = `https://${host}`.length - currentParams.method.length - 1;
|
|
474
|
+
for (const hiddenURLPart of urlParams.hiddenParts) {
|
|
475
|
+
hiddenURLParts.push({ index: hiddenURLPart.index - offset, length: hiddenURLPart.length });
|
|
476
|
+
}
|
|
472
477
|
}
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
478
|
+
}
|
|
479
|
+
let bodyParams;
|
|
480
|
+
let hiddenBodyParts = [];
|
|
481
|
+
if (params.body) {
|
|
482
|
+
const strBody = typeof params.body === "string" ? params.body : uint8ArrayToStr(params.body);
|
|
483
|
+
bodyParams = extractAndReplaceTemplateValues(strBody, ignoreMissingParams);
|
|
484
|
+
if (bodyParams) {
|
|
485
|
+
params.body = bodyParams.newParam;
|
|
486
|
+
extractedValues = { ...extractedValues, ...bodyParams.extractedValues };
|
|
487
|
+
hiddenBodyParts = bodyParams.hiddenParts;
|
|
483
488
|
}
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
489
|
+
}
|
|
490
|
+
const geoParams = extractAndReplaceTemplateValues(params.geoLocation);
|
|
491
|
+
if (geoParams) {
|
|
492
|
+
params.geoLocation = geoParams.newParam;
|
|
493
|
+
extractedValues = { ...extractedValues, ...geoParams.extractedValues };
|
|
494
|
+
}
|
|
495
|
+
const proxySessionIdParams = extractAndReplaceTemplateValues(params.proxySessionId);
|
|
496
|
+
if (proxySessionIdParams) {
|
|
497
|
+
params.proxySessionId = proxySessionIdParams.newParam;
|
|
498
|
+
extractedValues = { ...extractedValues, ...proxySessionIdParams.extractedValues };
|
|
499
|
+
}
|
|
500
|
+
if (params.responseRedactions) {
|
|
501
|
+
for (const r of params.responseRedactions) {
|
|
502
|
+
if (r.regex) {
|
|
503
|
+
const regexParams = extractAndReplaceTemplateValues(r.regex);
|
|
504
|
+
r.regex = regexParams?.newParam;
|
|
505
|
+
}
|
|
506
|
+
if (r.xPath) {
|
|
507
|
+
const xpathParams = extractAndReplaceTemplateValues(r.xPath);
|
|
508
|
+
r.xPath = xpathParams?.newParam;
|
|
509
|
+
}
|
|
510
|
+
if (r.jsonPath) {
|
|
511
|
+
const jsonPathParams = extractAndReplaceTemplateValues(r.jsonPath);
|
|
512
|
+
r.jsonPath = jsonPathParams?.newParam;
|
|
513
|
+
}
|
|
488
514
|
}
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
r.xPath = xpathParams === null || xpathParams === void 0 ? void 0 : xpathParams.newParam;
|
|
498
|
-
}
|
|
499
|
-
if (r.jsonPath) {
|
|
500
|
-
const jsonPathParams = extractAndReplaceTemplateValues(r.jsonPath);
|
|
501
|
-
r.jsonPath = jsonPathParams === null || jsonPathParams === void 0 ? void 0 : jsonPathParams.newParam;
|
|
502
|
-
}
|
|
503
|
-
}
|
|
515
|
+
}
|
|
516
|
+
if (params.responseMatches) {
|
|
517
|
+
for (const r of params.responseMatches) {
|
|
518
|
+
if (r.value !== "") {
|
|
519
|
+
const matchParam = extractAndReplaceTemplateValues(r.value);
|
|
520
|
+
r.value = matchParam?.newParam;
|
|
521
|
+
extractedValues = { ...extractedValues, ...matchParam?.extractedValues };
|
|
522
|
+
}
|
|
504
523
|
}
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
524
|
+
}
|
|
525
|
+
return {
|
|
526
|
+
newParams: params,
|
|
527
|
+
extractedValues,
|
|
528
|
+
hiddenBodyParts,
|
|
529
|
+
hiddenURLParts
|
|
530
|
+
};
|
|
531
|
+
function extractAndReplaceTemplateValues(param, ignoreMissingParams2) {
|
|
532
|
+
if (!param) {
|
|
533
|
+
return null;
|
|
513
534
|
}
|
|
535
|
+
const extractedValues2 = {};
|
|
536
|
+
const hiddenParts = [];
|
|
537
|
+
let totalOffset = 0;
|
|
538
|
+
param = param.replace(paramsRegex, (match, pn, offset) => {
|
|
539
|
+
if (params.paramValues && pn in params.paramValues) {
|
|
540
|
+
extractedValues2[pn] = params.paramValues[pn];
|
|
541
|
+
totalOffset += params.paramValues[pn].length - match.length;
|
|
542
|
+
return params.paramValues[pn];
|
|
543
|
+
} else if (secretParams) {
|
|
544
|
+
if (secretParams?.paramValues && pn in secretParams?.paramValues) {
|
|
545
|
+
hiddenParts.push({
|
|
546
|
+
index: offset + totalOffset,
|
|
547
|
+
length: secretParams.paramValues[pn].length
|
|
548
|
+
});
|
|
549
|
+
totalOffset += secretParams.paramValues[pn].length - match.length;
|
|
550
|
+
return secretParams.paramValues[pn];
|
|
551
|
+
} else {
|
|
552
|
+
throw new Error(`parameter's "${pn}" value not found in paramValues and secret parameter's paramValues`);
|
|
553
|
+
}
|
|
554
|
+
} else {
|
|
555
|
+
if (!!!ignoreMissingParams2) {
|
|
556
|
+
throw new Error(`parameter's "${pn}" value not found in paramValues`);
|
|
557
|
+
} else {
|
|
558
|
+
return match;
|
|
559
|
+
}
|
|
560
|
+
}
|
|
561
|
+
});
|
|
514
562
|
return {
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
hiddenURLParts: hiddenURLParts
|
|
563
|
+
newParam: param,
|
|
564
|
+
extractedValues: extractedValues2,
|
|
565
|
+
hiddenParts
|
|
519
566
|
};
|
|
520
|
-
|
|
521
|
-
if (!param) {
|
|
522
|
-
return null;
|
|
523
|
-
}
|
|
524
|
-
//const paramNames: Set<string> = new Set()
|
|
525
|
-
const extractedValues = {};
|
|
526
|
-
const hiddenParts = [];
|
|
527
|
-
let totalOffset = 0;
|
|
528
|
-
param = param.replace(paramsRegex, (match, pn, offset) => {
|
|
529
|
-
if (params.paramValues && pn in params.paramValues) {
|
|
530
|
-
extractedValues[pn] = params.paramValues[pn];
|
|
531
|
-
totalOffset += params.paramValues[pn].length - match.length;
|
|
532
|
-
return params.paramValues[pn];
|
|
533
|
-
}
|
|
534
|
-
else if (secretParams) {
|
|
535
|
-
if ((secretParams === null || secretParams === void 0 ? void 0 : secretParams.paramValues) && pn in (secretParams === null || secretParams === void 0 ? void 0 : secretParams.paramValues)) {
|
|
536
|
-
hiddenParts.push({
|
|
537
|
-
index: offset + totalOffset,
|
|
538
|
-
length: secretParams.paramValues[pn].length,
|
|
539
|
-
});
|
|
540
|
-
totalOffset += secretParams.paramValues[pn].length - match.length;
|
|
541
|
-
return secretParams.paramValues[pn];
|
|
542
|
-
}
|
|
543
|
-
else {
|
|
544
|
-
throw new Error(`parameter's "${pn}" value not found in paramValues and secret parameter's paramValues`);
|
|
545
|
-
}
|
|
546
|
-
}
|
|
547
|
-
else {
|
|
548
|
-
if (!(!!ignoreMissingParams)) {
|
|
549
|
-
throw new Error(`parameter's "${pn}" value not found in paramValues`);
|
|
550
|
-
}
|
|
551
|
-
else {
|
|
552
|
-
return match;
|
|
553
|
-
}
|
|
554
|
-
}
|
|
555
|
-
});
|
|
556
|
-
return {
|
|
557
|
-
newParam: param,
|
|
558
|
-
extractedValues: extractedValues,
|
|
559
|
-
hiddenParts: hiddenParts
|
|
560
|
-
};
|
|
561
|
-
}
|
|
567
|
+
}
|
|
562
568
|
}
|
|
563
569
|
function getGeoLocation(v2Params, secretParams) {
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
const geoRegex = /^[A-Za-z]{2}$/sgiu;
|
|
584
|
-
if (!geoRegex.test(geo)) {
|
|
585
|
-
throw new Error(`Geolocation ${geo} is invalid`);
|
|
586
|
-
}
|
|
587
|
-
return geo;
|
|
570
|
+
if (v2Params?.geoLocation) {
|
|
571
|
+
const paramNames = /* @__PURE__ */ new Set();
|
|
572
|
+
let geo = v2Params.geoLocation;
|
|
573
|
+
let match = null;
|
|
574
|
+
while (match = paramsRegex.exec(geo)) {
|
|
575
|
+
paramNames.add(match[1]);
|
|
576
|
+
}
|
|
577
|
+
for (const pn of paramNames) {
|
|
578
|
+
if (v2Params.paramValues && pn in v2Params.paramValues) {
|
|
579
|
+
geo = geo?.replaceAll(`{{${pn}}}`, v2Params.paramValues[pn].toString());
|
|
580
|
+
} else if (secretParams?.paramValues && pn in secretParams.paramValues) {
|
|
581
|
+
geo = geo?.replaceAll(`{{${pn}}}`, secretParams.paramValues[pn].toString());
|
|
582
|
+
} else {
|
|
583
|
+
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
584
|
+
}
|
|
585
|
+
}
|
|
586
|
+
const geoRegex = /^[A-Za-z]{2}$/sgiu;
|
|
587
|
+
if (!geoRegex.test(geo)) {
|
|
588
|
+
throw new Error(`Geolocation ${geo} is invalid`);
|
|
588
589
|
}
|
|
589
|
-
return
|
|
590
|
+
return geo;
|
|
591
|
+
}
|
|
592
|
+
return void 0;
|
|
590
593
|
}
|
|
591
|
-
function
|
|
592
|
-
|
|
593
|
-
const paramNames = new Set();
|
|
594
|
-
|
|
594
|
+
function getProxySessionId(v2Params, secretParams) {
|
|
595
|
+
if (v2Params?.proxySessionId) {
|
|
596
|
+
const paramNames = /* @__PURE__ */ new Set();
|
|
597
|
+
let proxySessionIdValue = v2Params.proxySessionId;
|
|
595
598
|
let match = null;
|
|
596
|
-
while (match = paramsRegex.exec(
|
|
597
|
-
|
|
599
|
+
while (match = paramsRegex.exec(proxySessionIdValue)) {
|
|
600
|
+
paramNames.add(match[1]);
|
|
598
601
|
}
|
|
599
602
|
for (const pn of paramNames) {
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
}
|
|
606
|
-
|
|
607
|
-
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
608
|
-
}
|
|
603
|
+
if (v2Params.paramValues && pn in v2Params.paramValues) {
|
|
604
|
+
proxySessionIdValue = proxySessionIdValue?.replaceAll(`{{${pn}}}`, v2Params.paramValues[pn].toString());
|
|
605
|
+
} else if (secretParams?.paramValues && pn in secretParams.paramValues) {
|
|
606
|
+
proxySessionIdValue = proxySessionIdValue?.replaceAll(`{{${pn}}}`, secretParams.paramValues[pn].toString());
|
|
607
|
+
} else {
|
|
608
|
+
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
609
|
+
}
|
|
609
610
|
}
|
|
610
|
-
|
|
611
|
+
if (!isValidProxySessionId(proxySessionIdValue)) {
|
|
612
|
+
throw new Error(`proxySessionId ${proxySessionIdValue} is invalid`);
|
|
613
|
+
}
|
|
614
|
+
return proxySessionIdValue;
|
|
615
|
+
}
|
|
616
|
+
return void 0;
|
|
611
617
|
}
|
|
612
|
-
|
|
613
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/http/index.ts"],"names":[],"mappings":"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"}
|
|
618
|
+
function getURL(v2Params, secretParams) {
|
|
619
|
+
let hostPort = v2Params?.url;
|
|
620
|
+
const paramNames = /* @__PURE__ */ new Set();
|
|
621
|
+
let match = null;
|
|
622
|
+
while (match = paramsRegex.exec(hostPort)) {
|
|
623
|
+
paramNames.add(match[1]);
|
|
624
|
+
}
|
|
625
|
+
for (const pn of paramNames) {
|
|
626
|
+
if (v2Params.paramValues && pn in v2Params.paramValues) {
|
|
627
|
+
hostPort = hostPort?.replaceAll(`{{${pn}}}`, v2Params.paramValues[pn].toString());
|
|
628
|
+
} else if (secretParams?.paramValues && pn in secretParams.paramValues) {
|
|
629
|
+
hostPort = hostPort?.replaceAll(`{{${pn}}}`, secretParams.paramValues[pn].toString());
|
|
630
|
+
} else {
|
|
631
|
+
throw new Error(`parameter "${pn}" value not found in templateParams`);
|
|
632
|
+
}
|
|
633
|
+
}
|
|
634
|
+
return hostPort;
|
|
635
|
+
}
|
|
636
|
+
var http_default = HTTP_PROVIDER;
|
|
637
|
+
export {
|
|
638
|
+
http_default as default,
|
|
639
|
+
substituteParamValues
|
|
640
|
+
};
|