@prosopo/provider 5.8.1 → 5.9.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/.turbo/turbo-build$colon$cjs.log +15 -11
- package/.turbo/turbo-build$colon$tsc.log +29 -26
- package/.turbo/turbo-build.log +19 -15
- package/CHANGELOG.md +102 -0
- package/dist/api/blacklistRequestInspector.d.ts +1 -1
- package/dist/api/blacklistRequestInspector.d.ts.map +1 -1
- package/dist/api/blacklistRequestInspector.js +4 -2
- package/dist/api/blacklistRequestInspector.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js +33 -2
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js.map +1 -1
- package/dist/api/captcha/getImageCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/getImageCaptchaChallenge.js +3 -1
- package/dist/api/captcha/getImageCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/signedAssetsResolver.d.ts +20 -0
- package/dist/api/captcha/signedAssetsResolver.d.ts.map +1 -0
- package/dist/api/captcha/signedAssetsResolver.js +53 -0
- package/dist/api/captcha/signedAssetsResolver.js.map +1 -0
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +83 -0
- package/dist/api/verify.js.map +1 -1
- package/dist/cjs/api/blacklistRequestInspector.cjs +4 -2
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs +33 -2
- package/dist/cjs/api/captcha/getImageCaptchaChallenge.cjs +3 -1
- package/dist/cjs/api/captcha/signedAssetsResolver.cjs +54 -0
- package/dist/cjs/api/verify.cjs +83 -0
- package/dist/cjs/tasks/detection/getBotScore.cjs +3 -1
- package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs +90 -2
- package/dist/cjs/tasks/frictionless/ipMatch.cjs +45 -0
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +1 -1
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +1 -1
- package/dist/cjs/tasks/puzzleCaptcha/puzzleTasks.cjs +1 -1
- package/dist/tasks/detection/getBotScore.d.ts +2 -0
- package/dist/tasks/detection/getBotScore.d.ts.map +1 -1
- package/dist/tasks/detection/getBotScore.js +3 -1
- package/dist/tasks/detection/getBotScore.js.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.d.ts +5 -0
- package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.js +91 -3
- package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
- package/dist/tasks/frictionless/ipMatch.d.ts +3 -0
- package/dist/tasks/frictionless/ipMatch.d.ts.map +1 -0
- package/dist/tasks/frictionless/ipMatch.js +45 -0
- package/dist/tasks/frictionless/ipMatch.js.map +1 -0
- package/dist/tasks/frictionless/routingMachine.d.ts +1 -0
- package/dist/tasks/frictionless/routingMachine.d.ts.map +1 -1
- package/dist/tasks/frictionless/routingMachine.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +1 -1
- package/dist/tasks/powCaptcha/powTasks.js +1 -1
- package/dist/tasks/puzzleCaptcha/puzzleTasks.js +1 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js +3 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js.map +1 -1
- package/dist/tests/integration/clientSettingsPersistence.integration.test.js +2 -1
- package/dist/tests/integration/clientSettingsPersistence.integration.test.js.map +1 -1
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.d.ts +2 -0
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.d.ts.map +1 -0
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.js +448 -0
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.js.map +1 -0
- package/dist/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.js +2 -1
- package/dist/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.js.map +1 -1
- package/dist/tests/unit/signedAssetsResolver.unit.test.d.ts +2 -0
- package/dist/tests/unit/signedAssetsResolver.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/signedAssetsResolver.unit.test.js +77 -0
- package/dist/tests/unit/signedAssetsResolver.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.js +2 -1
- package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/ipMatch.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/frictionless/ipMatch.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/frictionless/ipMatch.unit.test.js +107 -0
- package/dist/tests/unit/tasks/frictionless/ipMatch.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/frictionless/routerPuzzleOverrides.unit.test.js +88 -1
- package/dist/tests/unit/tasks/frictionless/routerPuzzleOverrides.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/puzzleMaxDifficultyMatchesLadder.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/puzzleMaxDifficultyMatchesLadder.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/puzzleMaxDifficultyMatchesLadder.unit.test.js +16 -0
- package/dist/tests/unit/tasks/puzzleMaxDifficultyMatchesLadder.unit.test.js.map +1 -0
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js.map +1 -1
- package/package.json +16 -14
|
@@ -0,0 +1,448 @@
|
|
|
1
|
+
import { createServer } from "node:http";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
import { ed25519 } from "@noble/curves/ed25519";
|
|
5
|
+
import { stringToU8a, u8aToHex } from "@polkadot/util";
|
|
6
|
+
import { ProviderEnvironment } from "@prosopo/env";
|
|
7
|
+
import { generateMnemonic, getPair } from "@prosopo/keyring";
|
|
8
|
+
import { Tasks, isTlsAvailable, startProviderApi } from "@prosopo/provider";
|
|
9
|
+
import { ApiParams, CaptchaType, ClientApiPaths, ClientSettingsSchema, DatabaseTypes, ProsopoConfigSchema, Tier, encodeProcaptchaOutput, } from "@prosopo/types";
|
|
10
|
+
import { AccessPolicyType, accessRuleInput, } from "@prosopo/user-access-policy";
|
|
11
|
+
import { randomAsHex } from "@prosopo/util-crypto";
|
|
12
|
+
import { buildSignatureBase } from "@prosopo/web-bot-auth";
|
|
13
|
+
import { GenericContainer } from "testcontainers";
|
|
14
|
+
import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
|
|
15
|
+
import { getVerdictCache } from "../../api/blacklistRequestInspector.js";
|
|
16
|
+
import { reservePort, testFetch } from "./testUtils.js";
|
|
17
|
+
const KEY_ID = "web-bot-auth-integration-key";
|
|
18
|
+
const cleanIpInfo = (ip) => ({
|
|
19
|
+
ip,
|
|
20
|
+
isValid: true,
|
|
21
|
+
isVPN: false,
|
|
22
|
+
isTor: false,
|
|
23
|
+
isProxy: false,
|
|
24
|
+
isDatacenter: false,
|
|
25
|
+
isAbuser: false,
|
|
26
|
+
isMobile: false,
|
|
27
|
+
isSatellite: false,
|
|
28
|
+
isCrawler: false,
|
|
29
|
+
});
|
|
30
|
+
const toBase64 = (bytes) => {
|
|
31
|
+
let bin = "";
|
|
32
|
+
for (let i = 0; i < bytes.length; i++)
|
|
33
|
+
bin += String.fromCharCode(bytes[i]);
|
|
34
|
+
return btoa(bin);
|
|
35
|
+
};
|
|
36
|
+
const toBase64Url = (bytes) => toBase64(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
|
37
|
+
describe("Web Bot Auth authenticated flow (integration)", () => {
|
|
38
|
+
let env;
|
|
39
|
+
let tasks;
|
|
40
|
+
let accessRulesStorage;
|
|
41
|
+
let mongoContainer;
|
|
42
|
+
let redisContainer;
|
|
43
|
+
let server;
|
|
44
|
+
let jwksServer;
|
|
45
|
+
let baseUrl;
|
|
46
|
+
let testPort;
|
|
47
|
+
let authority;
|
|
48
|
+
let signerUrl;
|
|
49
|
+
let privateKey;
|
|
50
|
+
let publicKey;
|
|
51
|
+
let jwksRequests = 0;
|
|
52
|
+
const previousPoolDir = process.env.PROSOPO_DETECTOR_POOL_DIR;
|
|
53
|
+
beforeAll(async () => {
|
|
54
|
+
testPort = await reservePort();
|
|
55
|
+
const protocol = isTlsAvailable() ? "https" : "http";
|
|
56
|
+
baseUrl = `${protocol}://localhost:${testPort}`;
|
|
57
|
+
authority = `localhost:${testPort}`;
|
|
58
|
+
privateKey = ed25519.utils.randomPrivateKey();
|
|
59
|
+
publicKey = ed25519.getPublicKey(privateKey);
|
|
60
|
+
const jwksPort = await reservePort();
|
|
61
|
+
signerUrl = `http://localhost:${jwksPort}`;
|
|
62
|
+
jwksServer = createServer((req, res) => {
|
|
63
|
+
if (req.url === "/.well-known/http-message-signatures-directory") {
|
|
64
|
+
jwksRequests += 1;
|
|
65
|
+
res.writeHead(200, {
|
|
66
|
+
"content-type": "application/json",
|
|
67
|
+
"cache-control": "max-age=1",
|
|
68
|
+
});
|
|
69
|
+
res.end(JSON.stringify({
|
|
70
|
+
keys: [
|
|
71
|
+
{
|
|
72
|
+
kty: "OKP",
|
|
73
|
+
crv: "Ed25519",
|
|
74
|
+
alg: "EdDSA",
|
|
75
|
+
kid: KEY_ID,
|
|
76
|
+
x: toBase64Url(publicKey),
|
|
77
|
+
},
|
|
78
|
+
],
|
|
79
|
+
}));
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
res.writeHead(404).end();
|
|
83
|
+
});
|
|
84
|
+
await new Promise((resolve) => jwksServer?.listen(jwksPort, "127.0.0.1", resolve));
|
|
85
|
+
mongoContainer = await new GenericContainer("mongo:6.0.28")
|
|
86
|
+
.withExposedPorts(27017)
|
|
87
|
+
.withEnvironment({
|
|
88
|
+
MONGO_INITDB_ROOT_USERNAME: "root",
|
|
89
|
+
MONGO_INITDB_ROOT_PASSWORD: "root",
|
|
90
|
+
MONGO_INITDB_DATABASE: "prosopo_test",
|
|
91
|
+
})
|
|
92
|
+
.start();
|
|
93
|
+
redisContainer = await new GenericContainer("redis/redis-stack:latest")
|
|
94
|
+
.withExposedPorts(6379)
|
|
95
|
+
.withEnvironment({ REDIS_ARGS: "--requirepass root" })
|
|
96
|
+
.start();
|
|
97
|
+
const config = ProsopoConfigSchema.parse({
|
|
98
|
+
defaultEnvironment: "development",
|
|
99
|
+
host: baseUrl,
|
|
100
|
+
account: {
|
|
101
|
+
secret: "puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant",
|
|
102
|
+
},
|
|
103
|
+
authAccount: {
|
|
104
|
+
secret: "puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant",
|
|
105
|
+
},
|
|
106
|
+
database: {
|
|
107
|
+
development: {
|
|
108
|
+
type: DatabaseTypes.enum.provider,
|
|
109
|
+
endpoint: `mongodb://root:root@${mongoContainer.getHost()}:${mongoContainer.getMappedPort(27017)}`,
|
|
110
|
+
dbname: `prosopo_web_bot_auth_test_${Date.now()}`,
|
|
111
|
+
authSource: "admin",
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
redisConnection: {
|
|
115
|
+
url: `redis://:${encodeURIComponent("root")}@${redisContainer.getHost()}:${redisContainer.getMappedPort(6379)}`,
|
|
116
|
+
password: "root",
|
|
117
|
+
indexName: randomAsHex(16),
|
|
118
|
+
},
|
|
119
|
+
ipApi: { baseUrl: "https://dummyUrl.com", apiKey: "dummyKey" },
|
|
120
|
+
server: { baseURL: `${protocol}://localhost`, port: testPort },
|
|
121
|
+
});
|
|
122
|
+
env = new ProviderEnvironment(config);
|
|
123
|
+
await env.isReady();
|
|
124
|
+
env.ipInfoService = {
|
|
125
|
+
initialize: async () => { },
|
|
126
|
+
isAvailable: () => true,
|
|
127
|
+
lookup: async (ip) => cleanIpInfo(ip),
|
|
128
|
+
};
|
|
129
|
+
process.env.PROSOPO_DETECTOR_POOL_DIR = join(dirname(fileURLToPath(import.meta.url)), "../../../fixtures/detector-pool");
|
|
130
|
+
tasks = new Tasks(env);
|
|
131
|
+
accessRulesStorage = env.getDb().getUserAccessRulesStorage();
|
|
132
|
+
await env.getDb().getRedisAccessRulesConnection().getClient();
|
|
133
|
+
server = await startProviderApi(env, true, testPort);
|
|
134
|
+
}, 180_000);
|
|
135
|
+
afterAll(async () => {
|
|
136
|
+
process.env.PROSOPO_DETECTOR_POOL_DIR = previousPoolDir;
|
|
137
|
+
if (jwksServer) {
|
|
138
|
+
await new Promise((resolve) => jwksServer?.close(() => resolve()));
|
|
139
|
+
}
|
|
140
|
+
if (server) {
|
|
141
|
+
await new Promise((resolve) => server?.close(() => resolve()));
|
|
142
|
+
}
|
|
143
|
+
try {
|
|
144
|
+
await env?.getDb().close();
|
|
145
|
+
}
|
|
146
|
+
catch { }
|
|
147
|
+
try {
|
|
148
|
+
await redisContainer?.stop();
|
|
149
|
+
}
|
|
150
|
+
catch { }
|
|
151
|
+
try {
|
|
152
|
+
await mongoContainer?.stop();
|
|
153
|
+
}
|
|
154
|
+
catch { }
|
|
155
|
+
});
|
|
156
|
+
beforeEach(async () => {
|
|
157
|
+
await accessRulesStorage.deleteAllRules();
|
|
158
|
+
getVerdictCache().clear();
|
|
159
|
+
});
|
|
160
|
+
const registerSite = async () => {
|
|
161
|
+
const [mnemonic, siteKey] = await generateMnemonic();
|
|
162
|
+
await tasks.clientTaskManager.registerSiteKey(siteKey, Tier.Professional, ClientSettingsSchema.parse({
|
|
163
|
+
captchaType: CaptchaType.frictionless,
|
|
164
|
+
domains: ["localhost", "example.com"],
|
|
165
|
+
}));
|
|
166
|
+
return [mnemonic, siteKey];
|
|
167
|
+
};
|
|
168
|
+
const signedHeaders = (expiresInSeconds = 300) => {
|
|
169
|
+
const created = Math.floor(Date.now() / 1000);
|
|
170
|
+
const expires = created + expiresInSeconds;
|
|
171
|
+
const signatureAgent = `"${signerUrl}"`;
|
|
172
|
+
const params = `("@authority" "signature-agent");created=${created};expires=${expires};keyid="${KEY_ID}";alg="ed25519";tag="web-bot-auth"`;
|
|
173
|
+
const base = buildSignatureBase(["@authority", "signature-agent"], { authority, signatureAgent }, params);
|
|
174
|
+
const signature = ed25519.sign(new TextEncoder().encode(base), privateKey);
|
|
175
|
+
return {
|
|
176
|
+
"Signature-Agent": signatureAgent,
|
|
177
|
+
"Signature-Input": `sig1=${params}`,
|
|
178
|
+
Signature: `sig1=:${toBase64(signature)}:`,
|
|
179
|
+
};
|
|
180
|
+
};
|
|
181
|
+
const frictionless = async (siteKey, options) => {
|
|
182
|
+
const body = {
|
|
183
|
+
[ApiParams.dapp]: siteKey,
|
|
184
|
+
[ApiParams.token]: randomAsHex(16),
|
|
185
|
+
[ApiParams.user]: options.userId,
|
|
186
|
+
[ApiParams.headHash]: randomAsHex(16),
|
|
187
|
+
...(options.clientSessionId && {
|
|
188
|
+
[ApiParams.clientSessionId]: options.clientSessionId,
|
|
189
|
+
}),
|
|
190
|
+
};
|
|
191
|
+
const response = await testFetch(`${baseUrl}${ClientApiPaths.GetFrictionlessCaptchaChallenge}`, {
|
|
192
|
+
method: "POST",
|
|
193
|
+
headers: {
|
|
194
|
+
Connection: "close",
|
|
195
|
+
"Content-Type": "application/json",
|
|
196
|
+
Origin: "https://localhost",
|
|
197
|
+
"Prosopo-Site-Key": siteKey,
|
|
198
|
+
"Prosopo-User": options.userId,
|
|
199
|
+
"User-Agent": options.userAgent,
|
|
200
|
+
"X-Forwarded-For": options.ip,
|
|
201
|
+
...options.extraHeaders,
|
|
202
|
+
},
|
|
203
|
+
body: JSON.stringify(body),
|
|
204
|
+
});
|
|
205
|
+
return {
|
|
206
|
+
status: response.status,
|
|
207
|
+
body: response.status === 200 ? await response.json() : {},
|
|
208
|
+
};
|
|
209
|
+
};
|
|
210
|
+
const authenticatedVerify = async (siteKey, siteKeyMnemonic, userId, sessionId, extra = {}) => {
|
|
211
|
+
const timestamp = Date.now().toString();
|
|
212
|
+
const token = encodeProcaptchaOutput({
|
|
213
|
+
[ApiParams.dapp]: siteKey,
|
|
214
|
+
[ApiParams.user]: userId,
|
|
215
|
+
...(sessionId ? { [ApiParams.commitmentId]: sessionId } : {}),
|
|
216
|
+
[ApiParams.timestamp]: timestamp,
|
|
217
|
+
[ApiParams.signature]: {
|
|
218
|
+
[ApiParams.provider]: {},
|
|
219
|
+
[ApiParams.user]: {},
|
|
220
|
+
},
|
|
221
|
+
});
|
|
222
|
+
const body = {
|
|
223
|
+
[ApiParams.token]: token,
|
|
224
|
+
[ApiParams.dappSignature]: u8aToHex(getPair(siteKeyMnemonic).sign(stringToU8a(timestamp))),
|
|
225
|
+
...(extra.ip !== undefined && { [ApiParams.ip]: extra.ip }),
|
|
226
|
+
...(extra.clientSessionId !== undefined && {
|
|
227
|
+
[ApiParams.clientSessionId]: extra.clientSessionId,
|
|
228
|
+
}),
|
|
229
|
+
};
|
|
230
|
+
const response = await testFetch(`${baseUrl}${ClientApiPaths.VerifyAuthenticatedSession}`, {
|
|
231
|
+
method: "POST",
|
|
232
|
+
headers: {
|
|
233
|
+
Connection: "close",
|
|
234
|
+
"Content-Type": "application/json",
|
|
235
|
+
Origin: "https://localhost",
|
|
236
|
+
"Prosopo-Site-Key": siteKey,
|
|
237
|
+
"Prosopo-User": userId,
|
|
238
|
+
},
|
|
239
|
+
body: JSON.stringify(body),
|
|
240
|
+
});
|
|
241
|
+
expect(response.status).toBe(200);
|
|
242
|
+
return (await response.json());
|
|
243
|
+
};
|
|
244
|
+
const allowRule = async (siteKey, fields) => {
|
|
245
|
+
await accessRulesStorage.insertRules([
|
|
246
|
+
{
|
|
247
|
+
rule: accessRuleInput.parse({
|
|
248
|
+
type: AccessPolicyType.Allow,
|
|
249
|
+
clientId: siteKey,
|
|
250
|
+
...fields,
|
|
251
|
+
}),
|
|
252
|
+
},
|
|
253
|
+
]);
|
|
254
|
+
};
|
|
255
|
+
describe("frictionless entry", () => {
|
|
256
|
+
it("mints an authenticated session for a request a verified Web Bot Auth signer is allowed on", async () => {
|
|
257
|
+
const [, siteKey] = await registerSite();
|
|
258
|
+
const [, userId] = await generateMnemonic();
|
|
259
|
+
await allowRule(siteKey, { webBotAuthAgent: signerUrl });
|
|
260
|
+
const before = jwksRequests;
|
|
261
|
+
const { status, body } = await frictionless(siteKey, {
|
|
262
|
+
userId,
|
|
263
|
+
ip: "203.0.113.7",
|
|
264
|
+
userAgent: "IntegrationAgent/1.0",
|
|
265
|
+
extraHeaders: signedHeaders(),
|
|
266
|
+
});
|
|
267
|
+
expect(status).toBe(200);
|
|
268
|
+
expect(body.captchaType).toBe(CaptchaType.authenticated);
|
|
269
|
+
expect(body.sessionId).toBeTruthy();
|
|
270
|
+
expect(body.agent).toBe(signerUrl);
|
|
271
|
+
expect(jwksRequests).toBeGreaterThan(before);
|
|
272
|
+
const session = await env
|
|
273
|
+
.getDb()
|
|
274
|
+
.getSessionRecordBySessionId(body.sessionId);
|
|
275
|
+
expect(session?.captchaType).toBe(CaptchaType.authenticated);
|
|
276
|
+
expect(session?.serverChecked).toBe(false);
|
|
277
|
+
});
|
|
278
|
+
it("does not mint an authenticated session when the signature is expired", async () => {
|
|
279
|
+
const [, siteKey] = await registerSite();
|
|
280
|
+
const [, userId] = await generateMnemonic();
|
|
281
|
+
await allowRule(siteKey, { webBotAuthAgent: signerUrl });
|
|
282
|
+
const { status, body } = await frictionless(siteKey, {
|
|
283
|
+
userId,
|
|
284
|
+
ip: "203.0.113.8",
|
|
285
|
+
userAgent: "IntegrationAgent/1.0",
|
|
286
|
+
extraHeaders: signedHeaders(-60),
|
|
287
|
+
});
|
|
288
|
+
expect(status).toBe(200);
|
|
289
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
290
|
+
});
|
|
291
|
+
it("does not mint an authenticated session for an unsigned request carrying only the Signature-Agent header", async () => {
|
|
292
|
+
const [, siteKey] = await registerSite();
|
|
293
|
+
const [, userId] = await generateMnemonic();
|
|
294
|
+
await allowRule(siteKey, { webBotAuthAgent: signerUrl });
|
|
295
|
+
const { status, body } = await frictionless(siteKey, {
|
|
296
|
+
userId,
|
|
297
|
+
ip: "203.0.113.9",
|
|
298
|
+
userAgent: "IntegrationAgent/1.0",
|
|
299
|
+
extraHeaders: { "Signature-Agent": `"${signerUrl}"` },
|
|
300
|
+
});
|
|
301
|
+
expect(status).toBe(200);
|
|
302
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
303
|
+
});
|
|
304
|
+
it("mints an authenticated session for a non-signature qualifier (user agent)", async () => {
|
|
305
|
+
const [, siteKey] = await registerSite();
|
|
306
|
+
const [, userId] = await generateMnemonic();
|
|
307
|
+
const userAgent = `TrustedPartnerAgent/${randomAsHex(4)}`;
|
|
308
|
+
await allowRule(siteKey, { userAgent });
|
|
309
|
+
const { status, body } = await frictionless(siteKey, {
|
|
310
|
+
userId,
|
|
311
|
+
ip: "203.0.113.10",
|
|
312
|
+
userAgent,
|
|
313
|
+
});
|
|
314
|
+
expect(status).toBe(200);
|
|
315
|
+
expect(body.captchaType).toBe(CaptchaType.authenticated);
|
|
316
|
+
expect(body.agent).toBeUndefined();
|
|
317
|
+
});
|
|
318
|
+
it("lets a Block on the same scope beat the Allow", async () => {
|
|
319
|
+
const [, siteKey] = await registerSite();
|
|
320
|
+
const [, userId] = await generateMnemonic();
|
|
321
|
+
const userAgent = `TrustedPartnerAgent/${randomAsHex(4)}`;
|
|
322
|
+
await allowRule(siteKey, { userAgent });
|
|
323
|
+
await accessRulesStorage.insertRules([
|
|
324
|
+
{
|
|
325
|
+
rule: accessRuleInput.parse({
|
|
326
|
+
type: AccessPolicyType.Block,
|
|
327
|
+
clientId: siteKey,
|
|
328
|
+
userAgent,
|
|
329
|
+
}),
|
|
330
|
+
},
|
|
331
|
+
]);
|
|
332
|
+
const { status, body } = await frictionless(siteKey, {
|
|
333
|
+
userId,
|
|
334
|
+
ip: "203.0.113.11",
|
|
335
|
+
userAgent,
|
|
336
|
+
});
|
|
337
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
338
|
+
expect(status).not.toBe(200);
|
|
339
|
+
});
|
|
340
|
+
it("ignores a deferToVerify Allow at frictionless entry", async () => {
|
|
341
|
+
const [, siteKey] = await registerSite();
|
|
342
|
+
const [, userId] = await generateMnemonic();
|
|
343
|
+
const userAgent = `DeferredPartnerAgent/${randomAsHex(4)}`;
|
|
344
|
+
await allowRule(siteKey, { userAgent, deferToVerify: true });
|
|
345
|
+
const { status, body } = await frictionless(siteKey, {
|
|
346
|
+
userId,
|
|
347
|
+
ip: "203.0.113.12",
|
|
348
|
+
userAgent,
|
|
349
|
+
});
|
|
350
|
+
expect(status).toBe(200);
|
|
351
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
352
|
+
});
|
|
353
|
+
it("does not mint an authenticated session when no Allow rule matches", async () => {
|
|
354
|
+
const [, siteKey] = await registerSite();
|
|
355
|
+
const [, userId] = await generateMnemonic();
|
|
356
|
+
await allowRule(siteKey, { userAgent: "SomeOtherAgent/9.9" });
|
|
357
|
+
const { status, body } = await frictionless(siteKey, {
|
|
358
|
+
userId,
|
|
359
|
+
ip: "203.0.113.13",
|
|
360
|
+
userAgent: "IntegrationAgent/1.0",
|
|
361
|
+
});
|
|
362
|
+
expect(status).toBe(200);
|
|
363
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
364
|
+
});
|
|
365
|
+
});
|
|
366
|
+
describe("/client/authenticated/verify", () => {
|
|
367
|
+
const AGENT_IP = "203.0.113.20";
|
|
368
|
+
const mintSession = async (clientSessionId) => {
|
|
369
|
+
const [siteKeyMnemonic, siteKey] = await registerSite();
|
|
370
|
+
const [, userId] = await generateMnemonic();
|
|
371
|
+
const userAgent = `TrustedPartnerAgent/${randomAsHex(4)}`;
|
|
372
|
+
await allowRule(siteKey, { userAgent });
|
|
373
|
+
const { body } = await frictionless(siteKey, {
|
|
374
|
+
userId,
|
|
375
|
+
ip: AGENT_IP,
|
|
376
|
+
userAgent,
|
|
377
|
+
clientSessionId,
|
|
378
|
+
});
|
|
379
|
+
expect(body.captchaType).toBe(CaptchaType.authenticated);
|
|
380
|
+
return {
|
|
381
|
+
siteKey,
|
|
382
|
+
siteKeyMnemonic,
|
|
383
|
+
userId,
|
|
384
|
+
sessionId: body.sessionId,
|
|
385
|
+
};
|
|
386
|
+
};
|
|
387
|
+
it("verifies once and refuses the second redemption", async () => {
|
|
388
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession();
|
|
389
|
+
const first = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: AGENT_IP });
|
|
390
|
+
expect(first).toEqual({ verified: true, status: "API.USER_VERIFIED" });
|
|
391
|
+
const second = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: AGENT_IP });
|
|
392
|
+
expect(second.verified).toBe(false);
|
|
393
|
+
expect(second.status).toBe("API.USER_ALREADY_VERIFIED");
|
|
394
|
+
});
|
|
395
|
+
it("refuses when the operator forwards no IP", async () => {
|
|
396
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession();
|
|
397
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId);
|
|
398
|
+
expect(result.verified).toBe(false);
|
|
399
|
+
expect(result.status).toBe("API.AUTHENTICATED_IP_REQUIRED");
|
|
400
|
+
});
|
|
401
|
+
it("refuses when the forwarded IP is not the one the session was issued to", async () => {
|
|
402
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession();
|
|
403
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: "198.51.100.44" });
|
|
404
|
+
expect(result.verified).toBe(false);
|
|
405
|
+
expect(result.status).toBe("API.AUTHENTICATED_IP_MISMATCH");
|
|
406
|
+
});
|
|
407
|
+
it("leaves the session redeemable after a rejected verify", async () => {
|
|
408
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession();
|
|
409
|
+
await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, {
|
|
410
|
+
ip: "198.51.100.44",
|
|
411
|
+
});
|
|
412
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: AGENT_IP });
|
|
413
|
+
expect(result).toEqual({ verified: true, status: "API.USER_VERIFIED" });
|
|
414
|
+
});
|
|
415
|
+
it("refuses when the forwarded clientSessionId is not the one the session was minted with", async () => {
|
|
416
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession("render-session-a");
|
|
417
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: AGENT_IP, clientSessionId: "render-session-b" });
|
|
418
|
+
expect(result.verified).toBe(false);
|
|
419
|
+
expect(result.status).toBe("API.CLIENT_SESSION_MISMATCH");
|
|
420
|
+
});
|
|
421
|
+
it("verifies when the forwarded clientSessionId matches", async () => {
|
|
422
|
+
const { siteKey, siteKeyMnemonic, userId, sessionId } = await mintSession("render-session-a");
|
|
423
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, sessionId, { ip: AGENT_IP, clientSessionId: "render-session-a" });
|
|
424
|
+
expect(result).toEqual({ verified: true, status: "API.USER_VERIFIED" });
|
|
425
|
+
});
|
|
426
|
+
it("refuses a session that was not minted as authenticated", async () => {
|
|
427
|
+
const [siteKeyMnemonic, siteKey] = await registerSite();
|
|
428
|
+
const [, userId] = await generateMnemonic();
|
|
429
|
+
const { body } = await frictionless(siteKey, {
|
|
430
|
+
userId,
|
|
431
|
+
ip: AGENT_IP,
|
|
432
|
+
userAgent: "IntegrationAgent/1.0",
|
|
433
|
+
});
|
|
434
|
+
expect(body.captchaType).not.toBe(CaptchaType.authenticated);
|
|
435
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, body.sessionId, { ip: AGENT_IP });
|
|
436
|
+
expect(result.verified).toBe(false);
|
|
437
|
+
expect(result.status).toBe("API.INCORRECT_CAPTCHA_TYPE");
|
|
438
|
+
});
|
|
439
|
+
it("refuses a token carrying no session id", async () => {
|
|
440
|
+
const [siteKeyMnemonic, siteKey] = await registerSite();
|
|
441
|
+
const [, userId] = await generateMnemonic();
|
|
442
|
+
const result = await authenticatedVerify(siteKey, siteKeyMnemonic, userId, undefined, { ip: AGENT_IP });
|
|
443
|
+
expect(result.verified).toBe(false);
|
|
444
|
+
expect(result.status).toBe("API.USER_NOT_VERIFIED_NO_SOLUTION");
|
|
445
|
+
});
|
|
446
|
+
});
|
|
447
|
+
});
|
|
448
|
+
//# sourceMappingURL=webBotAuthAuthenticated.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webBotAuthAuthenticated.integration.test.js","sourceRoot":"","sources":["../../../src/tests/integration/webBotAuthAuthenticated.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ApiEndpointResponseStatus } from "@prosopo/api-route";
|
|
2
|
-
import { CaptchaType, Tier } from "@prosopo/types";
|
|
2
|
+
import { CaptchaType, Tier, puzzleMaxDifficultyDefault, } from "@prosopo/types";
|
|
3
3
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
4
4
|
import { ApiRegisterSiteKeyEndpoint } from "../../../../api/admin/apiRegisterSiteKeyEndpoint.js";
|
|
5
5
|
describe("ApiRegisterSiteKeyEndpoint", () => {
|
|
@@ -43,6 +43,7 @@ describe("ApiRegisterSiteKeyEndpoint", () => {
|
|
|
43
43
|
verifiedTimeout: 120000,
|
|
44
44
|
solutionTimeout: 60000,
|
|
45
45
|
puzzleTolerance: 15,
|
|
46
|
+
puzzleMaxDifficulty: puzzleMaxDifficultyDefault,
|
|
46
47
|
disallowWebView: false,
|
|
47
48
|
};
|
|
48
49
|
await endpoint.processRequest({ siteKey, tier, settings }, mockLogger);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRegisterSiteKeyEndpoint.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"apiRegisterSiteKeyEndpoint.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signedAssetsResolver.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/unit/signedAssetsResolver.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { afterEach, describe, expect, test } from "vitest";
|
|
3
|
+
import { DEFAULT_ASSET_TOKEN_TTL_SECONDS, SignedAssetsResolver, getSignedAssetsResolver, } from "../../api/captcha/signedAssetsResolver.js";
|
|
4
|
+
const KEY = "test-security-key";
|
|
5
|
+
const NOW_MS = 1_700_000_000_000;
|
|
6
|
+
const IMAGE = "https://prosopoimages.b-cdn.net/v5_dataset_flat/images/abc.webp";
|
|
7
|
+
const resolver = (ttlSeconds, clientIp) => new SignedAssetsResolver({
|
|
8
|
+
securityKey: KEY,
|
|
9
|
+
now: () => NOW_MS,
|
|
10
|
+
...(ttlSeconds !== undefined ? { ttlSeconds } : {}),
|
|
11
|
+
...(clientIp !== undefined ? { clientIp } : {}),
|
|
12
|
+
});
|
|
13
|
+
const expected = (path, expires, ip = "") => createHash("sha256")
|
|
14
|
+
.update(`${KEY}${path}${expires}${ip}`)
|
|
15
|
+
.digest("base64")
|
|
16
|
+
.replace(/\+/g, "-")
|
|
17
|
+
.replace(/\//g, "_")
|
|
18
|
+
.replace(/=/g, "");
|
|
19
|
+
describe("SignedAssetsResolver", () => {
|
|
20
|
+
test("signs the URL with a token and expiry", () => {
|
|
21
|
+
const url = new URL(resolver(300).resolveAsset(IMAGE).getURL());
|
|
22
|
+
const expires = NOW_MS / 1000 + 300;
|
|
23
|
+
expect(url.origin + url.pathname).toBe(IMAGE);
|
|
24
|
+
expect(url.searchParams.get("expires")).toBe(String(expires));
|
|
25
|
+
expect(url.searchParams.get("token")).toBe(expected("/v5_dataset_flat/images/abc.webp", expires));
|
|
26
|
+
});
|
|
27
|
+
test("preserves the original URI on the asset", () => {
|
|
28
|
+
expect(resolver().resolveAsset(IMAGE).URI).toBe(IMAGE);
|
|
29
|
+
});
|
|
30
|
+
test("defaults to a short TTL", () => {
|
|
31
|
+
const url = new URL(resolver().resolveAsset(IMAGE).getURL());
|
|
32
|
+
expect(url.searchParams.get("expires")).toBe(String(NOW_MS / 1000 + DEFAULT_ASSET_TOKEN_TTL_SECONDS));
|
|
33
|
+
});
|
|
34
|
+
test("binds the token to its exact path", () => {
|
|
35
|
+
const a = resolver().resolveAsset(IMAGE).getURL();
|
|
36
|
+
const b = resolver()
|
|
37
|
+
.resolveAsset("https://prosopoimages.b-cdn.net/v5_dataset_flat/images/def.webp")
|
|
38
|
+
.getURL();
|
|
39
|
+
const tokenOf = (u) => new URL(u).searchParams.get("token");
|
|
40
|
+
expect(tokenOf(a)).not.toBe(tokenOf(b));
|
|
41
|
+
});
|
|
42
|
+
test("includes the client IP when bound", () => {
|
|
43
|
+
const url = new URL(resolver(300, "203.0.113.9").resolveAsset(IMAGE).getURL());
|
|
44
|
+
const expires = NOW_MS / 1000 + 300;
|
|
45
|
+
expect(url.searchParams.get("token")).toBe(expected("/v5_dataset_flat/images/abc.webp", expires, "203.0.113.9"));
|
|
46
|
+
});
|
|
47
|
+
test("passes non-http URIs through untouched", () => {
|
|
48
|
+
const local = "/home/prosopo/images/abc.webp";
|
|
49
|
+
expect(resolver().resolveAsset(local).getURL()).toBe(local);
|
|
50
|
+
});
|
|
51
|
+
test("refuses to sign a URL that already has a query string", () => {
|
|
52
|
+
expect(() => resolver().resolveAsset(`${IMAGE}?w=100`)).toThrow(/already has a query string/);
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
describe("getSignedAssetsResolver", () => {
|
|
56
|
+
afterEach(() => {
|
|
57
|
+
process.env.PROSOPO_ASSET_TOKEN_KEY = undefined;
|
|
58
|
+
process.env.PROSOPO_ASSET_TOKEN_BIND_IP = undefined;
|
|
59
|
+
});
|
|
60
|
+
test("is undefined when no key is configured", () => {
|
|
61
|
+
process.env.PROSOPO_ASSET_TOKEN_KEY = "";
|
|
62
|
+
expect(getSignedAssetsResolver()).toBeUndefined();
|
|
63
|
+
});
|
|
64
|
+
test("is constructed when a key is configured", () => {
|
|
65
|
+
process.env.PROSOPO_ASSET_TOKEN_KEY = KEY;
|
|
66
|
+
expect(getSignedAssetsResolver()).toBeInstanceOf(SignedAssetsResolver);
|
|
67
|
+
});
|
|
68
|
+
test("ignores the client IP unless binding is enabled", () => {
|
|
69
|
+
process.env.PROSOPO_ASSET_TOKEN_KEY = KEY;
|
|
70
|
+
const unbound = getSignedAssetsResolver("203.0.113.9");
|
|
71
|
+
process.env.PROSOPO_ASSET_TOKEN_BIND_IP = "true";
|
|
72
|
+
const bound = getSignedAssetsResolver("203.0.113.9");
|
|
73
|
+
const tokenOf = (u) => new URL(u).searchParams.get("token");
|
|
74
|
+
expect(tokenOf(unbound?.resolveAsset(IMAGE).getURL() ?? "")).not.toBe(tokenOf(bound?.resolveAsset(IMAGE).getURL() ?? ""));
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
//# sourceMappingURL=signedAssetsResolver.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signedAssetsResolver.unit.test.js","sourceRoot":"","sources":["../../../src/tests/unit/signedAssetsResolver.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getLogger } from "@prosopo/logger";
|
|
2
2
|
import { IpAddressType } from "@prosopo/types";
|
|
3
|
-
import { CaptchaType, ResultReason, Tier, TrafficFilterAction, } from "@prosopo/types";
|
|
3
|
+
import { CaptchaType, ResultReason, Tier, TrafficFilterAction, puzzleMaxDifficultyDefault, } from "@prosopo/types";
|
|
4
4
|
import { AccessPolicyType, } from "@prosopo/user-access-policy";
|
|
5
5
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
6
6
|
import { CaptchaManager } from "../../../tasks/captchaManager.js";
|
|
@@ -23,6 +23,7 @@ const defaultUserSettings = {
|
|
|
23
23
|
verifiedTimeout: 120000,
|
|
24
24
|
solutionTimeout: 60000,
|
|
25
25
|
puzzleTolerance: 15,
|
|
26
|
+
puzzleMaxDifficulty: puzzleMaxDifficultyDefault,
|
|
26
27
|
disallowWebView: false,
|
|
27
28
|
};
|
|
28
29
|
describe("CaptchaManager", () => {
|