@prosopo/provider 4.14.4 → 4.15.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build$colon$cjs.log +12 -11
- package/.turbo/turbo-build$colon$tsc.log +24 -24
- package/.turbo/turbo-build.log +13 -12
- package/CHANGELOG.md +90 -0
- package/dist/api/admin/apiRemoveDetectorKeyEndpoint.d.ts.map +1 -1
- package/dist/api/blacklistRequestInspector.d.ts +8 -3
- package/dist/api/blacklistRequestInspector.d.ts.map +1 -1
- package/dist/api/blacklistRequestInspector.js +49 -11
- package/dist/api/blacklistRequestInspector.js.map +1 -1
- package/dist/api/block.d.ts.map +1 -1
- package/dist/api/block.js +4 -0
- package/dist/api/block.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js +19 -13
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.d.ts +2 -0
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js +7 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.d.ts +4 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.js +13 -7
- package/dist/api/captcha/submitPoWCaptchaSolution.js.map +1 -1
- package/dist/api/handshakeTimingMiddleware.d.ts +2 -2
- package/dist/api/handshakeTimingMiddleware.js +11 -11
- package/dist/api/hardBlockVerdictCache.d.ts +18 -0
- package/dist/api/hardBlockVerdictCache.d.ts.map +1 -0
- package/dist/api/hardBlockVerdictCache.js +119 -0
- package/dist/api/hardBlockVerdictCache.js.map +1 -0
- package/dist/api/startProviderApi.d.ts.map +1 -1
- package/dist/api/startProviderApi.js.map +1 -1
- package/dist/cjs/api/blacklistRequestInspector.cjs +49 -11
- package/dist/cjs/api/block.cjs +4 -0
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs +19 -13
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.cjs +7 -1
- package/dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs +13 -7
- package/dist/cjs/api/handshakeTimingMiddleware.cjs +11 -11
- package/dist/cjs/api/hardBlockVerdictCache.cjs +119 -0
- package/dist/cjs/index.cjs +1 -0
- package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs +13 -9
- package/dist/cjs/tasks/spam/checkTrafficFilter.cjs +6 -9
- package/dist/index.js +2 -1
- package/dist/tasks/captchaManager.d.ts +1 -0
- package/dist/tasks/captchaManager.d.ts.map +1 -1
- package/dist/tasks/captchaManager.js.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.d.ts +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.js +13 -9
- package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
- package/dist/tasks/spam/checkTrafficFilter.d.ts.map +1 -1
- package/dist/tasks/spam/checkTrafficFilter.js +6 -9
- package/dist/tasks/spam/checkTrafficFilter.js.map +1 -1
- package/dist/tests/integration/api/blacklistRequestInspector.integration.test.js +2 -1
- package/dist/tests/integration/api/blacklistRequestInspector.integration.test.js.map +1 -1
- package/dist/tests/integration/api/blacklistRequestInspector.storm.integration.test.d.ts +2 -0
- package/dist/tests/integration/api/blacklistRequestInspector.storm.integration.test.d.ts.map +1 -0
- package/dist/tests/integration/api/blacklistRequestInspector.storm.integration.test.js +295 -0
- package/dist/tests/integration/api/blacklistRequestInspector.storm.integration.test.js.map +1 -0
- package/dist/tests/integration/maintenanceModeAdmin.integration.test.d.ts +2 -0
- package/dist/tests/integration/maintenanceModeAdmin.integration.test.d.ts.map +1 -0
- package/dist/tests/integration/maintenanceModeAdmin.integration.test.js +258 -0
- package/dist/tests/integration/maintenanceModeAdmin.integration.test.js.map +1 -0
- package/dist/tests/unit/api/adminRoutes.unit.test.js +25 -0
- package/dist/tests/unit/api/adminRoutes.unit.test.js.map +1 -1
- package/dist/tests/unit/api/blacklistRequestInspector.unit.test.js +8 -2
- package/dist/tests/unit/api/blacklistRequestInspector.unit.test.js.map +1 -1
- package/dist/tests/unit/api/block.unit.test.js +15 -1
- package/dist/tests/unit/api/block.unit.test.js.map +1 -1
- package/dist/tests/unit/api/handshakeTimingMiddleware.unit.test.js +22 -22
- package/dist/tests/unit/api/hardBlockVerdictCache.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/hardBlockVerdictCache.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/hardBlockVerdictCache.unit.test.js +192 -0
- package/dist/tests/unit/api/hardBlockVerdictCache.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +2 -0
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js +73 -1
- package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js.map +1 -1
- package/package.json +13 -13
|
@@ -24,7 +24,7 @@ export declare class FrictionlessManager extends CaptchaManager {
|
|
|
24
24
|
setSessionParams(params: Omit<Session, "sessionId" | "createdAt" | "captchaType">): void;
|
|
25
25
|
updateScore(score: number, scoreComponents: ScoreComponents): void;
|
|
26
26
|
checkLangRules(acceptLanguage: string): number;
|
|
27
|
-
createSession(token: string, score: number, threshold: number, scoreComponents: ScoreComponents, ipAddress: CompositeIpAddress, captchaType: CaptchaType, siteKey: string, solvedImagesCount?: number, powDifficulty?: number, userSitekeyIpHash?: string, webView?: boolean, iFrame?: boolean, decryptedHeadHash?: string, reason?: FrictionlessReason, blocked?: boolean, deleted?: boolean, ipInfo?: IPInfoResponse, headers?: RequestHeaders, mode?: ModeEnum, simdReadings?: Session["simdReadings"], entropyMathRandomFingerprint?: Session["entropyMathRandomFingerprint"], entropyCryptoFingerprint?: Session["entropyCryptoFingerprint"], entropyWallClockOffsetMs?: Session["entropyWallClockOffsetMs"], entropyMathRandomFirst?: Session["entropyMathRandomFirst"], currentUrl?: Session["currentUrl"],
|
|
27
|
+
createSession(token: string, score: number, threshold: number, scoreComponents: ScoreComponents, ipAddress: CompositeIpAddress, captchaType: CaptchaType, siteKey: string, solvedImagesCount?: number, powDifficulty?: number, userSitekeyIpHash?: string, webView?: boolean, iFrame?: boolean, decryptedHeadHash?: string, reason?: FrictionlessReason, blocked?: boolean, deleted?: boolean, ipInfo?: IPInfoResponse, headers?: RequestHeaders, mode?: ModeEnum, simdReadings?: Session["simdReadings"], entropyMathRandomFingerprint?: Session["entropyMathRandomFingerprint"], entropyCryptoFingerprint?: Session["entropyCryptoFingerprint"], entropyWallClockOffsetMs?: Session["entropyWallClockOffsetMs"], entropyMathRandomFirst?: Session["entropyMathRandomFirst"], currentUrl?: Session["currentUrl"], tcpToChelloUs?: Session["tcpToChelloUs"], chelloToHandshakeUs?: Session["chelloToHandshakeUs"], isEscalation?: Session["isEscalation"]): Promise<Session>;
|
|
28
28
|
sendImageCaptcha(params?: Partial<ImageCaptchaSessionParams>): Promise<GetFrictionlessCaptchaResponse>;
|
|
29
29
|
sendPowCaptcha(params?: Partial<PowCaptchaSessionParams>): Promise<GetFrictionlessCaptchaResponse>;
|
|
30
30
|
sendPuzzleCaptcha(params?: Partial<PuzzleCaptchaSessionParams>): Promise<GetFrictionlessCaptchaResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frictionlessTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"frictionlessTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,8 +72,8 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
72
72
|
entropyCryptoFingerprint: params.entropyCryptoFingerprint,
|
|
73
73
|
entropyWallClockOffsetMs: params.entropyWallClockOffsetMs,
|
|
74
74
|
entropyMathRandomFirst: params.entropyMathRandomFirst,
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
tcpToChelloUs: params.tcpToChelloUs,
|
|
76
|
+
chelloToHandshakeUs: params.chelloToHandshakeUs
|
|
77
77
|
};
|
|
78
78
|
}
|
|
79
79
|
updateScore(score, scoreComponents) {
|
|
@@ -85,7 +85,7 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
85
85
|
checkLangRules(acceptLanguage) {
|
|
86
86
|
return checkLangRules(this.config, acceptLanguage);
|
|
87
87
|
}
|
|
88
|
-
async createSession(token, score, threshold, scoreComponents, ipAddress, captchaType, siteKey, solvedImagesCount, powDifficulty, userSitekeyIpHash, webView = false, iFrame = false, decryptedHeadHash = "", reason, blocked, deleted, ipInfo, headers, mode, simdReadings, entropyMathRandomFingerprint, entropyCryptoFingerprint, entropyWallClockOffsetMs, entropyMathRandomFirst, currentUrl,
|
|
88
|
+
async createSession(token, score, threshold, scoreComponents, ipAddress, captchaType, siteKey, solvedImagesCount, powDifficulty, userSitekeyIpHash, webView = false, iFrame = false, decryptedHeadHash = "", reason, blocked, deleted, ipInfo, headers, mode, simdReadings, entropyMathRandomFingerprint, entropyCryptoFingerprint, entropyWallClockOffsetMs, entropyMathRandomFirst, currentUrl, tcpToChelloUs, chelloToHandshakeUs, isEscalation) {
|
|
89
89
|
const sessionRecord = {
|
|
90
90
|
sessionId: `${getSessionIDPrefix(this.config.host)}-${v4()}`,
|
|
91
91
|
createdAt: /* @__PURE__ */ new Date(),
|
|
@@ -101,6 +101,10 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
101
101
|
userSitekeyIpHash,
|
|
102
102
|
webView,
|
|
103
103
|
iFrame,
|
|
104
|
+
// Only persist the escalation flag when it's actually true —
|
|
105
|
+
// avoids polluting analytics with `false` on every plain
|
|
106
|
+
// frictionless session.
|
|
107
|
+
...isEscalation && { isEscalation: true },
|
|
104
108
|
decryptedHeadHash,
|
|
105
109
|
reason,
|
|
106
110
|
siteKey,
|
|
@@ -119,8 +123,8 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
119
123
|
entropyCryptoFingerprint,
|
|
120
124
|
entropyWallClockOffsetMs,
|
|
121
125
|
entropyMathRandomFirst,
|
|
122
|
-
|
|
123
|
-
|
|
126
|
+
tcpToChelloUs,
|
|
127
|
+
chelloToHandshakeUs
|
|
124
128
|
};
|
|
125
129
|
await this.db.storeSessionRecord(sessionRecord);
|
|
126
130
|
if (this.writeQueue) {
|
|
@@ -202,8 +206,8 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
202
206
|
effectiveParams.entropyWallClockOffsetMs,
|
|
203
207
|
effectiveParams.entropyMathRandomFirst,
|
|
204
208
|
effectiveParams.currentUrl,
|
|
205
|
-
effectiveParams.
|
|
206
|
-
effectiveParams.
|
|
209
|
+
effectiveParams.tcpToChelloUs,
|
|
210
|
+
effectiveParams.chelloToHandshakeUs
|
|
207
211
|
);
|
|
208
212
|
if (this.routingContext && this.usageCounters) {
|
|
209
213
|
this.usageCounters.incrManyAsync(
|
|
@@ -256,8 +260,8 @@ class FrictionlessManager extends CaptchaManager {
|
|
|
256
260
|
effectiveParams.entropyWallClockOffsetMs,
|
|
257
261
|
effectiveParams.entropyMathRandomFirst,
|
|
258
262
|
effectiveParams.currentUrl,
|
|
259
|
-
effectiveParams.
|
|
260
|
-
effectiveParams.
|
|
263
|
+
effectiveParams.tcpToChelloUs,
|
|
264
|
+
effectiveParams.chelloToHandshakeUs
|
|
261
265
|
);
|
|
262
266
|
}
|
|
263
267
|
scoreIncreaseAccessPolicy(accessPolicy, baseBotScore, botScore, scoreComponents) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkTrafficFilter.d.ts","sourceRoot":"","sources":["../../../src/tasks/spam/checkTrafficFilter.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,cAAc,EAEnB,KAAK,cAAc,EACnB,YAAY,EAEZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,kBAAkB,GAC3B,YAAY,CAAC,WAAW,GACxB,YAAY,CAAC,aAAa,GAC1B,YAAY,CAAC,WAAW,GACxB,YAAY,CAAC,cAAc,GAC3B,YAAY,CAAC,kBAAkB,GAC/B,YAAY,CAAC,cAAc,GAC3B,YAAY,CAAC,iBAAiB,GAC9B,YAAY,CAAC,eAAe,CAAC;AAEhC,MAAM,MAAM,kBAAkB,GAC3B;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GACpB;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"checkTrafficFilter.d.ts","sourceRoot":"","sources":["../../../src/tasks/spam/checkTrafficFilter.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,cAAc,EAEnB,KAAK,cAAc,EACnB,YAAY,EAEZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,kBAAkB,GAC3B,YAAY,CAAC,WAAW,GACxB,YAAY,CAAC,aAAa,GAC1B,YAAY,CAAC,WAAW,GACxB,YAAY,CAAC,cAAc,GAC3B,YAAY,CAAC,kBAAkB,GAC/B,YAAY,CAAC,cAAc,GAC3B,YAAY,CAAC,iBAAiB,GAC9B,YAAY,CAAC,eAAe,CAAC;AAEhC,MAAM,MAAM,kBAAkB,GAC3B;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GACpB;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAwInD,eAAO,MAAM,kBAAkB,WACtB,cAAc,GAAG,SAAS,iBACnB,OAAO,CAAC,cAAc,CAAC,iBACvB,aAAa,CAAC,cAAc,GAAG,SAAS,CAAC,iBACzC,OAAO,KACpB,kBAkBF,CAAC"}
|
|
@@ -21,7 +21,7 @@ const isDatacenterAllowlisted = (ipInfo, allowlist) => {
|
|
|
21
21
|
);
|
|
22
22
|
return candidates.some((c) => normalisedAllowlist.includes(c));
|
|
23
23
|
};
|
|
24
|
-
const evaluateIpInfo = (ipInfo, trafficFilter,
|
|
24
|
+
const evaluateIpInfo = (ipInfo, trafficFilter, isDnsExtra = false) => {
|
|
25
25
|
if (!ipInfo || !ipInfo.isValid) {
|
|
26
26
|
return { isBlocked: false };
|
|
27
27
|
}
|
|
@@ -44,7 +44,8 @@ const evaluateIpInfo = (ipInfo, trafficFilter, options) => {
|
|
|
44
44
|
return { isBlocked: true, reason: ResultReason.ABUSER_BLOCKED };
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
const datacenterSuppressedByCategory = ipInfo.isVPN && !trafficFilter.blockVpn || ipInfo.isProxy && !trafficFilter.blockProxy || ipInfo.isTor && !trafficFilter.blockTor || ipInfo.isCrawler && !trafficFilter.blockCrawler;
|
|
48
|
+
if (trafficFilter.blockDatacenter && ipInfo.isDatacenter && ipInfo.providerType !== "isp" && !datacenterSuppressedByCategory && !isDatacenterAllowlisted(ipInfo, trafficFilter.datacenterNameAllowlist)) {
|
|
48
49
|
return { isBlocked: true, reason: ResultReason.DATACENTER_BLOCKED };
|
|
49
50
|
}
|
|
50
51
|
if (trafficFilter.blockMobile && ipInfo.isMobile) {
|
|
@@ -53,15 +54,13 @@ const evaluateIpInfo = (ipInfo, trafficFilter, options) => {
|
|
|
53
54
|
if (trafficFilter.blockSatellite && ipInfo.isSatellite) {
|
|
54
55
|
return { isBlocked: true, reason: ResultReason.SATELLITE_BLOCKED };
|
|
55
56
|
}
|
|
56
|
-
if (trafficFilter.blockCrawler && ipInfo.isCrawler) {
|
|
57
|
+
if (!isDnsExtra && trafficFilter.blockCrawler && ipInfo.isCrawler) {
|
|
57
58
|
return { isBlocked: true, reason: ResultReason.CRAWLER_BLOCKED };
|
|
58
59
|
}
|
|
59
60
|
return { isBlocked: false };
|
|
60
61
|
};
|
|
61
62
|
const checkTrafficFilter = (ipInfo, trafficFilter, extraIpInfos, dnsPathValid) => {
|
|
62
|
-
const primary = evaluateIpInfo(ipInfo, trafficFilter
|
|
63
|
-
suppressVpnDatacenterInteraction: true
|
|
64
|
-
});
|
|
63
|
+
const primary = evaluateIpInfo(ipInfo, trafficFilter);
|
|
65
64
|
if (primary.isBlocked) {
|
|
66
65
|
return primary;
|
|
67
66
|
}
|
|
@@ -69,9 +68,7 @@ const checkTrafficFilter = (ipInfo, trafficFilter, extraIpInfos, dnsPathValid) =
|
|
|
69
68
|
return { isBlocked: false };
|
|
70
69
|
}
|
|
71
70
|
for (const extra of extraIpInfos ?? []) {
|
|
72
|
-
const result = evaluateIpInfo(extra, trafficFilter,
|
|
73
|
-
suppressVpnDatacenterInteraction: false
|
|
74
|
-
});
|
|
71
|
+
const result = evaluateIpInfo(extra, trafficFilter, true);
|
|
75
72
|
if (result.isBlocked) {
|
|
76
73
|
return result;
|
|
77
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkTrafficFilter.js","sourceRoot":"","sources":["../../../src/tasks/spam/checkTrafficFilter.ts"],"names":[],"mappings":"AAcA,OAAO,EAIN,YAAY,EACZ,wCAAwC,GACxC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"checkTrafficFilter.js","sourceRoot":"","sources":["../../../src/tasks/spam/checkTrafficFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { getIPAddressFromBigInt } from "@prosopo/util";
|
|
|
6
6
|
import { randomAsHex } from "@prosopo/util-crypto";
|
|
7
7
|
import { GenericContainer } from "testcontainers";
|
|
8
8
|
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi, } from "vitest";
|
|
9
|
-
import { getPrioritisedAccessRule } from "../../../api/blacklistRequestInspector.js";
|
|
9
|
+
import { getPrioritisedAccessRule, getVerdictCache, } from "../../../api/blacklistRequestInspector.js";
|
|
10
10
|
describe("blacklistRequestInspector Integration Tests", () => {
|
|
11
11
|
describe("getPrioritisedAccessRule", () => {
|
|
12
12
|
let env;
|
|
@@ -80,6 +80,7 @@ describe("blacklistRequestInspector Integration Tests", () => {
|
|
|
80
80
|
beforeEach(async () => {
|
|
81
81
|
[siteKeyMnemonic, siteKey] = await generateMnemonic();
|
|
82
82
|
await accessRulesStorage.deleteAllRules();
|
|
83
|
+
getVerdictCache().clear();
|
|
83
84
|
});
|
|
84
85
|
it("should return a rule when a JA4-UserAgent rule exists and the user matches the User Agent and the JA4", async () => {
|
|
85
86
|
const accessRule = accessRuleInput.parse({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklistRequestInspector.integration.test.js","sourceRoot":"","sources":["../../../../src/tests/integration/api/blacklistRequestInspector.integration.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"blacklistRequestInspector.integration.test.js","sourceRoot":"","sources":["../../../../src/tests/integration/api/blacklistRequestInspector.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blacklistRequestInspector.storm.integration.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/integration/api/blacklistRequestInspector.storm.integration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,295 @@
|
|
|
1
|
+
import { chunkIntoBatches, executeBatchesSequentially } from "@prosopo/common";
|
|
2
|
+
import { createTestRedisConnection, setupRedisIndex, } from "@prosopo/redis-client";
|
|
3
|
+
import { AccessPolicyType, } from "@prosopo/user-access-policy";
|
|
4
|
+
import { accessRulesRedisIndex, createRedisAccessRulesStorage, } from "@prosopo/user-access-policy/redis";
|
|
5
|
+
import { afterAll, beforeAll, beforeEach, describe, expect, test, } from "vitest";
|
|
6
|
+
import { getPrioritisedAccessRule, getVerdictCache, } from "../../../api/blacklistRequestInspector.js";
|
|
7
|
+
const IP_RULE_COUNT = 17_000;
|
|
8
|
+
const CIDR_RULE_COUNT = 1_300;
|
|
9
|
+
const MIXED_RULE_COUNT = 1_000;
|
|
10
|
+
const STORM_CONCURRENCY = 100;
|
|
11
|
+
const STORM_WAVE_COUNT = 10;
|
|
12
|
+
const MIXED_CONCURRENCY = 200;
|
|
13
|
+
const MIXED_WAVE_COUNT = 8;
|
|
14
|
+
const MIXED_HOT_SCOPE_RATIO = 0.3;
|
|
15
|
+
const PURE_STORM_P50_LATENCY_MS = 200;
|
|
16
|
+
const PURE_STORM_P99_LATENCY_MS = 800;
|
|
17
|
+
const MIXED_P50_LATENCY_MS = 400;
|
|
18
|
+
const MIXED_P99_LATENCY_MS = 1600;
|
|
19
|
+
const ipv4 = (i) => {
|
|
20
|
+
const base = 10n << 24n;
|
|
21
|
+
return base + BigInt(i);
|
|
22
|
+
};
|
|
23
|
+
const ipv4CidrRange = (i) => {
|
|
24
|
+
const octet = i % 256;
|
|
25
|
+
const base = (192n << 24n) + (168n << 16n) + (BigInt(octet) << 8n);
|
|
26
|
+
return { min: base, max: base + 255n };
|
|
27
|
+
};
|
|
28
|
+
const buildIpBlockRule = (i) => ({
|
|
29
|
+
type: AccessPolicyType.Block,
|
|
30
|
+
description: `bulk-ban-ip-${i}`,
|
|
31
|
+
numericIp: ipv4(i),
|
|
32
|
+
});
|
|
33
|
+
const buildCidrBlockRule = (i) => {
|
|
34
|
+
const { min, max } = ipv4CidrRange(i);
|
|
35
|
+
return {
|
|
36
|
+
type: AccessPolicyType.Block,
|
|
37
|
+
description: `bulk-ban-cidr-${i}`,
|
|
38
|
+
numericIpMaskMin: min,
|
|
39
|
+
numericIpMaskMax: max,
|
|
40
|
+
};
|
|
41
|
+
};
|
|
42
|
+
const buildMixedRule = (i) => {
|
|
43
|
+
const variant = i % 4;
|
|
44
|
+
if (variant === 0) {
|
|
45
|
+
return {
|
|
46
|
+
type: AccessPolicyType.Block,
|
|
47
|
+
description: `mixed-${i}`,
|
|
48
|
+
clientId: `client${i % 30}`,
|
|
49
|
+
ja4Hash: `t13d_load_${i % 50}`,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
if (variant === 1) {
|
|
53
|
+
return {
|
|
54
|
+
type: AccessPolicyType.Restrict,
|
|
55
|
+
description: `mixed-${i}`,
|
|
56
|
+
countryCode: `C${i % 30}`,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
if (variant === 2) {
|
|
60
|
+
return {
|
|
61
|
+
type: AccessPolicyType.Block,
|
|
62
|
+
description: `mixed-${i}`,
|
|
63
|
+
asn: 1000 + (i % 500),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
type: AccessPolicyType.Block,
|
|
68
|
+
description: `mixed-${i}`,
|
|
69
|
+
clientId: `client${i % 30}`,
|
|
70
|
+
userAgentHash: `ua${i % 100}`,
|
|
71
|
+
};
|
|
72
|
+
};
|
|
73
|
+
const percentile = (sortedMs, q) => {
|
|
74
|
+
if (sortedMs.length === 0)
|
|
75
|
+
return 0;
|
|
76
|
+
const idx = Math.min(sortedMs.length - 1, Math.floor((sortedMs.length - 1) * q));
|
|
77
|
+
return sortedMs[idx] ?? 0;
|
|
78
|
+
};
|
|
79
|
+
let uniqueCounter = 0;
|
|
80
|
+
const buildUniqueScope = () => {
|
|
81
|
+
const seq = uniqueCounter++;
|
|
82
|
+
return {
|
|
83
|
+
clientId: `client${seq % 30}`,
|
|
84
|
+
userScope: {
|
|
85
|
+
numericIp: ipv4(1_000_000 + seq),
|
|
86
|
+
ja4Hash: `unique_ja4_${seq}`,
|
|
87
|
+
userAgentHash: `unique_ua_${seq}`,
|
|
88
|
+
countryCode: `C${seq % 30}`,
|
|
89
|
+
asn: 5000 + (seq % 300),
|
|
90
|
+
},
|
|
91
|
+
};
|
|
92
|
+
};
|
|
93
|
+
const HOT_SCOPE = {
|
|
94
|
+
clientId: "client1",
|
|
95
|
+
userScope: {
|
|
96
|
+
numericIp: ipv4(42),
|
|
97
|
+
ja4Hash: "t13d_load_1",
|
|
98
|
+
userAgentHash: "ua5",
|
|
99
|
+
countryCode: "C5",
|
|
100
|
+
asn: 1005,
|
|
101
|
+
},
|
|
102
|
+
};
|
|
103
|
+
describe("blacklistRequestInspector storm behaviour", () => {
|
|
104
|
+
let redisConnection;
|
|
105
|
+
let accessRulesStorage;
|
|
106
|
+
const mockLogger = new Proxy({}, {
|
|
107
|
+
get: () => () => { },
|
|
108
|
+
});
|
|
109
|
+
beforeAll(async () => {
|
|
110
|
+
redisConnection = createTestRedisConnection();
|
|
111
|
+
await setupRedisIndex(redisConnection, accessRulesRedisIndex, mockLogger).getClient();
|
|
112
|
+
accessRulesStorage = createRedisAccessRulesStorage(redisConnection, mockLogger);
|
|
113
|
+
await redisConnection.getClient();
|
|
114
|
+
const rules = [];
|
|
115
|
+
for (let i = 0; i < IP_RULE_COUNT; i++)
|
|
116
|
+
rules.push(buildIpBlockRule(i));
|
|
117
|
+
for (let i = 0; i < CIDR_RULE_COUNT; i++)
|
|
118
|
+
rules.push(buildCidrBlockRule(i));
|
|
119
|
+
for (let i = 0; i < MIXED_RULE_COUNT; i++)
|
|
120
|
+
rules.push(buildMixedRule(i));
|
|
121
|
+
await executeBatchesSequentially(chunkIntoBatches(rules, 1000), async (batch) => {
|
|
122
|
+
await accessRulesStorage.insertRules(batch.map((rule) => ({ rule })));
|
|
123
|
+
});
|
|
124
|
+
}, 300_000);
|
|
125
|
+
afterAll(async () => {
|
|
126
|
+
await accessRulesStorage.deleteAllRules();
|
|
127
|
+
}, 120_000);
|
|
128
|
+
beforeEach(() => {
|
|
129
|
+
getVerdictCache().clear();
|
|
130
|
+
});
|
|
131
|
+
test(`pure retry storm: ${STORM_CONCURRENCY} in-flight × ${STORM_WAVE_COUNT} waves through getPrioritisedAccessRule`, async () => {
|
|
132
|
+
await getPrioritisedAccessRule(accessRulesStorage, { numericIp: ipv4(999_997) }, "warmup", { blockOnly: true });
|
|
133
|
+
getVerdictCache().clear();
|
|
134
|
+
const allSamples = [];
|
|
135
|
+
const perWave = [];
|
|
136
|
+
for (let wave = 0; wave < STORM_WAVE_COUNT; wave++) {
|
|
137
|
+
const waveStart = performance.now();
|
|
138
|
+
const waveSamples = [];
|
|
139
|
+
await Promise.all(Array.from({ length: STORM_CONCURRENCY }, async () => {
|
|
140
|
+
const start = performance.now();
|
|
141
|
+
const results = await getPrioritisedAccessRule(accessRulesStorage, HOT_SCOPE.userScope, HOT_SCOPE.clientId, { blockOnly: true });
|
|
142
|
+
const dur = performance.now() - start;
|
|
143
|
+
waveSamples.push(dur);
|
|
144
|
+
expect(results.find((r) => r.numericIp === HOT_SCOPE.userScope.numericIp)).toBeDefined();
|
|
145
|
+
}));
|
|
146
|
+
waveSamples.sort((a, b) => a - b);
|
|
147
|
+
perWave.push({
|
|
148
|
+
wave: wave + 1,
|
|
149
|
+
cacheSizeAfter: getVerdictCache().size(),
|
|
150
|
+
p50: percentile(waveSamples, 0.5),
|
|
151
|
+
p99: percentile(waveSamples, 0.99),
|
|
152
|
+
min: waveSamples[0] ?? 0,
|
|
153
|
+
max: waveSamples[waveSamples.length - 1] ?? 0,
|
|
154
|
+
elapsedMs: performance.now() - waveStart,
|
|
155
|
+
});
|
|
156
|
+
allSamples.push(...waveSamples);
|
|
157
|
+
}
|
|
158
|
+
allSamples.sort((a, b) => a - b);
|
|
159
|
+
const overallP50 = percentile(allSamples, 0.5);
|
|
160
|
+
const overallP99 = percentile(allSamples, 0.99);
|
|
161
|
+
const overallAvg = allSamples.reduce((a, b) => a + b, 0) / allSamples.length;
|
|
162
|
+
const totalRequests = STORM_CONCURRENCY * STORM_WAVE_COUNT;
|
|
163
|
+
const totalElapsed = perWave.reduce((sum, w) => sum + w.elapsedMs, 0);
|
|
164
|
+
const throughput = (totalRequests * 1000) / totalElapsed;
|
|
165
|
+
console.log(`pure storm ${STORM_CONCURRENCY}×${STORM_WAVE_COUNT}: avg=${overallAvg.toFixed(2)}ms ` +
|
|
166
|
+
`p50=${overallP50.toFixed(2)}ms p99=${overallP99.toFixed(2)}ms ` +
|
|
167
|
+
`throughput=${throughput.toFixed(0)} req/s`);
|
|
168
|
+
for (const w of perWave) {
|
|
169
|
+
console.log(` wave ${w.wave.toString().padStart(2)}: ` +
|
|
170
|
+
`p50=${w.p50.toFixed(2)}ms p99=${w.p99.toFixed(2)}ms ` +
|
|
171
|
+
`min=${w.min.toFixed(2)}ms max=${w.max.toFixed(2)}ms ` +
|
|
172
|
+
`elapsed=${w.elapsedMs.toFixed(0)}ms ` +
|
|
173
|
+
`cacheSize=${w.cacheSizeAfter}`);
|
|
174
|
+
}
|
|
175
|
+
expect(overallP50).toBeLessThan(PURE_STORM_P50_LATENCY_MS);
|
|
176
|
+
expect(overallP99).toBeLessThan(PURE_STORM_P99_LATENCY_MS);
|
|
177
|
+
const firstWave = perWave[0];
|
|
178
|
+
const steadyStateSamples = [];
|
|
179
|
+
for (let i = 1; i < perWave.length; i++) {
|
|
180
|
+
const w = perWave[i];
|
|
181
|
+
if (w)
|
|
182
|
+
steadyStateSamples.push(w.p50);
|
|
183
|
+
}
|
|
184
|
+
const steadyStateAvgP50 = steadyStateSamples.reduce((a, b) => a + b, 0) / steadyStateSamples.length;
|
|
185
|
+
expect(firstWave).toBeDefined();
|
|
186
|
+
if (firstWave) {
|
|
187
|
+
expect(steadyStateAvgP50 * 2).toBeLessThan(firstWave.p50);
|
|
188
|
+
}
|
|
189
|
+
expect(getVerdictCache().size()).toBe(1);
|
|
190
|
+
}, 300_000);
|
|
191
|
+
test(`mixed realistic: ${MIXED_CONCURRENCY} in-flight × ${MIXED_WAVE_COUNT} waves with ${Math.round(MIXED_HOT_SCOPE_RATIO * 100)}% hot-scope`, async () => {
|
|
192
|
+
uniqueCounter = 0;
|
|
193
|
+
await getPrioritisedAccessRule(accessRulesStorage, { numericIp: ipv4(999_996) }, "warmup", { blockOnly: true });
|
|
194
|
+
getVerdictCache().clear();
|
|
195
|
+
uniqueCounter = 0;
|
|
196
|
+
const hotPerWave = Math.floor(MIXED_CONCURRENCY * MIXED_HOT_SCOPE_RATIO);
|
|
197
|
+
const uniquePerWave = MIXED_CONCURRENCY - hotPerWave;
|
|
198
|
+
const hotSamples = [];
|
|
199
|
+
const uniqueSamples = [];
|
|
200
|
+
const perWave = [];
|
|
201
|
+
for (let wave = 0; wave < MIXED_WAVE_COUNT; wave++) {
|
|
202
|
+
const waveStart = performance.now();
|
|
203
|
+
const waveHot = [];
|
|
204
|
+
const waveUnique = [];
|
|
205
|
+
const requests = [];
|
|
206
|
+
for (let i = 0; i < hotPerWave; i++) {
|
|
207
|
+
requests.push({ kind: "hot", scope: HOT_SCOPE });
|
|
208
|
+
}
|
|
209
|
+
for (let i = 0; i < uniquePerWave; i++) {
|
|
210
|
+
requests.push({ kind: "unique", scope: buildUniqueScope() });
|
|
211
|
+
}
|
|
212
|
+
for (let i = requests.length - 1; i > 0; i--) {
|
|
213
|
+
const j = (i * 2654435761) % (i + 1);
|
|
214
|
+
const a = requests[i];
|
|
215
|
+
const b = requests[j];
|
|
216
|
+
if (a !== undefined && b !== undefined) {
|
|
217
|
+
requests[i] = b;
|
|
218
|
+
requests[j] = a;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
await Promise.all(requests.map(async (req) => {
|
|
222
|
+
const start = performance.now();
|
|
223
|
+
await getPrioritisedAccessRule(accessRulesStorage, req.scope.userScope, req.scope.clientId, { blockOnly: true });
|
|
224
|
+
const dur = performance.now() - start;
|
|
225
|
+
if (req.kind === "hot") {
|
|
226
|
+
waveHot.push(dur);
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
waveUnique.push(dur);
|
|
230
|
+
}
|
|
231
|
+
}));
|
|
232
|
+
waveHot.sort((a, b) => a - b);
|
|
233
|
+
waveUnique.sort((a, b) => a - b);
|
|
234
|
+
perWave.push({
|
|
235
|
+
wave: wave + 1,
|
|
236
|
+
hotP99: percentile(waveHot, 0.99),
|
|
237
|
+
uniqueP99: percentile(waveUnique, 0.99),
|
|
238
|
+
cacheSizeAfter: getVerdictCache().size(),
|
|
239
|
+
elapsedMs: performance.now() - waveStart,
|
|
240
|
+
});
|
|
241
|
+
hotSamples.push(...waveHot);
|
|
242
|
+
uniqueSamples.push(...waveUnique);
|
|
243
|
+
}
|
|
244
|
+
hotSamples.sort((a, b) => a - b);
|
|
245
|
+
uniqueSamples.sort((a, b) => a - b);
|
|
246
|
+
const hotP50 = percentile(hotSamples, 0.5);
|
|
247
|
+
const hotP99 = percentile(hotSamples, 0.99);
|
|
248
|
+
const uniqueP50 = percentile(uniqueSamples, 0.5);
|
|
249
|
+
const uniqueP99 = percentile(uniqueSamples, 0.99);
|
|
250
|
+
const totalRequests = MIXED_CONCURRENCY * MIXED_WAVE_COUNT;
|
|
251
|
+
const totalElapsed = perWave.reduce((sum, w) => sum + w.elapsedMs, 0);
|
|
252
|
+
const throughput = (totalRequests * 1000) / totalElapsed;
|
|
253
|
+
console.log(`mixed ${MIXED_CONCURRENCY}×${MIXED_WAVE_COUNT} ` +
|
|
254
|
+
`(${Math.round(MIXED_HOT_SCOPE_RATIO * 100)}% hot / ` +
|
|
255
|
+
`${100 - Math.round(MIXED_HOT_SCOPE_RATIO * 100)}% unique): ` +
|
|
256
|
+
`throughput=${throughput.toFixed(0)} req/s`);
|
|
257
|
+
console.log(` hot (n=${hotSamples.length}): p50=${hotP50.toFixed(2)}ms p99=${hotP99.toFixed(2)}ms`);
|
|
258
|
+
console.log(` unique (n=${uniqueSamples.length}): p50=${uniqueP50.toFixed(2)}ms p99=${uniqueP99.toFixed(2)}ms`);
|
|
259
|
+
for (const w of perWave) {
|
|
260
|
+
console.log(` wave ${w.wave.toString().padStart(2)}: ` +
|
|
261
|
+
`hot p99=${w.hotP99.toFixed(2)}ms ` +
|
|
262
|
+
`unique p99=${w.uniqueP99.toFixed(2)}ms ` +
|
|
263
|
+
`elapsed=${w.elapsedMs.toFixed(0)}ms ` +
|
|
264
|
+
`cacheSize=${w.cacheSizeAfter}`);
|
|
265
|
+
}
|
|
266
|
+
expect(uniqueP50).toBeLessThan(MIXED_P50_LATENCY_MS);
|
|
267
|
+
expect(uniqueP99).toBeLessThan(MIXED_P99_LATENCY_MS);
|
|
268
|
+
expect(hotP50 * 2).toBeLessThan(uniqueP50);
|
|
269
|
+
const expectedCacheSize = uniquePerWave * MIXED_WAVE_COUNT + 1;
|
|
270
|
+
expect(getVerdictCache().size()).toBe(expectedCacheSize);
|
|
271
|
+
}, 600_000);
|
|
272
|
+
test("singleflight: N concurrent identical wave-1 misses collapse to 1 storage call", async () => {
|
|
273
|
+
getVerdictCache().clear();
|
|
274
|
+
let storageCallCount = 0;
|
|
275
|
+
const originalFindRules = accessRulesStorage.findRules.bind(accessRulesStorage);
|
|
276
|
+
accessRulesStorage.findRules = async (...args) => {
|
|
277
|
+
storageCallCount++;
|
|
278
|
+
return originalFindRules(...args);
|
|
279
|
+
};
|
|
280
|
+
try {
|
|
281
|
+
const concurrency = 50;
|
|
282
|
+
const results = await Promise.all(Array.from({ length: concurrency }, () => getPrioritisedAccessRule(accessRulesStorage, HOT_SCOPE.userScope, HOT_SCOPE.clientId, { blockOnly: true })));
|
|
283
|
+
console.log(`singleflight: ${concurrency} concurrent identical requests → ${storageCallCount} storage call(s)`);
|
|
284
|
+
expect(storageCallCount).toBe(1);
|
|
285
|
+
expect(getVerdictCache().size()).toBe(1);
|
|
286
|
+
for (const r of results) {
|
|
287
|
+
expect(r.find((rule) => rule.numericIp === HOT_SCOPE.userScope.numericIp)).toBeDefined();
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
finally {
|
|
291
|
+
accessRulesStorage.findRules = originalFindRules;
|
|
292
|
+
}
|
|
293
|
+
}, 60_000);
|
|
294
|
+
});
|
|
295
|
+
//# sourceMappingURL=blacklistRequestInspector.storm.integration.test.js.map
|