@prosopo/user-access-policy 3.4.0 → 3.5.27
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/CHANGELOG.md +309 -0
- package/coverage/base.css +224 -0
- package/coverage/block-navigation.js +87 -0
- package/coverage/clover.xml +786 -0
- package/coverage/coverage-final.json +15 -0
- package/coverage/favicon.png +0 -0
- package/coverage/index.html +146 -0
- package/coverage/prettify.css +1 -0
- package/coverage/prettify.js +2 -0
- package/coverage/sort-arrow-sprite.png +0 -0
- package/coverage/sorter.js +210 -0
- package/coverage/src/accessPolicy.ts.html +457 -0
- package/coverage/src/accessPolicyResolver.ts.html +211 -0
- package/coverage/src/accessRules.ts.html +265 -0
- package/coverage/src/api/accessRuleApiRoutes.ts.html +379 -0
- package/coverage/src/api/accessRulesApiClient.ts.html +274 -0
- package/coverage/src/api/deleteAllRulesEndpoint.ts.html +229 -0
- package/coverage/src/api/deleteRulesEndpoint.ts.html +301 -0
- package/coverage/src/api/index.html +176 -0
- package/coverage/src/api/insertRulesEndpoint.ts.html +436 -0
- package/coverage/src/index.html +176 -0
- package/coverage/src/index.ts.html +277 -0
- package/coverage/src/redis/index.html +161 -0
- package/coverage/src/redis/redisRulesIndex.ts.html +769 -0
- package/coverage/src/redis/redisRulesReader.ts.html +652 -0
- package/coverage/src/redis/redisRulesStorage.ts.html +229 -0
- package/coverage/src/redis/redisRulesWriter.ts.html +424 -0
- package/coverage/src/util.ts.html +136 -0
- package/dist/.export.d.ts +6 -0
- package/dist/.export.d.ts.map +1 -0
- package/dist/.export.js +21 -0
- package/dist/.export.js.map +1 -0
- package/dist/accessPolicy.d.ts +169 -0
- package/dist/accessPolicy.d.ts.map +1 -0
- package/dist/accessPolicy.js.map +1 -0
- package/dist/accessPolicyResolver.d.ts +110 -0
- package/dist/accessPolicyResolver.d.ts.map +1 -0
- package/dist/accessPolicyResolver.js.map +1 -0
- package/dist/accessRules.d.ts +16 -0
- package/dist/accessRules.d.ts.map +1 -0
- package/dist/accessRules.js.map +1 -0
- package/dist/api/.export.d.ts +7 -0
- package/dist/api/.export.d.ts.map +1 -0
- package/dist/api/.export.js +11 -0
- package/dist/api/.export.js.map +1 -0
- package/dist/api/accessRuleApiRoutes.d.ts +27 -0
- package/dist/api/accessRuleApiRoutes.d.ts.map +1 -0
- package/dist/api/accessRuleApiRoutes.js.map +1 -0
- package/dist/api/accessRulesApiClient.d.ts +10 -0
- package/dist/api/accessRulesApiClient.d.ts.map +1 -0
- package/dist/api/accessRulesApiClient.js +38 -0
- package/dist/api/accessRulesApiClient.js.map +1 -0
- package/dist/api/delete/.export.d.ts +2 -0
- package/dist/api/delete/.export.d.ts.map +1 -0
- package/dist/api/delete/.export.js +1 -0
- package/dist/api/delete/.export.js.map +1 -0
- package/dist/api/delete/deleteAllRules.d.ts +11 -0
- package/dist/api/delete/deleteAllRules.d.ts.map +1 -0
- package/dist/api/delete/deleteAllRules.js +25 -0
- package/dist/api/delete/deleteAllRules.js.map +1 -0
- package/dist/api/delete/deleteRuleGroups.d.ts +19 -0
- package/dist/api/delete/deleteRuleGroups.d.ts.map +1 -0
- package/dist/api/delete/deleteRuleGroups.js +52 -0
- package/dist/api/delete/deleteRuleGroups.js.map +1 -0
- package/dist/api/delete/deleteRules.d.ts +15 -0
- package/dist/api/delete/deleteRules.d.ts.map +1 -0
- package/dist/api/delete/deleteRules.js +43 -0
- package/dist/api/delete/deleteRules.js.map +1 -0
- package/dist/api/deleteAllRulesEndpoint.d.ts +12 -0
- package/dist/api/deleteAllRulesEndpoint.d.ts.map +1 -0
- package/dist/api/deleteAllRulesEndpoint.js.map +1 -0
- package/dist/api/deleteRulesEndpoint.d.ts +116 -0
- package/dist/api/deleteRulesEndpoint.d.ts.map +1 -0
- package/dist/api/deleteRulesEndpoint.js.map +1 -0
- package/dist/api/insertRulesEndpoint.d.ts +22 -0
- package/dist/api/insertRulesEndpoint.d.ts.map +1 -0
- package/dist/api/insertRulesEndpoint.js.map +1 -0
- package/dist/api/read/.export.d.ts +4 -0
- package/dist/api/read/.export.d.ts.map +1 -0
- package/dist/api/read/.export.js +1 -0
- package/dist/api/read/.export.js.map +1 -0
- package/dist/api/read/fetchRules.d.ts +53 -0
- package/dist/api/read/fetchRules.d.ts.map +1 -0
- package/dist/api/read/fetchRules.js +43 -0
- package/dist/api/read/fetchRules.js.map +1 -0
- package/dist/api/read/findRuleIds.d.ts +28 -0
- package/dist/api/read/findRuleIds.d.ts.map +1 -0
- package/dist/api/read/findRuleIds.js +50 -0
- package/dist/api/read/findRuleIds.js.map +1 -0
- package/dist/api/read/getMissingIds.d.ts +28 -0
- package/dist/api/read/getMissingIds.d.ts.map +1 -0
- package/dist/api/read/getMissingIds.js +41 -0
- package/dist/api/read/getMissingIds.js.map +1 -0
- package/dist/api/ruleApiRoutes.d.ts +43 -0
- package/dist/api/ruleApiRoutes.d.ts.map +1 -0
- package/dist/api/ruleApiRoutes.js +131 -0
- package/dist/api/ruleApiRoutes.js.map +1 -0
- package/dist/api/rulesApiClient.d.ts +20 -0
- package/dist/api/rulesApiClient.d.ts.map +1 -0
- package/dist/api/rulesApiClient.js +93 -0
- package/dist/api/rulesApiClient.js.map +1 -0
- package/dist/api/write/.export.d.ts +2 -0
- package/dist/api/write/.export.d.ts.map +1 -0
- package/dist/api/write/.export.js +1 -0
- package/dist/api/write/.export.js.map +1 -0
- package/dist/api/write/insertRules.d.ts +29 -0
- package/dist/api/write/insertRules.d.ts.map +1 -0
- package/dist/api/write/insertRules.js +102 -0
- package/dist/api/write/insertRules.js.map +1 -0
- package/dist/api/write/rehashRules.d.ts +11 -0
- package/dist/api/write/rehashRules.d.ts.map +1 -0
- package/dist/api/write/rehashRules.js +57 -0
- package/dist/api/write/rehashRules.js.map +1 -0
- package/dist/cjs/.export.cjs +21 -0
- package/dist/cjs/api/.export.cjs +11 -0
- package/dist/cjs/api/delete/.export.cjs +1 -0
- package/dist/cjs/api/delete/deleteAllRules.cjs +25 -0
- package/dist/cjs/api/delete/deleteRuleGroups.cjs +52 -0
- package/dist/cjs/api/delete/deleteRules.cjs +43 -0
- package/dist/cjs/api/read/.export.cjs +1 -0
- package/dist/cjs/api/read/fetchRules.cjs +43 -0
- package/dist/cjs/api/read/findRuleIds.cjs +50 -0
- package/dist/cjs/api/read/getMissingIds.cjs +41 -0
- package/dist/cjs/api/ruleApiRoutes.cjs +131 -0
- package/dist/cjs/api/rulesApiClient.cjs +93 -0
- package/dist/cjs/api/write/.export.cjs +1 -0
- package/dist/cjs/api/write/insertRules.cjs +102 -0
- package/dist/cjs/api/write/rehashRules.cjs +57 -0
- package/dist/cjs/index.cjs +2 -0
- package/dist/cjs/mongoose/.export.cjs +4 -0
- package/dist/cjs/mongoose/mongooseRuleSchema.cjs +36 -0
- package/dist/cjs/redis/.export.cjs +6 -0
- package/dist/cjs/redis/reader/redisAggregate.cjs +60 -0
- package/dist/cjs/redis/reader/redisRulesQuery.cjs +99 -0
- package/dist/cjs/redis/reader/redisRulesReader.cjs +230 -0
- package/dist/cjs/redis/redisAccessRules.cjs +4 -4
- package/dist/cjs/redis/redisAccessRulesIndex.cjs +55 -14
- package/dist/cjs/redis/redisClient.cjs +67 -0
- package/dist/cjs/redis/redisRuleIndex.cjs +50 -0
- package/dist/cjs/redis/redisRulesStorage.cjs +34 -0
- package/dist/cjs/redis/redisRulesWriter.cjs +100 -0
- package/dist/cjs/rule.cjs +8 -0
- package/dist/cjs/ruleInput/.export.cjs +9 -0
- package/dist/cjs/ruleInput/policyInput.cjs +25 -0
- package/dist/cjs/ruleInput/ruleInput.cjs +50 -0
- package/dist/cjs/ruleInput/userScopeInput.cjs +55 -0
- package/dist/cjs/ruleRecord.cjs +23 -0
- package/dist/cjs/rulesStorage.cjs +8 -0
- package/dist/cjs/transformRule.cjs +77 -0
- package/dist/index.d.ts +15 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -0
- package/dist/mongoose/.export.d.ts +2 -0
- package/dist/mongoose/.export.d.ts.map +1 -0
- package/dist/mongoose/.export.js +4 -0
- package/dist/mongoose/.export.js.map +1 -0
- package/dist/mongoose/mongooseRuleSchema.d.ts +4 -0
- package/dist/mongoose/mongooseRuleSchema.d.ts.map +1 -0
- package/dist/mongoose/mongooseRuleSchema.js +36 -0
- package/dist/mongoose/mongooseRuleSchema.js.map +1 -0
- package/dist/redis/.export.d.ts +3 -0
- package/dist/redis/.export.d.ts.map +1 -0
- package/dist/redis/.export.js +6 -0
- package/dist/redis/.export.js.map +1 -0
- package/dist/redis/reader/redisAggregate.d.ts +4 -0
- package/dist/redis/reader/redisAggregate.d.ts.map +1 -0
- package/dist/redis/reader/redisAggregate.js +60 -0
- package/dist/redis/reader/redisAggregate.js.map +1 -0
- package/dist/redis/reader/redisRulesQuery.d.ts +4 -0
- package/dist/redis/reader/redisRulesQuery.d.ts.map +1 -0
- package/dist/redis/reader/redisRulesQuery.js +99 -0
- package/dist/redis/reader/redisRulesQuery.js.map +1 -0
- package/dist/redis/reader/redisRulesReader.d.ts +26 -0
- package/dist/redis/reader/redisRulesReader.d.ts.map +1 -0
- package/dist/redis/reader/redisRulesReader.js +213 -0
- package/dist/redis/reader/redisRulesReader.js.map +1 -0
- package/dist/redis/redisAccessRules.d.ts +7 -0
- package/dist/redis/redisAccessRules.d.ts.map +1 -0
- package/dist/redis/redisAccessRules.js +112 -128
- package/dist/redis/redisAccessRules.js.map +1 -0
- package/dist/redis/redisAccessRulesIndex.d.ts +13 -0
- package/dist/redis/redisAccessRulesIndex.d.ts.map +1 -0
- package/dist/redis/redisAccessRulesIndex.js +122 -112
- package/dist/redis/redisAccessRulesIndex.js.map +1 -0
- package/dist/redis/redisClient.d.ts +11 -0
- package/dist/redis/redisClient.d.ts.map +1 -0
- package/dist/redis/redisClient.js +67 -0
- package/dist/redis/redisClient.js.map +1 -0
- package/dist/redis/redisIndex.d.ts +9 -0
- package/dist/redis/redisIndex.d.ts.map +1 -0
- package/dist/redis/redisIndex.js +16 -15
- package/dist/redis/redisIndex.js.map +1 -0
- package/dist/redis/redisRuleIndex.d.ts +13 -0
- package/dist/redis/redisRuleIndex.d.ts.map +1 -0
- package/dist/redis/redisRuleIndex.js +50 -0
- package/dist/redis/redisRuleIndex.js.map +1 -0
- package/dist/redis/redisRulesIndex.d.ts +9 -0
- package/dist/redis/redisRulesIndex.d.ts.map +1 -0
- package/dist/redis/redisRulesIndex.js +138 -0
- package/dist/redis/redisRulesIndex.js.map +1 -0
- package/dist/redis/redisRulesReader.d.ts +6 -0
- package/dist/redis/redisRulesReader.d.ts.map +1 -0
- package/dist/redis/redisRulesReader.js +125 -0
- package/dist/redis/redisRulesReader.js.map +1 -0
- package/dist/redis/redisRulesStorage.d.ts +5 -0
- package/dist/redis/redisRulesStorage.d.ts.map +1 -0
- package/dist/redis/redisRulesStorage.js +34 -0
- package/dist/redis/redisRulesStorage.js.map +1 -0
- package/dist/redis/redisRulesWriter.d.ts +22 -0
- package/dist/redis/redisRulesWriter.d.ts.map +1 -0
- package/dist/redis/redisRulesWriter.js +100 -0
- package/dist/redis/redisRulesWriter.js.map +1 -0
- package/dist/rule.d.ts +34 -0
- package/dist/rule.d.ts.map +1 -0
- package/dist/rule.js +8 -0
- package/dist/rule.js.map +1 -0
- package/dist/ruleInput/.export.d.ts +4 -0
- package/dist/ruleInput/.export.d.ts.map +1 -0
- package/dist/ruleInput/.export.js +9 -0
- package/dist/ruleInput/.export.js.map +1 -0
- package/dist/ruleInput/policyInput.d.ts +38 -0
- package/dist/ruleInput/policyInput.d.ts.map +1 -0
- package/dist/ruleInput/policyInput.js +25 -0
- package/dist/ruleInput/policyInput.js.map +1 -0
- package/dist/ruleInput/ruleInput.d.ts +145 -0
- package/dist/ruleInput/ruleInput.d.ts.map +1 -0
- package/dist/ruleInput/ruleInput.js +50 -0
- package/dist/ruleInput/ruleInput.js.map +1 -0
- package/dist/ruleInput/userScopeInput.d.ts +93 -0
- package/dist/ruleInput/userScopeInput.d.ts.map +1 -0
- package/dist/ruleInput/userScopeInput.js +55 -0
- package/dist/ruleInput/userScopeInput.js.map +1 -0
- package/dist/ruleRecord.d.ts +18 -0
- package/dist/ruleRecord.d.ts.map +1 -0
- package/dist/ruleRecord.js +23 -0
- package/dist/ruleRecord.js.map +1 -0
- package/dist/rulesStorage.d.ts +30 -0
- package/dist/rulesStorage.d.ts.map +1 -0
- package/dist/rulesStorage.js +8 -0
- package/dist/rulesStorage.js.map +1 -0
- package/dist/tests/accessPolicy.test.d.ts +2 -0
- package/dist/tests/accessPolicy.test.d.ts.map +1 -0
- package/dist/tests/accessPolicy.test.js +27 -0
- package/dist/tests/accessPolicy.test.js.map +1 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.d.ts +2 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.js +101 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.js.map +1 -0
- package/dist/tests/redis/redisAccessRules.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisAccessRules.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisAccessRules.integration.test.js +586 -0
- package/dist/tests/redis/redisAccessRules.integration.test.js.map +1 -0
- package/dist/tests/redis/redisAccessRules.unit.test.d.ts +2 -0
- package/dist/tests/redis/redisAccessRules.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/redisAccessRules.unit.test.js +198 -0
- package/dist/tests/redis/redisAccessRules.unit.test.js.map +1 -0
- package/dist/tests/redis/redisIndex.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisIndex.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisIndex.integration.test.js +80 -0
- package/dist/tests/redis/redisIndex.integration.test.js.map +1 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.d.ts +2 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.js +101 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.js.map +1 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.js +611 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.js.map +1 -0
- package/dist/tests/redis/testRedisClient.d.ts +3 -0
- package/dist/tests/redis/testRedisClient.d.ts.map +1 -0
- package/dist/tests/redis/testRedisClient.js +8 -0
- package/dist/tests/redis/testRedisClient.js.map +1 -0
- package/dist/tests/testLogger.d.ts +4 -0
- package/dist/tests/testLogger.d.ts.map +1 -0
- package/dist/tests/testLogger.js +22 -0
- package/dist/tests/testLogger.js.map +1 -0
- package/dist/tests/transformRule.unit.test.d.ts +2 -0
- package/dist/tests/transformRule.unit.test.d.ts.map +1 -0
- package/dist/tests/transformRule.unit.test.js +188 -0
- package/dist/tests/transformRule.unit.test.js.map +1 -0
- package/dist/transformRule.d.ts +7 -0
- package/dist/transformRule.d.ts.map +1 -0
- package/dist/transformRule.js +77 -0
- package/dist/transformRule.js.map +1 -0
- package/dist/util.d.ts +2 -0
- package/dist/util.d.ts.map +1 -0
- package/dist/util.js.map +1 -0
- package/entries.ts +20 -0
- package/package.json +42 -21
- package/vite.cjs.config.ts +4 -1
- package/vite.esm.config.ts +6 -1
|
@@ -0,0 +1,198 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { ScopeMatch } from "#policy/accessPolicyResolver.js";
|
|
3
|
+
import { getRedisAccessRulesQuery } from "#policy/redis/redisAccessRulesIndex.js";
|
|
4
|
+
describe("getUserScopeQuery", () => {
|
|
5
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact", () => {
|
|
6
|
+
const filter = {
|
|
7
|
+
userScope: {
|
|
8
|
+
numericIp: BigInt(100),
|
|
9
|
+
ja4Hash: "ja4Hash",
|
|
10
|
+
userAgentHash: undefined,
|
|
11
|
+
},
|
|
12
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
13
|
+
};
|
|
14
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
15
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) )");
|
|
16
|
+
});
|
|
17
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact and for missing fields when matchingFieldsOnly is set", () => {
|
|
18
|
+
const filter = {
|
|
19
|
+
userScope: {
|
|
20
|
+
numericIp: BigInt(100),
|
|
21
|
+
ja4Hash: "ja4Hash",
|
|
22
|
+
userAgentHash: undefined,
|
|
23
|
+
},
|
|
24
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
25
|
+
};
|
|
26
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
27
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@userId) ismissing(@headersHash) )");
|
|
28
|
+
});
|
|
29
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact", () => {
|
|
30
|
+
const filter = {
|
|
31
|
+
userScope: {
|
|
32
|
+
numericIp: BigInt(100),
|
|
33
|
+
ja4Hash: "ja4Hash",
|
|
34
|
+
userAgentHash: undefined,
|
|
35
|
+
headersHash: undefined,
|
|
36
|
+
userId: undefined,
|
|
37
|
+
},
|
|
38
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
39
|
+
};
|
|
40
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
41
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
42
|
+
});
|
|
43
|
+
it("does not put ismissing(x) for multiple fields passed in as `undefined` when user scope match is greedy", () => {
|
|
44
|
+
const filter = {
|
|
45
|
+
userScope: {
|
|
46
|
+
numericIp: BigInt(100),
|
|
47
|
+
ja4Hash: "ja4Hash",
|
|
48
|
+
userAgentHash: undefined,
|
|
49
|
+
headersHash: undefined,
|
|
50
|
+
userId: undefined,
|
|
51
|
+
},
|
|
52
|
+
userScopeMatch: ScopeMatch.Greedy,
|
|
53
|
+
};
|
|
54
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
55
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) | @ja4Hash:{ja4Hash} )");
|
|
56
|
+
});
|
|
57
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact 2", () => {
|
|
58
|
+
const filter = {
|
|
59
|
+
userScope: {
|
|
60
|
+
numericIp: undefined,
|
|
61
|
+
ja4Hash: "ja4Hash",
|
|
62
|
+
userAgentHash: undefined,
|
|
63
|
+
headersHash: undefined,
|
|
64
|
+
userId: undefined,
|
|
65
|
+
},
|
|
66
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
67
|
+
};
|
|
68
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
69
|
+
expect(query).toBe(" ( ismissing(@numericIp) ismissing(@numericIpMaskMin) ismissing(@numericIpMaskMax) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
70
|
+
});
|
|
71
|
+
it("does not put ismissing(numericIpMaskMin) and does not put ismissing(numericIpMaskMax) when numericIp is passed in", () => {
|
|
72
|
+
const filter = {
|
|
73
|
+
userScope: {
|
|
74
|
+
numericIp: BigInt(100),
|
|
75
|
+
ja4Hash: "ja4Hash",
|
|
76
|
+
userAgentHash: undefined,
|
|
77
|
+
headersHash: undefined,
|
|
78
|
+
userId: undefined,
|
|
79
|
+
},
|
|
80
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
81
|
+
};
|
|
82
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
83
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
84
|
+
});
|
|
85
|
+
it("does not put ismissing(numericIp) when numericIpMaskMin and numericIpMaskMax are passed in", () => {
|
|
86
|
+
const filter = {
|
|
87
|
+
userScope: {
|
|
88
|
+
numericIpMaskMin: BigInt(100),
|
|
89
|
+
numericIpMaskMax: BigInt(200),
|
|
90
|
+
ja4Hash: "ja4Hash",
|
|
91
|
+
userAgentHash: undefined,
|
|
92
|
+
headersHash: undefined,
|
|
93
|
+
userId: undefined,
|
|
94
|
+
},
|
|
95
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
96
|
+
};
|
|
97
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
98
|
+
expect(query).toBe(" ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[200 +inf] @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
describe("getUserScopeQuery", () => {
|
|
102
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact", () => {
|
|
103
|
+
const filter = {
|
|
104
|
+
userScope: {
|
|
105
|
+
numericIp: BigInt(100),
|
|
106
|
+
ja4Hash: "ja4Hash",
|
|
107
|
+
userAgentHash: undefined,
|
|
108
|
+
},
|
|
109
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
110
|
+
};
|
|
111
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
112
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) )");
|
|
113
|
+
});
|
|
114
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact and for missing fields when matchingFieldsOnly is set", () => {
|
|
115
|
+
const filter = {
|
|
116
|
+
userScope: {
|
|
117
|
+
numericIp: BigInt(100),
|
|
118
|
+
ja4Hash: "ja4Hash",
|
|
119
|
+
userAgentHash: undefined,
|
|
120
|
+
},
|
|
121
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
122
|
+
};
|
|
123
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
124
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@userId) ismissing(@headersHash) )");
|
|
125
|
+
});
|
|
126
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact", () => {
|
|
127
|
+
const filter = {
|
|
128
|
+
userScope: {
|
|
129
|
+
numericIp: BigInt(100),
|
|
130
|
+
ja4Hash: "ja4Hash",
|
|
131
|
+
userAgentHash: undefined,
|
|
132
|
+
headersHash: undefined,
|
|
133
|
+
userId: undefined,
|
|
134
|
+
},
|
|
135
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
136
|
+
};
|
|
137
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
138
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
139
|
+
});
|
|
140
|
+
it("does not put ismissing(x) for multiple fields passed in as `undefined` when user scope match is greedy", () => {
|
|
141
|
+
const filter = {
|
|
142
|
+
userScope: {
|
|
143
|
+
numericIp: BigInt(100),
|
|
144
|
+
ja4Hash: "ja4Hash",
|
|
145
|
+
userAgentHash: undefined,
|
|
146
|
+
headersHash: undefined,
|
|
147
|
+
userId: undefined,
|
|
148
|
+
},
|
|
149
|
+
userScopeMatch: ScopeMatch.Greedy,
|
|
150
|
+
};
|
|
151
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
152
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) | @ja4Hash:{ja4Hash} )");
|
|
153
|
+
});
|
|
154
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact 2", () => {
|
|
155
|
+
const filter = {
|
|
156
|
+
userScope: {
|
|
157
|
+
numericIp: undefined,
|
|
158
|
+
ja4Hash: "ja4Hash",
|
|
159
|
+
userAgentHash: undefined,
|
|
160
|
+
headersHash: undefined,
|
|
161
|
+
userId: undefined,
|
|
162
|
+
},
|
|
163
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
164
|
+
};
|
|
165
|
+
const query = getRedisAccessRulesQuery(filter, false);
|
|
166
|
+
expect(query).toBe(" ( ismissing(@numericIp) ismissing(@numericIpMaskMin) ismissing(@numericIpMaskMax) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
167
|
+
});
|
|
168
|
+
it("does not put ismissing(numericIpMaskMin) and does not put ismissing(numericIpMaskMax) when numericIp is passed in", () => {
|
|
169
|
+
const filter = {
|
|
170
|
+
userScope: {
|
|
171
|
+
numericIp: BigInt(100),
|
|
172
|
+
ja4Hash: "ja4Hash",
|
|
173
|
+
userAgentHash: undefined,
|
|
174
|
+
headersHash: undefined,
|
|
175
|
+
userId: undefined,
|
|
176
|
+
},
|
|
177
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
178
|
+
};
|
|
179
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
180
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
181
|
+
});
|
|
182
|
+
it("does not put ismissing(numericIp) when numericIpMaskMin and numericIpMaskMax are passed in", () => {
|
|
183
|
+
const filter = {
|
|
184
|
+
userScope: {
|
|
185
|
+
numericIpMaskMin: BigInt(100),
|
|
186
|
+
numericIpMaskMax: BigInt(200),
|
|
187
|
+
ja4Hash: "ja4Hash",
|
|
188
|
+
userAgentHash: undefined,
|
|
189
|
+
headersHash: undefined,
|
|
190
|
+
userId: undefined,
|
|
191
|
+
},
|
|
192
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
193
|
+
};
|
|
194
|
+
const query = getRedisAccessRulesQuery(filter, true);
|
|
195
|
+
expect(query).toBe(" ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[200 +inf] @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
//# sourceMappingURL=redisAccessRules.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisAccessRules.unit.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisAccessRules.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisIndex.integration.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisIndex.integration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { SCHEMA_FIELD_TYPE } from "@redis/search";
|
|
2
|
+
import { beforeAll, describe, expect, test, } from "vitest";
|
|
3
|
+
import { createRedisIndex } from "#policy/redis/redisIndex.js";
|
|
4
|
+
import { createTestRedisClient } from "./testRedisClient.js";
|
|
5
|
+
let indexCount = 0;
|
|
6
|
+
const getTestIndexName = () => `index:${indexCount++}`;
|
|
7
|
+
describe("redisIndex", () => {
|
|
8
|
+
let redisClient;
|
|
9
|
+
beforeAll(async () => {
|
|
10
|
+
redisClient = await createTestRedisClient();
|
|
11
|
+
});
|
|
12
|
+
test("creates new index", async () => {
|
|
13
|
+
const redisIndex = {
|
|
14
|
+
name: getTestIndexName(),
|
|
15
|
+
schema: {
|
|
16
|
+
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
17
|
+
},
|
|
18
|
+
options: {},
|
|
19
|
+
};
|
|
20
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
21
|
+
const indexNames = await redisClient.ft._LIST();
|
|
22
|
+
expect(indexNames).toContain(redisIndex.name);
|
|
23
|
+
});
|
|
24
|
+
test("does not re-create existing index when no changes declared", async () => {
|
|
25
|
+
const redisIndex = {
|
|
26
|
+
name: getTestIndexName(),
|
|
27
|
+
schema: {
|
|
28
|
+
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
29
|
+
},
|
|
30
|
+
options: {},
|
|
31
|
+
};
|
|
32
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
33
|
+
await redisClient.ft.alter(redisIndex.name, {
|
|
34
|
+
anotherField: SCHEMA_FIELD_TYPE.TAG,
|
|
35
|
+
});
|
|
36
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
37
|
+
const indexNames = await redisClient.ft._LIST();
|
|
38
|
+
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
39
|
+
expect(indexNames).toContain(redisIndex.name);
|
|
40
|
+
expect(actualIndexInfo.attributes.length).toBe(2);
|
|
41
|
+
});
|
|
42
|
+
test("re-creates existing index when schema changes made", async () => {
|
|
43
|
+
const redisIndex = {
|
|
44
|
+
name: getTestIndexName(),
|
|
45
|
+
schema: {
|
|
46
|
+
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
47
|
+
},
|
|
48
|
+
options: {},
|
|
49
|
+
};
|
|
50
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
51
|
+
redisIndex.schema = {
|
|
52
|
+
...redisIndex.schema,
|
|
53
|
+
newField: SCHEMA_FIELD_TYPE.TAG,
|
|
54
|
+
};
|
|
55
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
56
|
+
const indexNames = await redisClient.ft._LIST();
|
|
57
|
+
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
58
|
+
expect(indexNames).toContain(redisIndex.name);
|
|
59
|
+
expect(actualIndexInfo.attributes.length).toBe(2);
|
|
60
|
+
});
|
|
61
|
+
test("re-creates existing index when option changes made", async () => {
|
|
62
|
+
const redisIndex = {
|
|
63
|
+
name: getTestIndexName(),
|
|
64
|
+
schema: {
|
|
65
|
+
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
66
|
+
},
|
|
67
|
+
options: {},
|
|
68
|
+
};
|
|
69
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
70
|
+
redisIndex.options = {
|
|
71
|
+
ON: "HASH",
|
|
72
|
+
};
|
|
73
|
+
await createRedisIndex(redisClient, redisIndex);
|
|
74
|
+
const indexNames = await redisClient.ft._LIST();
|
|
75
|
+
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
76
|
+
expect(indexNames).toContain(redisIndex.name);
|
|
77
|
+
expect(actualIndexInfo.index_definition.key_type).toBe("HASH");
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=redisIndex.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisIndex.integration.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisIndex.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesIndex.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisRulesIndex.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { ScopeMatch } from "#policy/accessPolicyResolver.js";
|
|
3
|
+
import { getRedisRulesQuery } from "#policy/redis/redisRulesIndex.js";
|
|
4
|
+
describe("getUserScopeQuery", () => {
|
|
5
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact", () => {
|
|
6
|
+
const filter = {
|
|
7
|
+
userScope: {
|
|
8
|
+
numericIp: BigInt(100),
|
|
9
|
+
ja4Hash: "ja4Hash",
|
|
10
|
+
userAgentHash: undefined,
|
|
11
|
+
},
|
|
12
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
13
|
+
};
|
|
14
|
+
const query = getRedisRulesQuery(filter, false);
|
|
15
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) )");
|
|
16
|
+
});
|
|
17
|
+
it("puts ismissing(x) for field x passed in as `undefined` when user scope match is exact and for missing fields when matchingFieldsOnly is set", () => {
|
|
18
|
+
const filter = {
|
|
19
|
+
userScope: {
|
|
20
|
+
numericIp: BigInt(100),
|
|
21
|
+
ja4Hash: "ja4Hash",
|
|
22
|
+
userAgentHash: undefined,
|
|
23
|
+
},
|
|
24
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
25
|
+
};
|
|
26
|
+
const query = getRedisRulesQuery(filter, true);
|
|
27
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@userId) ismissing(@headersHash) )");
|
|
28
|
+
});
|
|
29
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact", () => {
|
|
30
|
+
const filter = {
|
|
31
|
+
userScope: {
|
|
32
|
+
numericIp: BigInt(100),
|
|
33
|
+
ja4Hash: "ja4Hash",
|
|
34
|
+
userAgentHash: undefined,
|
|
35
|
+
headersHash: undefined,
|
|
36
|
+
userId: undefined,
|
|
37
|
+
},
|
|
38
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
39
|
+
};
|
|
40
|
+
const query = getRedisRulesQuery(filter, false);
|
|
41
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
42
|
+
});
|
|
43
|
+
it("does not put ismissing(x) for multiple fields passed in as `undefined` when user scope match is greedy", () => {
|
|
44
|
+
const filter = {
|
|
45
|
+
userScope: {
|
|
46
|
+
numericIp: BigInt(100),
|
|
47
|
+
ja4Hash: "ja4Hash",
|
|
48
|
+
userAgentHash: undefined,
|
|
49
|
+
headersHash: undefined,
|
|
50
|
+
userId: undefined,
|
|
51
|
+
},
|
|
52
|
+
userScopeMatch: ScopeMatch.Greedy,
|
|
53
|
+
};
|
|
54
|
+
const query = getRedisRulesQuery(filter, false);
|
|
55
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) | @ja4Hash:{ja4Hash} )");
|
|
56
|
+
});
|
|
57
|
+
it("puts ismissing(x) for multiple fields passed in as `undefined` when user scope match is exact 2", () => {
|
|
58
|
+
const filter = {
|
|
59
|
+
userScope: {
|
|
60
|
+
numericIp: undefined,
|
|
61
|
+
ja4Hash: "ja4Hash",
|
|
62
|
+
userAgentHash: undefined,
|
|
63
|
+
headersHash: undefined,
|
|
64
|
+
userId: undefined,
|
|
65
|
+
},
|
|
66
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
67
|
+
};
|
|
68
|
+
const query = getRedisRulesQuery(filter, false);
|
|
69
|
+
expect(query).toBe(" ( ismissing(@numericIp) ismissing(@numericIpMaskMin) ismissing(@numericIpMaskMax) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
70
|
+
});
|
|
71
|
+
it("does not put ismissing(numericIpMaskMin) and does not put ismissing(numericIpMaskMax) when numericIp is passed in", () => {
|
|
72
|
+
const filter = {
|
|
73
|
+
userScope: {
|
|
74
|
+
numericIp: BigInt(100),
|
|
75
|
+
ja4Hash: "ja4Hash",
|
|
76
|
+
userAgentHash: undefined,
|
|
77
|
+
headersHash: undefined,
|
|
78
|
+
userId: undefined,
|
|
79
|
+
},
|
|
80
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
81
|
+
};
|
|
82
|
+
const query = getRedisRulesQuery(filter, true);
|
|
83
|
+
expect(query).toBe(" ( ( @numericIp:[100] | ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[100 +inf] ) ) @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
84
|
+
});
|
|
85
|
+
it("does not put ismissing(numericIp) when numericIpMaskMin and numericIpMaskMax are passed in", () => {
|
|
86
|
+
const filter = {
|
|
87
|
+
userScope: {
|
|
88
|
+
numericIpMaskMin: BigInt(100),
|
|
89
|
+
numericIpMaskMax: BigInt(200),
|
|
90
|
+
ja4Hash: "ja4Hash",
|
|
91
|
+
userAgentHash: undefined,
|
|
92
|
+
headersHash: undefined,
|
|
93
|
+
userId: undefined,
|
|
94
|
+
},
|
|
95
|
+
userScopeMatch: ScopeMatch.Exact,
|
|
96
|
+
};
|
|
97
|
+
const query = getRedisRulesQuery(filter, true);
|
|
98
|
+
expect(query).toBe(" ( @numericIpMaskMin:[-inf 100] @numericIpMaskMax:[200 +inf] @ja4Hash:{ja4Hash} ismissing(@userAgentHash) ismissing(@headersHash) ismissing(@userId) )");
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
//# sourceMappingURL=redisRulesIndex.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesIndex.unit.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisRulesIndex.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesStorage.integration.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisRulesStorage.integration.test.ts"],"names":[],"mappings":""}
|