@prosopo/user-access-policy 3.11.3 → 3.12.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.
Files changed (69) hide show
  1. package/.turbo/turbo-build$colon$cjs.log +38 -37
  2. package/.turbo/turbo-build$colon$tsc.log +14 -14
  3. package/.turbo/turbo-build.log +39 -38
  4. package/CHANGELOG.md +23 -0
  5. package/dist/api/delete/deleteRules.d.ts +2 -2
  6. package/dist/api/delete/deleteRules.d.ts.map +1 -1
  7. package/dist/api/delete/deleteRules.js.map +1 -1
  8. package/dist/api/read/findRuleIds.d.ts +1 -1
  9. package/dist/api/read/findRuleIds.d.ts.map +1 -1
  10. package/dist/api/read/findRuleIds.js.map +1 -1
  11. package/dist/cjs/redis/reader/redisRulesQuery.cjs +3 -2
  12. package/dist/cjs/redis/reader/redisRulesReader.cjs +101 -1
  13. package/dist/cjs/redis/reader/redisRulesSplitQuery.cjs +78 -0
  14. package/dist/cjs/redis/redisRuleIndex.cjs +3 -1
  15. package/dist/cjs/redis/redisRulesWriter.cjs +17 -6
  16. package/dist/cjs/rule.cjs +2 -0
  17. package/dist/cjs/ruleInput/policyInput.cjs +9 -1
  18. package/dist/redis/reader/redisRulesQuery.d.ts.map +1 -1
  19. package/dist/redis/reader/redisRulesQuery.js +4 -3
  20. package/dist/redis/reader/redisRulesQuery.js.map +1 -1
  21. package/dist/redis/reader/redisRulesReader.d.ts +1 -0
  22. package/dist/redis/reader/redisRulesReader.d.ts.map +1 -1
  23. package/dist/redis/reader/redisRulesReader.js +101 -1
  24. package/dist/redis/reader/redisRulesReader.js.map +1 -1
  25. package/dist/redis/reader/redisRulesSplitQuery.d.ts +8 -0
  26. package/dist/redis/reader/redisRulesSplitQuery.d.ts.map +1 -0
  27. package/dist/redis/reader/redisRulesSplitQuery.js +78 -0
  28. package/dist/redis/reader/redisRulesSplitQuery.js.map +1 -0
  29. package/dist/redis/redisRuleIndex.d.ts +1 -0
  30. package/dist/redis/redisRuleIndex.d.ts.map +1 -1
  31. package/dist/redis/redisRuleIndex.js +2 -0
  32. package/dist/redis/redisRuleIndex.js.map +1 -1
  33. package/dist/redis/redisRulesWriter.d.ts +1 -1
  34. package/dist/redis/redisRulesWriter.d.ts.map +1 -1
  35. package/dist/redis/redisRulesWriter.js +14 -3
  36. package/dist/redis/redisRulesWriter.js.map +1 -1
  37. package/dist/rule.d.ts +1 -0
  38. package/dist/rule.d.ts.map +1 -1
  39. package/dist/rule.js +3 -1
  40. package/dist/rule.js.map +1 -1
  41. package/dist/ruleInput/policyInput.d.ts +2 -2
  42. package/dist/ruleInput/policyInput.d.ts.map +1 -1
  43. package/dist/ruleInput/policyInput.js +10 -2
  44. package/dist/ruleInput/policyInput.js.map +1 -1
  45. package/dist/ruleInput/ruleInput.d.ts +6 -6
  46. package/dist/ruleInput/ruleInput.d.ts.map +1 -1
  47. package/dist/ruleInput/ruleInput.js.map +1 -1
  48. package/dist/tests/redis/reader/redisRulesSplitQuery.unit.test.d.ts +2 -0
  49. package/dist/tests/redis/reader/redisRulesSplitQuery.unit.test.d.ts.map +1 -0
  50. package/dist/tests/redis/reader/redisRulesSplitQuery.unit.test.js +79 -0
  51. package/dist/tests/redis/reader/redisRulesSplitQuery.unit.test.js.map +1 -0
  52. package/dist/tests/redis/redisRulesReaderLoad.benchmark.integration.test.d.ts +2 -0
  53. package/dist/tests/redis/redisRulesReaderLoad.benchmark.integration.test.d.ts.map +1 -0
  54. package/dist/tests/redis/redisRulesReaderLoad.benchmark.integration.test.js +288 -0
  55. package/dist/tests/redis/redisRulesReaderLoad.benchmark.integration.test.js.map +1 -0
  56. package/package.json +3 -3
  57. package/src/api/delete/deleteRules.ts +7 -1
  58. package/src/api/read/findRuleIds.ts +3 -1
  59. package/src/redis/reader/redisRulesQuery.ts +12 -2
  60. package/src/redis/reader/redisRulesReader.ts +145 -7
  61. package/src/redis/reader/redisRulesSplitQuery.ts +170 -0
  62. package/src/redis/redisRuleIndex.ts +6 -0
  63. package/src/redis/redisRulesWriter.ts +19 -5
  64. package/src/rule.ts +12 -0
  65. package/src/ruleInput/policyInput.ts +17 -3
  66. package/src/ruleInput/ruleInput.ts +7 -1
  67. package/src/tests/redis/reader/redisRulesSplitQuery.unit.test.ts +132 -0
  68. package/src/tests/redis/redisRulesReaderLoad.benchmark.integration.test.ts +516 -0
  69. package/tsconfig.tsbuildinfo +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"ruleInput.js","sourceRoot":"","sources":["../../src/ruleInput/ruleInput.ts"],"names":[],"mappings":"AAeA,OAAO,EAAgB,CAAC,EAAE,MAAM,KAAK,CAAC;AAEtC,OAAO,EAGN,gBAAgB,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAuB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAY1E,MAAM,cAAc,GAAG,CAAC;KACtB,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACP,CAAC;KACnC,SAAS,CAAC,CAAC,cAA8B,EAAE,EAAE;IAC7C,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,GAAG,cAAc,CAAC;IAErD,IAAI,QAAQ,KAAK,OAAO,WAAW,EAAE,CAAC;QACrC,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC,CAAC;AAOJ,MAAM,CAAC,MAAM,eAAe,GAA+C,CAAC;KAC1E,MAAM,CAAC;IACP,GAAG,iBAAiB,CAAC,KAAK;IAC1B,GAAG,gBAAgB,CAAC,KAAK;CACzB,CAAC;KACD,GAAG,CAAC,cAAc,CAAC;KACnB,GAAG,CAAC,cAAc,CAAC;KACnB,SAAS,CAAC,CAAC,SAA0B,EAAc,EAAE,CAAC,SAAS,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,cAAc,GAC1B,CAAC,CAAC,MAAM,CAAC;IACR,IAAI,EAAE,eAAe;IACrB,oBAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACf,CAAC,CAAC;AAOvC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,WAAW,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE;IAClD,gBAAgB,EAAE,CAAC;SACjB,UAAU,CAAC,gBAAgB,CAAC;SAC5B,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE;IACpC,cAAc,EAAE,CAAC;SACf,UAAU,CAAC,gBAAgB,CAAC;SAC5B,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACS,CAA2C,CAAC;AAEvF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC5C,WAAmC,EACb,EAAE;IACxB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IAEjE,MAAM,eAAe,GAAG,YAAY,IAAI,EAAE,CAAC;IAE3C,IAAI,WAAW,EAAE,CAAC;QACjB,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC5C,GAAG,UAAU;YACb,WAAW;SACX,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC,CAAC"}
1
+ {"version":3,"file":"ruleInput.js","sourceRoot":"","sources":["../../src/ruleInput/ruleInput.ts"],"names":[],"mappings":"AAeA,OAAO,EAAgB,CAAC,EAAE,MAAM,KAAK,CAAC;AAEtC,OAAO,EAGN,gBAAgB,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAuB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAY1E,MAAM,cAAc,GAAG,CAAC;KACtB,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACP,CAAC;KACnC,SAAS,CAAC,CAAC,cAA8B,EAAE,EAAE;IAC7C,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,GAAG,cAAc,CAAC;IAErD,IAAI,QAAQ,KAAK,OAAO,WAAW,EAAE,CAAC;QACrC,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC,CAAC;AAOJ,MAAM,CAAC,MAAM,eAAe,GAA+C,CAAC;KAC1E,MAAM,CAAC;IACP,GAAG,iBAAiB,CAAC,KAAK;IAC1B,GAAG,gBAAgB,CAAC,KAAK;CACzB,CAAC;KACD,GAAG,CAAC,cAAc,CAAC;KACnB,GAAG,CAAC,cAAc,CAAC;KACnB,SAAS,CAAC,CAAC,SAA0B,EAAc,EAAE,CAAC,SAAS,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,cAAc,GAC1B,CAAC,CAAC,MAAM,CAAC;IACR,IAAI,EAAE,eAAe;IACrB,oBAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACf,CAAC,CAAC;AAavC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,WAAW,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE;IAClD,gBAAgB,EAAE,CAAC;SACjB,UAAU,CAAC,gBAAgB,CAAC;SAC5B,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE;IACpC,cAAc,EAAE,CAAC;SACf,UAAU,CAAC,gBAAgB,CAAC;SAC5B,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACS,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC5C,WAAmC,EACb,EAAE;IACxB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IAEjE,MAAM,eAAe,GAAG,YAAY,IAAI,EAAE,CAAC;IAE3C,IAAI,WAAW,EAAE,CAAC;QACjB,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC5C,GAAG,UAAU;YACb,WAAW;SACX,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=redisRulesSplitQuery.unit.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redisRulesSplitQuery.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/redis/reader/redisRulesSplitQuery.unit.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,79 @@
1
+ import { describe, expect, it } from "vitest";
2
+ import { buildScopedBlockSubQueries } from "#policy/redis/reader/redisRulesSplitQuery.js";
3
+ describe("buildScopedBlockSubQueries", () => {
4
+ it("emits one sub-query per populated user-scope field", () => {
5
+ const subs = buildScopedBlockSubQueries({
6
+ ja4Hash: "abc",
7
+ userAgentHash: "def",
8
+ }, "client-A");
9
+ const kinds = subs.map((s) => s.kind).sort();
10
+ expect(kinds).toEqual([
11
+ "field:ja4Hash",
12
+ "field:userAgentHash",
13
+ "no-user-scope",
14
+ ]);
15
+ });
16
+ it("emits both ip-exact and ip-mask sub-queries when request has an IP", () => {
17
+ const subs = buildScopedBlockSubQueries({
18
+ numericIp: 3232235777n,
19
+ }, "client-A");
20
+ const kinds = subs.map((s) => s.kind);
21
+ expect(kinds).toContain("ip:exact");
22
+ expect(kinds).toContain("ip:mask");
23
+ const ipExact = subs.find((s) => s.kind === "ip:exact");
24
+ expect(ipExact?.query).toContain("@numericIp:[3232235777 3232235777]");
25
+ const ipMask = subs.find((s) => s.kind === "ip:mask");
26
+ expect(ipMask?.query).toContain("@numericIpMaskMin:[-inf 3232235777]");
27
+ expect(ipMask?.query).toContain("@numericIpMaskMax:[3232235777 +inf]");
28
+ });
29
+ it("scopes every sub-query with @type:{block} and @clientId probe", () => {
30
+ const subs = buildScopedBlockSubQueries({ ja4Hash: "abc" }, "client-A");
31
+ for (const sub of subs) {
32
+ expect(sub.query).toContain("@type:{block}");
33
+ expect(sub.query).toMatch(/@clientId:\{client-A\}/);
34
+ expect(sub.query).toMatch(/@clientId:\{global\}/);
35
+ expect(sub.query).toMatch(/ismissing\(@clientId\)/);
36
+ }
37
+ });
38
+ it("skips the client-specific probe when no clientId is passed", () => {
39
+ const subs = buildScopedBlockSubQueries({ ja4Hash: "abc" }, undefined);
40
+ for (const sub of subs) {
41
+ expect(sub.query).toMatch(/@clientId:\{global\}/);
42
+ expect(sub.query).toMatch(/ismissing\(@clientId\)/);
43
+ }
44
+ });
45
+ it("emits a no-user-scope fall-through query with ismissing() over every user-scope field", () => {
46
+ const subs = buildScopedBlockSubQueries({ ja4Hash: "abc" }, "client-A");
47
+ const fallThrough = subs.find((s) => s.kind === "no-user-scope");
48
+ expect(fallThrough).toBeDefined();
49
+ for (const field of [
50
+ "userId",
51
+ "ja4Hash",
52
+ "headersHash",
53
+ "userAgentHash",
54
+ "headHash",
55
+ "coords",
56
+ "countryCode",
57
+ "asn",
58
+ "numericIp",
59
+ "numericIpMaskMin",
60
+ "numericIpMaskMax",
61
+ ]) {
62
+ expect(fallThrough?.query).toContain(`ismissing(@${field})`);
63
+ }
64
+ });
65
+ it("uses NUMERIC range syntax for asn, not TAG syntax", () => {
66
+ const subs = buildScopedBlockSubQueries({ asn: 205016 }, "client-A");
67
+ const asnSub = subs.find((s) => s.kind === "field:asn");
68
+ expect(asnSub).toBeDefined();
69
+ expect(asnSub?.query).toContain("@asn:[205016 205016]");
70
+ expect(asnSub?.query).not.toContain("@asn:{");
71
+ });
72
+ it("escapes JSON special characters in coords tag queries", () => {
73
+ const subs = buildScopedBlockSubQueries({ coords: "[[[100,200]]]" }, "client-A");
74
+ const coordsSub = subs.find((s) => s.kind === "field:coords");
75
+ expect(coordsSub).toBeDefined();
76
+ expect(coordsSub?.query).toContain("@coords:{\\[\\[\\[100\\,200\\]\\]\\]}");
77
+ });
78
+ });
79
+ //# sourceMappingURL=redisRulesSplitQuery.unit.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redisRulesSplitQuery.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/redis/reader/redisRulesSplitQuery.unit.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=redisRulesReaderLoad.benchmark.integration.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redisRulesReaderLoad.benchmark.integration.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisRulesReaderLoad.benchmark.integration.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,288 @@
1
+ import { chunkIntoBatches, executeBatchesSequentially } from "@prosopo/common";
2
+ import { createTestRedisConnection, setupRedisIndex, } from "@prosopo/redis-client";
3
+ import { afterAll, beforeAll, describe, expect, test } from "vitest";
4
+ import { RedisRulesReader } from "#policy/redis/reader/redisRulesReader.js";
5
+ import { ACCESS_RULES_REDIS_INDEX_NAME, accessRulesRedisIndex, getAccessRuleRedisKey, } from "#policy/redis/redisRuleIndex.js";
6
+ import { getRedisRuleValue } from "#policy/redis/redisRulesWriter.js";
7
+ import { AccessPolicyType } from "#policy/rule.js";
8
+ import { FilterScopeMatch } from "#policy/rulesStorage.js";
9
+ const IP_RULE_COUNT = 17_000;
10
+ const CIDR_RULE_COUNT = 1_300;
11
+ const MIXED_RULE_COUNT = 1_000;
12
+ const QUERY_COUNT = 300;
13
+ const STORM_CONCURRENCY = 100;
14
+ const STORM_WAVE_COUNT = 10;
15
+ const P50_LATENCY_MS = 120;
16
+ const P99_LATENCY_MS = 400;
17
+ const STORM_P50_LATENCY_MS = 200;
18
+ const STORM_P99_LATENCY_MS = 800;
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
+ describe("redisRulesReader load-shape benchmark (17k IP-only rules)", () => {
80
+ let redisConnection;
81
+ let redisClient;
82
+ let reader;
83
+ const mockLogger = new Proxy({}, {
84
+ get: () => () => { },
85
+ });
86
+ const seededKeys = [];
87
+ beforeAll(async () => {
88
+ redisConnection = createTestRedisConnection();
89
+ redisClient = await setupRedisIndex(redisConnection, accessRulesRedisIndex, mockLogger).getClient();
90
+ reader = new RedisRulesReader(redisClient, mockLogger);
91
+ const rules = [];
92
+ for (let i = 0; i < IP_RULE_COUNT; i++)
93
+ rules.push(buildIpBlockRule(i));
94
+ for (let i = 0; i < CIDR_RULE_COUNT; i++)
95
+ rules.push(buildCidrBlockRule(i));
96
+ for (let i = 0; i < MIXED_RULE_COUNT; i++)
97
+ rules.push(buildMixedRule(i));
98
+ await executeBatchesSequentially(chunkIntoBatches(rules, 1000), async (batch) => {
99
+ const multi = redisClient.multi();
100
+ for (const rule of batch) {
101
+ const key = getAccessRuleRedisKey(rule);
102
+ seededKeys.push(key);
103
+ multi.hSet(key, getRedisRuleValue(rule));
104
+ }
105
+ await multi.exec();
106
+ });
107
+ const indexInfo = await redisClient.ft.info(ACCESS_RULES_REDIS_INDEX_NAME);
108
+ const expectedRules = IP_RULE_COUNT + CIDR_RULE_COUNT + MIXED_RULE_COUNT;
109
+ expect(indexInfo.num_docs).toBeGreaterThan(expectedRules * 0.9);
110
+ }, 300_000);
111
+ afterAll(async () => {
112
+ await executeBatchesSequentially(chunkIntoBatches(seededKeys, 1000), async (batch) => {
113
+ const multi = redisClient.multi();
114
+ for (const key of batch) {
115
+ multi.del(key);
116
+ }
117
+ await multi.exec();
118
+ });
119
+ }, 60_000);
120
+ test(`split-query hot path stays flat under ${IP_RULE_COUNT + CIDR_RULE_COUNT + MIXED_RULE_COUNT} rules`, async () => {
121
+ await reader.findRules({
122
+ policyScope: { clientId: "warmup" },
123
+ policyScopeMatch: FilterScopeMatch.Greedy,
124
+ userScope: { numericIp: ipv4(999_999) },
125
+ userScopeMatch: FilterScopeMatch.Greedy,
126
+ blockOnly: true,
127
+ }, true);
128
+ const samples = [];
129
+ for (let i = 0; i < QUERY_COUNT; i++) {
130
+ const isHit = i % 2 === 0;
131
+ const numericIp = isHit
132
+ ? ipv4(i % IP_RULE_COUNT)
133
+ : ipv4(IP_RULE_COUNT + i + 1_000_000);
134
+ const start = performance.now();
135
+ await reader.findRules({
136
+ policyScope: { clientId: `client${i % 30}` },
137
+ policyScopeMatch: FilterScopeMatch.Greedy,
138
+ userScope: {
139
+ numericIp,
140
+ ja4Hash: `t13d_load_${i % 50}`,
141
+ userAgentHash: `ua${i % 100}`,
142
+ countryCode: `C${i % 30}`,
143
+ asn: 1000 + (i % 500),
144
+ },
145
+ userScopeMatch: FilterScopeMatch.Greedy,
146
+ blockOnly: true,
147
+ }, true);
148
+ samples.push(performance.now() - start);
149
+ }
150
+ samples.sort((a, b) => a - b);
151
+ const p50 = percentile(samples, 0.5);
152
+ const p99 = percentile(samples, 0.99);
153
+ const avg = samples.reduce((a, b) => a + b, 0) / samples.length;
154
+ console.log(`split-query load: avg=${avg.toFixed(2)}ms p50=${p50.toFixed(2)}ms p99=${p99.toFixed(2)}ms n=${samples.length} (${IP_RULE_COUNT} IPs + ${CIDR_RULE_COUNT} CIDRs + ${MIXED_RULE_COUNT} mixed)`);
155
+ expect(p50).toBeLessThan(P50_LATENCY_MS);
156
+ expect(p99).toBeLessThan(P99_LATENCY_MS);
157
+ }, 300_000);
158
+ test("finds exact-IP bulk-ban rule for matching request", async () => {
159
+ const targetIp = ipv4(42);
160
+ const results = await reader.findRules({
161
+ policyScope: { clientId: "client1" },
162
+ policyScopeMatch: FilterScopeMatch.Greedy,
163
+ userScope: {
164
+ numericIp: targetIp,
165
+ ja4Hash: "t13d_load_1",
166
+ },
167
+ userScopeMatch: FilterScopeMatch.Greedy,
168
+ blockOnly: true,
169
+ }, true);
170
+ const found = results.find((r) => r.numericIp === targetIp);
171
+ expect(found).toBeDefined();
172
+ expect(found?.type).toBe(AccessPolicyType.Block);
173
+ }, 60_000);
174
+ test("finds CIDR-range bulk-ban rule for request IP inside the range", async () => {
175
+ const { min, max } = ipv4CidrRange(7);
176
+ const requestIp = min + 42n;
177
+ expect(requestIp).toBeLessThanOrEqual(max);
178
+ const results = await reader.findRules({
179
+ policyScope: { clientId: "client1" },
180
+ policyScopeMatch: FilterScopeMatch.Greedy,
181
+ userScope: { numericIp: requestIp },
182
+ userScopeMatch: FilterScopeMatch.Greedy,
183
+ blockOnly: true,
184
+ }, true);
185
+ const found = results.find((r) => r.numericIpMaskMin === min &&
186
+ r.numericIpMaskMax === max &&
187
+ r.type === AccessPolicyType.Block);
188
+ expect(found).toBeDefined();
189
+ }, 60_000);
190
+ test("finds ja4-scoped rule via the split-query ja4 probe", async () => {
191
+ const results = await reader.findRules({
192
+ policyScope: { clientId: "client0" },
193
+ policyScopeMatch: FilterScopeMatch.Greedy,
194
+ userScope: {
195
+ numericIp: ipv4(999_998),
196
+ ja4Hash: "t13d_load_0",
197
+ },
198
+ userScopeMatch: FilterScopeMatch.Greedy,
199
+ blockOnly: true,
200
+ }, true);
201
+ const ja4Rule = results.find((r) => r.ja4Hash === "t13d_load_0" && r.clientId === "client0");
202
+ expect(ja4Rule).toBeDefined();
203
+ }, 60_000);
204
+ test("returns no match when request IP is outside every rule range", async () => {
205
+ const results = await reader.findRules({
206
+ policyScope: { clientId: "client99" },
207
+ policyScopeMatch: FilterScopeMatch.Greedy,
208
+ userScope: { numericIp: ipv4(9_999_999) },
209
+ userScopeMatch: FilterScopeMatch.Greedy,
210
+ blockOnly: true,
211
+ }, true);
212
+ const ipMatch = results.find((r) => r.numericIp !== undefined ||
213
+ (r.numericIpMaskMin !== undefined && r.numericIpMaskMax !== undefined));
214
+ expect(ipMatch).toBeUndefined();
215
+ }, 60_000);
216
+ test(`concurrent retry-storm: ${STORM_CONCURRENCY} in-flight × ${STORM_WAVE_COUNT} waves against ${IP_RULE_COUNT + CIDR_RULE_COUNT + MIXED_RULE_COUNT} rules`, async () => {
217
+ await reader.findRules({
218
+ policyScope: { clientId: "client1" },
219
+ policyScopeMatch: FilterScopeMatch.Greedy,
220
+ userScope: { numericIp: ipv4(999_997) },
221
+ userScopeMatch: FilterScopeMatch.Greedy,
222
+ blockOnly: true,
223
+ }, true);
224
+ const stormScope = {
225
+ numericIp: ipv4(42),
226
+ ja4Hash: "t13d_load_1",
227
+ userAgentHash: "ua5",
228
+ countryCode: "C5",
229
+ asn: 1005,
230
+ };
231
+ const clientId = "client1";
232
+ const allSamples = [];
233
+ const perWave = [];
234
+ for (let wave = 0; wave < STORM_WAVE_COUNT; wave++) {
235
+ const waveStart = performance.now();
236
+ const waveSamples = [];
237
+ await Promise.all(Array.from({ length: STORM_CONCURRENCY }, async () => {
238
+ const start = performance.now();
239
+ const results = await reader.findRules({
240
+ policyScope: { clientId },
241
+ policyScopeMatch: FilterScopeMatch.Greedy,
242
+ userScope: stormScope,
243
+ userScopeMatch: FilterScopeMatch.Greedy,
244
+ blockOnly: true,
245
+ }, true);
246
+ const dur = performance.now() - start;
247
+ waveSamples.push(dur);
248
+ expect(results.find((r) => r.numericIp === stormScope.numericIp)).toBeDefined();
249
+ }));
250
+ const waveElapsed = performance.now() - waveStart;
251
+ waveSamples.sort((a, b) => a - b);
252
+ const p50 = percentile(waveSamples, 0.5);
253
+ const p99 = percentile(waveSamples, 0.99);
254
+ const min = waveSamples[0] ?? 0;
255
+ const max = waveSamples[waveSamples.length - 1] ?? 0;
256
+ perWave.push({
257
+ wave: wave + 1,
258
+ p50,
259
+ p99,
260
+ min,
261
+ max,
262
+ elapsedMs: waveElapsed,
263
+ });
264
+ allSamples.push(...waveSamples);
265
+ }
266
+ allSamples.sort((a, b) => a - b);
267
+ const overallP50 = percentile(allSamples, 0.5);
268
+ const overallP99 = percentile(allSamples, 0.99);
269
+ const overallAvg = allSamples.reduce((a, b) => a + b, 0) / allSamples.length;
270
+ const totalRequests = STORM_CONCURRENCY * STORM_WAVE_COUNT;
271
+ const totalElapsed = perWave.reduce((sum, w) => sum + w.elapsedMs, 0);
272
+ const throughput = (totalRequests * 1000) / totalElapsed;
273
+ console.log(`storm ${STORM_CONCURRENCY}×${STORM_WAVE_COUNT}: avg=${overallAvg.toFixed(2)}ms p50=${overallP50.toFixed(2)}ms p99=${overallP99.toFixed(2)}ms ` +
274
+ `throughput=${throughput.toFixed(0)} req/s total=${totalElapsed.toFixed(0)}ms`);
275
+ for (const w of perWave) {
276
+ console.log(` wave ${w.wave.toString().padStart(2)}: p50=${w.p50.toFixed(2)}ms p99=${w.p99.toFixed(2)}ms ` +
277
+ `min=${w.min.toFixed(2)}ms max=${w.max.toFixed(2)}ms wave-elapsed=${w.elapsedMs.toFixed(0)}ms`);
278
+ }
279
+ expect(overallP50).toBeLessThan(STORM_P50_LATENCY_MS);
280
+ expect(overallP99).toBeLessThan(STORM_P99_LATENCY_MS);
281
+ const firstWave = perWave[0];
282
+ expect(firstWave).toBeDefined();
283
+ if (firstWave) {
284
+ expect(firstWave.p99).toBeLessThan(STORM_P99_LATENCY_MS);
285
+ }
286
+ }, 300_000);
287
+ });
288
+ //# sourceMappingURL=redisRulesReaderLoad.benchmark.integration.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redisRulesReaderLoad.benchmark.integration.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisRulesReaderLoad.benchmark.integration.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/user-access-policy",
3
- "version": "3.11.3",
3
+ "version": "3.12.0",
4
4
  "type": "module",
5
5
  "engines": {
6
6
  "node": "^24",
@@ -43,12 +43,12 @@
43
43
  "test": "npm run test:unit && npm run test:integration"
44
44
  },
45
45
  "dependencies": {
46
- "@prosopo/api": "3.5.12",
46
+ "@prosopo/api": "3.5.13",
47
47
  "@prosopo/api-route": "2.6.50",
48
48
  "@prosopo/common": "3.1.43",
49
49
  "@prosopo/logger": "2.0.1",
50
50
  "@prosopo/redis-client": "1.0.27",
51
- "@prosopo/types": "4.9.5",
51
+ "@prosopo/types": "4.9.6",
52
52
  "@prosopo/util": "3.3.3",
53
53
  "@redis/search": "5.0.0",
54
54
  "cidr-calc": "1.0.4",
@@ -27,7 +27,13 @@ import {
27
27
  } from "#policy/ruleInput/ruleInput.js";
28
28
  import type { AccessRulesStorage } from "#policy/rulesStorage.js";
29
29
 
30
- type DeleteRulesSchema = ZodType<AccessRulesFilterInput[]>;
30
+ // `unknown` input position — see accessRulesFilterInput's block comment
31
+ // for why the strict-identity form doesn't fit here.
32
+ type DeleteRulesSchema = ZodType<
33
+ AccessRulesFilterInput[],
34
+ z.ZodTypeDef,
35
+ unknown
36
+ >;
31
37
 
32
38
  export class DeleteRulesEndpoint implements ApiEndpoint<DeleteRulesSchema> {
33
39
  public constructor(
@@ -27,7 +27,9 @@ import {
27
27
  } from "#policy/ruleInput/ruleInput.js";
28
28
  import type { AccessRulesStorage } from "#policy/rulesStorage.js";
29
29
 
30
- type FindRulesSchema = ZodType<AccessRulesFilterInput[]>;
30
+ // `unknown` input position — see accessRulesFilterInput's block comment
31
+ // for why the strict-identity form doesn't fit here.
32
+ type FindRulesSchema = ZodType<AccessRulesFilterInput[], z.ZodTypeDef, unknown>;
31
33
 
32
34
  export type RuleIdsResponse = {
33
35
  ruleIds: string[];
@@ -14,6 +14,7 @@
14
14
 
15
15
  import {
16
16
  AccessPolicyType,
17
+ GLOBAL_CLIENT_SCOPE_SENTINEL,
17
18
  type PolicyScope,
18
19
  type UserIp,
19
20
  type UserScope,
@@ -172,6 +173,13 @@ const getUserScopeFieldQuery = (
172
173
  return `@${fieldName}:{${queryValue}}`;
173
174
  };
174
175
 
176
+ // Global rules are stamped with `@clientId:{global}` at write time so the
177
+ // scope query can hit the clientId posting list instead of walking the
178
+ // index for ismissing(). The `| ismissing(@clientId)` branch is a
179
+ // transition safety net for rules written before the sentinel shipped —
180
+ // rehash-all migrates them, but we don't gate on that ordering.
181
+ const GLOBAL_MATCH_CLAUSE_INNER = `@clientId:{${GLOBAL_CLIENT_SCOPE_SENTINEL}} | ismissing(@clientId)`;
182
+
175
183
  const getPolicyScopeQuery = (
176
184
  policyScope: PolicyScope | undefined,
177
185
  scopeMatch: FilterScopeMatch | undefined,
@@ -181,10 +189,12 @@ const getPolicyScopeQuery = (
181
189
  if ("string" === typeof clientId) {
182
190
  return FilterScopeMatch.Exact === scopeMatch
183
191
  ? `@clientId:{${clientId}}`
184
- : `( @clientId:{${clientId}} | ismissing(@clientId) )`;
192
+ : `( @clientId:{${clientId}} | ${GLOBAL_MATCH_CLAUSE_INNER} )`;
185
193
  }
186
194
 
187
- return FilterScopeMatch.Exact === scopeMatch ? "ismissing(@clientId)" : "";
195
+ return FilterScopeMatch.Exact === scopeMatch
196
+ ? `( ${GLOBAL_MATCH_CLAUSE_INNER} )`
197
+ : "";
188
198
  };
189
199
 
190
200
  /*