@prosopo/user-access-policy 3.5.19 → 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 +67 -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.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 +4 -6
- 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/{redisRulesReader.cjs → redisAccessRules.cjs} +38 -28
- package/dist/cjs/redis/{redisRulesIndex.cjs → redisAccessRulesIndex.cjs} +45 -12
- package/dist/cjs/redis/redisClient.cjs +67 -0
- package/dist/cjs/redis/redisIndex.cjs +22 -0
- package/dist/cjs/redis/redisRuleIndex.cjs +50 -0
- package/dist/cjs/redis/redisRulesStorage.cjs +22 -9
- package/dist/cjs/redis/redisRulesWriter.cjs +91 -64
- 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.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 +119 -0
- 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 +140 -0
- 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 +23 -0
- 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.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.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 +23 -10
- 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 +91 -64
- 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 +34 -18
- package/vite.cjs.config.ts +4 -1
- package/vite.esm.config.ts +6 -1
- package/dist/cjs/api/accessRulesApiClient.cjs +0 -38
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { REDIS_QUERY_DIALECT } from "./redisRulesQuery.js";
|
|
3
|
+
import { parseRedisRecords, REDIS_BATCH_SIZE } from "../redisClient.js";
|
|
4
|
+
import { ACCESS_RULES_REDIS_INDEX_NAME } from "../redisRuleIndex.js";
|
|
5
|
+
const aggregateRedisKeys = async (client, query, logger, batchHandler) => {
|
|
6
|
+
const keyField = "__key";
|
|
7
|
+
const recordSchema = z.object({
|
|
8
|
+
// it's a reserved name for the record key
|
|
9
|
+
[keyField]: z.string()
|
|
10
|
+
});
|
|
11
|
+
const foundKeys = [];
|
|
12
|
+
const addRecordKeys = async (records) => {
|
|
13
|
+
const parsedRecords = parseRedisRecords(records, recordSchema, logger);
|
|
14
|
+
const recordKeys = parsedRecords.map((record) => record[keyField]);
|
|
15
|
+
if (batchHandler) {
|
|
16
|
+
await batchHandler(recordKeys);
|
|
17
|
+
} else {
|
|
18
|
+
foundKeys.push(...recordKeys);
|
|
19
|
+
logger.debug(() => ({
|
|
20
|
+
msg: "Processed aggregation batch",
|
|
21
|
+
data: {
|
|
22
|
+
size: recordKeys.length
|
|
23
|
+
}
|
|
24
|
+
}));
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
await executeAggregation(
|
|
28
|
+
client,
|
|
29
|
+
query,
|
|
30
|
+
{
|
|
31
|
+
// #2 is a required option when the 'ismissing()' function is in the query body
|
|
32
|
+
DIALECT: REDIS_QUERY_DIALECT,
|
|
33
|
+
COUNT: REDIS_BATCH_SIZE,
|
|
34
|
+
LOAD: `@${keyField}`
|
|
35
|
+
},
|
|
36
|
+
addRecordKeys
|
|
37
|
+
);
|
|
38
|
+
return foundKeys;
|
|
39
|
+
};
|
|
40
|
+
const executeAggregation = async (client, query, aggregateOptions, handleBatch) => {
|
|
41
|
+
const initialReply = await client.ft.aggregateWithCursor(
|
|
42
|
+
ACCESS_RULES_REDIS_INDEX_NAME,
|
|
43
|
+
query,
|
|
44
|
+
aggregateOptions
|
|
45
|
+
);
|
|
46
|
+
await handleBatch(initialReply.results);
|
|
47
|
+
let cursor = initialReply.cursor;
|
|
48
|
+
while (0 !== cursor) {
|
|
49
|
+
const batchReply = await client.ft.cursorRead(
|
|
50
|
+
ACCESS_RULES_REDIS_INDEX_NAME,
|
|
51
|
+
cursor,
|
|
52
|
+
{ COUNT: aggregateOptions.COUNT }
|
|
53
|
+
);
|
|
54
|
+
await handleBatch(batchReply.results);
|
|
55
|
+
cursor = batchReply.cursor;
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
export {
|
|
59
|
+
aggregateRedisKeys
|
|
60
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisAggregate.js","sourceRoot":"","sources":["../../../src/redis/reader/redisAggregate.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EACN,gBAAgB,EAChB,iBAAiB,GACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAGhF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACtC,MAAuB,EACvB,KAAa,EACb,MAAc,EACd,YAAgD,EAC5B,EAAE;IACtB,MAAM,QAAQ,GAAG,OAAO,CAAC;IAEzB,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;QAE7B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,KAAK,EAAE,OAAiB,EAAE,EAAE;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAEvE,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEnE,IAAI,YAAY,EAAE,CAAC;YAClB,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACP,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;YAE9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACnB,GAAG,EAAE,6BAA6B;gBAClC,IAAI,EAAE;oBACL,IAAI,EAAE,UAAU,CAAC,MAAM;iBACvB;aACD,CAAC,CAAC,CAAC;QACL,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,kBAAkB,CACvB,MAAM,EACN,KAAK,EACL;QAEC,OAAO,EAAE,mBAAmB;QAC5B,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,IAAI,QAAQ,EAAE;KACpB,EACD,aAAa,CACb,CAAC;IAEF,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAC/B,MAAuB,EACvB,KAAa,EACb,gBAA8C,EAC9C,WAAiD,EACjC,EAAE;IAClB,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,mBAAmB,CACvD,6BAA6B,EAC7B,KAAK,EACL,gBAAgB,CAChB,CAAC;IAEF,MAAM,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAEjC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,UAAU,CAC5C,6BAA6B,EAC7B,MAAM,EACN,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,CACjC,CAAC;QAEF,MAAM,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC5B,CAAC;AACF,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesQuery.d.ts","sourceRoot":"","sources":["../../../src/redis/reader/redisRulesQuery.ts"],"names":[],"mappings":"AAgBA,OAAO,EACN,KAAK,iBAAiB,EAEtB,MAAM,yBAAyB,CAAC;AAKjC,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAmIrC,eAAO,MAAM,kBAAkB,WACtB,iBAAiB,sBACL,OAAO,KACzB,MA4BF,CAAC"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { userScopeSchema } from "../../ruleInput/userScopeInput.js";
|
|
2
|
+
import { FilterScopeMatch } from "../../rulesStorage.js";
|
|
3
|
+
const REDIS_QUERY_DIALECT = 2;
|
|
4
|
+
const userIpQueries = {
|
|
5
|
+
numericIp: (value, scope) => {
|
|
6
|
+
if (void 0 !== value) {
|
|
7
|
+
return `( @numericIp:[${value} ${value}] | ( @numericIpMaskMin:[-inf ${value}] @numericIpMaskMax:[${value} +inf] ) )`;
|
|
8
|
+
}
|
|
9
|
+
if (scope.numericIpMaskMin === void 0 && scope.numericIpMaskMax === void 0) {
|
|
10
|
+
return "ismissing(@numericIp) ismissing(@numericIpMaskMin) ismissing(@numericIpMaskMax)";
|
|
11
|
+
}
|
|
12
|
+
return "";
|
|
13
|
+
},
|
|
14
|
+
numericIpMaskMin: (value, scope) => {
|
|
15
|
+
if (scope.numericIp !== void 0) {
|
|
16
|
+
return "";
|
|
17
|
+
}
|
|
18
|
+
return value !== void 0 ? `@numericIpMaskMin:[-inf ${value}]` : "ismissing(@numericIpMaskMin)";
|
|
19
|
+
},
|
|
20
|
+
numericIpMaskMax: (value, scope) => {
|
|
21
|
+
if (scope.numericIp !== void 0) {
|
|
22
|
+
return "";
|
|
23
|
+
}
|
|
24
|
+
return value !== void 0 ? `@numericIpMaskMax:[${value} +inf]` : "ismissing(@numericIpMaskMax)";
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const getUserScopeQuery = (userScope, FilterScopeMatchType, matchingFieldsOnly) => {
|
|
28
|
+
let scopeEntries = Object.entries(userScope);
|
|
29
|
+
let scopeJoinType = " ";
|
|
30
|
+
if (FilterScopeMatchType === FilterScopeMatch.Greedy) {
|
|
31
|
+
scopeEntries = scopeEntries.filter(
|
|
32
|
+
([_, value]) => value !== void 0
|
|
33
|
+
);
|
|
34
|
+
scopeJoinType = " | ";
|
|
35
|
+
}
|
|
36
|
+
if (matchingFieldsOnly) {
|
|
37
|
+
const scopeMap = new Map(scopeEntries);
|
|
38
|
+
if (scopeMap.has("numericIp") && scopeMap.get("numericIp") === void 0) {
|
|
39
|
+
scopeMap.set("numericIpMaskMin", void 0);
|
|
40
|
+
scopeMap.set("numericIpMaskMax", void 0);
|
|
41
|
+
}
|
|
42
|
+
for (const name of Object.keys(userScopeSchema.shape)) {
|
|
43
|
+
if (!scopeMap.has(name)) {
|
|
44
|
+
scopeMap.set(name, void 0);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
scopeEntries = [...scopeMap.entries()];
|
|
48
|
+
}
|
|
49
|
+
const scopeObj = Object.fromEntries(scopeEntries);
|
|
50
|
+
return scopeEntries.map(
|
|
51
|
+
([scopeFieldName, scopeFieldValue]) => getUserScopeFieldQuery(
|
|
52
|
+
scopeFieldName,
|
|
53
|
+
scopeFieldValue,
|
|
54
|
+
FilterScopeMatchType,
|
|
55
|
+
scopeObj
|
|
56
|
+
)
|
|
57
|
+
).filter(Boolean).join(scopeJoinType);
|
|
58
|
+
};
|
|
59
|
+
const getUserScopeFieldQuery = (fieldName, fieldValue, scopeMatch, fullScope) => {
|
|
60
|
+
if (fieldName in userIpQueries) {
|
|
61
|
+
const queryBuilder = userIpQueries[fieldName];
|
|
62
|
+
return queryBuilder(fieldValue, fullScope);
|
|
63
|
+
}
|
|
64
|
+
return void 0 === fieldValue ? `ismissing(@${fieldName})` : `@${fieldName}:{${fieldValue}}`;
|
|
65
|
+
};
|
|
66
|
+
const getPolicyScopeQuery = (policyScope, scopeMatch) => {
|
|
67
|
+
const clientId = policyScope?.clientId;
|
|
68
|
+
if ("string" === typeof clientId) {
|
|
69
|
+
return FilterScopeMatch.Exact === scopeMatch ? `@clientId:{${clientId}}` : `( @clientId:{${clientId}} | ismissing(@clientId) )`;
|
|
70
|
+
}
|
|
71
|
+
return FilterScopeMatch.Exact === scopeMatch ? "ismissing(@clientId)" : "";
|
|
72
|
+
};
|
|
73
|
+
const getRulesRedisQuery = (filter, matchingFieldsOnly) => {
|
|
74
|
+
const { policyScope, userScope } = filter;
|
|
75
|
+
const queryParts = [];
|
|
76
|
+
if (filter.groupId) {
|
|
77
|
+
queryParts.push(`@groupId:{${filter.groupId}}`);
|
|
78
|
+
}
|
|
79
|
+
const policyScopeQuery = getPolicyScopeQuery(
|
|
80
|
+
policyScope,
|
|
81
|
+
filter.policyScopeMatch
|
|
82
|
+
);
|
|
83
|
+
if (policyScopeQuery) {
|
|
84
|
+
queryParts.push(policyScopeQuery);
|
|
85
|
+
}
|
|
86
|
+
if (userScope && Object.keys(userScope).length > 0) {
|
|
87
|
+
const userScopeFilter = getUserScopeQuery(
|
|
88
|
+
userScope,
|
|
89
|
+
filter.userScopeMatch,
|
|
90
|
+
matchingFieldsOnly
|
|
91
|
+
);
|
|
92
|
+
queryParts.push(`( ${userScopeFilter} )`);
|
|
93
|
+
}
|
|
94
|
+
return queryParts.length > 0 ? queryParts.join(" ") : "*";
|
|
95
|
+
};
|
|
96
|
+
export {
|
|
97
|
+
REDIS_QUERY_DIALECT,
|
|
98
|
+
getRulesRedisQuery
|
|
99
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesQuery.js","sourceRoot":"","sources":["../../../src/redis/reader/redisRulesQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type Logger } from "@prosopo/common";
|
|
2
|
+
import type { RedisClientType } from "redis";
|
|
3
|
+
import type { AccessRule } from "#policy/rule.js";
|
|
4
|
+
import type { AccessRuleEntry, AccessRulesFilter, AccessRulesReader } from "#policy/rulesStorage.js";
|
|
5
|
+
export declare class RedisRulesReader implements AccessRulesReader {
|
|
6
|
+
private readonly client;
|
|
7
|
+
private readonly logger;
|
|
8
|
+
constructor(client: RedisClientType, logger: Logger);
|
|
9
|
+
getMissingRuleIds(ruleIds: string[]): Promise<string[]>;
|
|
10
|
+
fetchRules(ruleIds: string[]): Promise<AccessRuleEntry[]>;
|
|
11
|
+
findRules(filter: AccessRulesFilter, matchingFieldsOnly?: boolean, skipEmptyUserScopes?: boolean): Promise<AccessRule[]>;
|
|
12
|
+
findRuleIds(filter: AccessRulesFilter, matchingFieldsOnly?: boolean): Promise<string[]>;
|
|
13
|
+
fetchAllRuleIds(batchHandler: (ruleIds: string[]) => Promise<void>): Promise<void>;
|
|
14
|
+
protected fetchRuleEntries(keys: string[]): Promise<AccessRuleEntry[]>;
|
|
15
|
+
protected getRuleKeys(ruleIds: string[]): string[];
|
|
16
|
+
}
|
|
17
|
+
export declare class DummyRedisRulesReader implements AccessRulesReader {
|
|
18
|
+
private readonly logger;
|
|
19
|
+
constructor(logger: Logger);
|
|
20
|
+
getMissingRuleIds(ruleIds: string[]): Promise<string[]>;
|
|
21
|
+
fetchRules(ruleIds: string[]): Promise<AccessRuleEntry[]>;
|
|
22
|
+
findRules(filter: AccessRulesFilter, matchingFieldsOnly?: boolean, skipEmptyUserScopes?: boolean): Promise<AccessRule[]>;
|
|
23
|
+
findRuleIds(filter: AccessRulesFilter, matchingFieldsOnly?: boolean): Promise<string[]>;
|
|
24
|
+
fetchAllRuleIds(batchHandler: (ruleIds: string[]) => Promise<void>): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=redisRulesReader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesReader.d.ts","sourceRoot":"","sources":["../../../src/redis/reader/redisRulesReader.ts"],"names":[],"mappings":"AAeA,OAAO,EACN,KAAK,MAAM,EAGX,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAe7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EACX,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,yBAAyB,CAAC;AAGjC,qBAAa,gBAAiB,YAAW,iBAAiB;IAExD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM;IAG1B,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAcvD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAazD,SAAS,CACd,MAAM,EAAE,iBAAiB,EACzB,kBAAkB,UAAQ,EAC1B,mBAAmB,UAAO,GACxB,OAAO,CAAC,UAAU,EAAE,CAAC;IAiElB,WAAW,CAChB,MAAM,EAAE,iBAAiB,EACzB,kBAAkB,UAAQ,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC;IAgDd,eAAe,CACpB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC;cAYA,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA8B5E,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;CAGlD;AAED,qBAAa,qBAAsB,YAAW,iBAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAErC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWvD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAWzD,SAAS,CACd,MAAM,EAAE,iBAAiB,EACzB,kBAAkB,UAAQ,EAC1B,mBAAmB,UAAO,GACxB,OAAO,CAAC,UAAU,EAAE,CAAC;IAWlB,WAAW,CAChB,MAAM,EAAE,iBAAiB,EACzB,kBAAkB,UAAQ,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC;IAWd,eAAe,CACpB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC;CAKhB"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import * as util from "node:util";
|
|
2
|
+
import { chunkIntoBatches, executeBatchesSequentially } from "@prosopo/common";
|
|
3
|
+
import { getRulesRedisQuery, REDIS_QUERY_DIALECT } from "./redisRulesQuery.js";
|
|
4
|
+
import { REDIS_BATCH_SIZE, getMissingRedisKeys, parseRedisRecords, fetchRedisHashRecords } from "../redisClient.js";
|
|
5
|
+
import { ACCESS_RULE_REDIS_KEY_PREFIX, ACCESS_RULES_REDIS_INDEX_NAME } from "../redisRuleIndex.js";
|
|
6
|
+
import { accessRuleInput } from "../../ruleInput/ruleInput.js";
|
|
7
|
+
import { aggregateRedisKeys } from "./redisAggregate.js";
|
|
8
|
+
class RedisRulesReader {
|
|
9
|
+
constructor(client, logger) {
|
|
10
|
+
this.client = client;
|
|
11
|
+
this.logger = logger;
|
|
12
|
+
}
|
|
13
|
+
async getMissingRuleIds(ruleIds) {
|
|
14
|
+
const ruleKeys = this.getRuleKeys(ruleIds);
|
|
15
|
+
const keyBatches = chunkIntoBatches(ruleKeys, REDIS_BATCH_SIZE);
|
|
16
|
+
const missingKeyBatches = await executeBatchesSequentially(
|
|
17
|
+
keyBatches,
|
|
18
|
+
async (keysBatch) => getMissingRedisKeys(this.client, keysBatch)
|
|
19
|
+
);
|
|
20
|
+
return missingKeyBatches.flat().map((ruleKey) => ruleKey.slice(ACCESS_RULE_REDIS_KEY_PREFIX.length));
|
|
21
|
+
}
|
|
22
|
+
async fetchRules(ruleIds) {
|
|
23
|
+
const ruleKeys = this.getRuleKeys(ruleIds);
|
|
24
|
+
const keyBatches = chunkIntoBatches(ruleKeys, REDIS_BATCH_SIZE);
|
|
25
|
+
const entryBatches = await executeBatchesSequentially(
|
|
26
|
+
keyBatches,
|
|
27
|
+
(keysBatch) => this.fetchRuleEntries(keysBatch)
|
|
28
|
+
);
|
|
29
|
+
return entryBatches.flat();
|
|
30
|
+
}
|
|
31
|
+
async findRules(filter, matchingFieldsOnly = false, skipEmptyUserScopes = true) {
|
|
32
|
+
const query = getRulesRedisQuery(filter, matchingFieldsOnly);
|
|
33
|
+
if (skipEmptyUserScopes && query === "ismissing(@clientId)") {
|
|
34
|
+
return [];
|
|
35
|
+
}
|
|
36
|
+
let searchReply;
|
|
37
|
+
try {
|
|
38
|
+
searchReply = await this.client.ft.search(
|
|
39
|
+
ACCESS_RULES_REDIS_INDEX_NAME,
|
|
40
|
+
query,
|
|
41
|
+
{
|
|
42
|
+
DIALECT: REDIS_QUERY_DIALECT,
|
|
43
|
+
// FT.search doesn't support "unlimited" selects
|
|
44
|
+
LIMIT: {
|
|
45
|
+
from: 0,
|
|
46
|
+
size: REDIS_BATCH_SIZE
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
);
|
|
50
|
+
if (searchReply.total > 0) {
|
|
51
|
+
this.logger.debug(() => ({
|
|
52
|
+
msg: "Executed search query",
|
|
53
|
+
data: {
|
|
54
|
+
inspect: util.inspect(
|
|
55
|
+
{
|
|
56
|
+
filter,
|
|
57
|
+
searchReply,
|
|
58
|
+
query
|
|
59
|
+
},
|
|
60
|
+
{ depth: null }
|
|
61
|
+
)
|
|
62
|
+
}
|
|
63
|
+
}));
|
|
64
|
+
}
|
|
65
|
+
} catch (e) {
|
|
66
|
+
this.logger.error(() => ({
|
|
67
|
+
err: e,
|
|
68
|
+
data: {
|
|
69
|
+
inspect: util.inspect(
|
|
70
|
+
{
|
|
71
|
+
query,
|
|
72
|
+
filter
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
depth: null
|
|
76
|
+
}
|
|
77
|
+
)
|
|
78
|
+
},
|
|
79
|
+
msg: "failed to execute search query"
|
|
80
|
+
}));
|
|
81
|
+
return [];
|
|
82
|
+
}
|
|
83
|
+
const records = searchReply.documents.map(({ value }) => value);
|
|
84
|
+
return parseRedisRecords(records, accessRuleInput, this.logger);
|
|
85
|
+
}
|
|
86
|
+
async findRuleIds(filter, matchingFieldsOnly = false) {
|
|
87
|
+
const query = getRulesRedisQuery(filter, matchingFieldsOnly);
|
|
88
|
+
let ruleIds = [];
|
|
89
|
+
try {
|
|
90
|
+
const ruleKeys = await aggregateRedisKeys(
|
|
91
|
+
this.client,
|
|
92
|
+
query,
|
|
93
|
+
this.logger
|
|
94
|
+
);
|
|
95
|
+
ruleIds = ruleKeys.map(
|
|
96
|
+
(ruleKey) => ruleKey.slice(ACCESS_RULE_REDIS_KEY_PREFIX.length)
|
|
97
|
+
);
|
|
98
|
+
} catch (e) {
|
|
99
|
+
this.logger.error(() => ({
|
|
100
|
+
err: e,
|
|
101
|
+
data: {
|
|
102
|
+
inspect: util.inspect(
|
|
103
|
+
{
|
|
104
|
+
query,
|
|
105
|
+
filter
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
depth: null
|
|
109
|
+
}
|
|
110
|
+
)
|
|
111
|
+
},
|
|
112
|
+
msg: "Failed to execute search query for rule IDs"
|
|
113
|
+
}));
|
|
114
|
+
return [];
|
|
115
|
+
}
|
|
116
|
+
this.logger.debug(() => ({
|
|
117
|
+
msg: "Executed search query for rule IDs",
|
|
118
|
+
data: {
|
|
119
|
+
query,
|
|
120
|
+
foundCount: ruleIds.length,
|
|
121
|
+
foundIds: ruleIds
|
|
122
|
+
}
|
|
123
|
+
}));
|
|
124
|
+
return ruleIds;
|
|
125
|
+
}
|
|
126
|
+
async fetchAllRuleIds(batchHandler) {
|
|
127
|
+
const keysBatchHandler = async (keys) => {
|
|
128
|
+
const ids = keys.map(
|
|
129
|
+
(ruleKey) => ruleKey.slice(ACCESS_RULE_REDIS_KEY_PREFIX.length)
|
|
130
|
+
);
|
|
131
|
+
await batchHandler(ids);
|
|
132
|
+
};
|
|
133
|
+
await aggregateRedisKeys(this.client, "*", this.logger, keysBatchHandler);
|
|
134
|
+
}
|
|
135
|
+
async fetchRuleEntries(keys) {
|
|
136
|
+
const { records, expirations } = await fetchRedisHashRecords(
|
|
137
|
+
this.client,
|
|
138
|
+
keys,
|
|
139
|
+
this.logger
|
|
140
|
+
);
|
|
141
|
+
const entries = [];
|
|
142
|
+
for (const [index, ruleData] of records.entries()) {
|
|
143
|
+
const isRulePresent = Object.keys(ruleData).length > 0;
|
|
144
|
+
if (isRulePresent) {
|
|
145
|
+
const rule = parseRedisRecords(
|
|
146
|
+
[ruleData],
|
|
147
|
+
accessRuleInput,
|
|
148
|
+
this.logger
|
|
149
|
+
)[0];
|
|
150
|
+
if (rule) {
|
|
151
|
+
entries.push({
|
|
152
|
+
rule,
|
|
153
|
+
expiresUnixTimestamp: expirations[index]
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return entries;
|
|
159
|
+
}
|
|
160
|
+
getRuleKeys(ruleIds) {
|
|
161
|
+
return ruleIds.map((id) => `${ACCESS_RULE_REDIS_KEY_PREFIX}${id}`);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
class DummyRedisRulesReader {
|
|
165
|
+
constructor(logger) {
|
|
166
|
+
this.logger = logger;
|
|
167
|
+
}
|
|
168
|
+
async getMissingRuleIds(ruleIds) {
|
|
169
|
+
this.logger.info(() => ({
|
|
170
|
+
msg: "Dummy getMissingRuleIds() has no effect (redis is not ready)",
|
|
171
|
+
data: {
|
|
172
|
+
ruleIds
|
|
173
|
+
}
|
|
174
|
+
}));
|
|
175
|
+
return [];
|
|
176
|
+
}
|
|
177
|
+
async fetchRules(ruleIds) {
|
|
178
|
+
this.logger.info(() => ({
|
|
179
|
+
msg: "Dummy fetchRule() has no effect (redis is not ready)",
|
|
180
|
+
data: {
|
|
181
|
+
ruleIds
|
|
182
|
+
}
|
|
183
|
+
}));
|
|
184
|
+
return [];
|
|
185
|
+
}
|
|
186
|
+
async findRules(filter, matchingFieldsOnly = false, skipEmptyUserScopes = true) {
|
|
187
|
+
this.logger.info(() => ({
|
|
188
|
+
msg: "Dummy findRules() has no effect (redis is not ready)",
|
|
189
|
+
data: {
|
|
190
|
+
filter
|
|
191
|
+
}
|
|
192
|
+
}));
|
|
193
|
+
return [];
|
|
194
|
+
}
|
|
195
|
+
async findRuleIds(filter, matchingFieldsOnly = false) {
|
|
196
|
+
this.logger.info(() => ({
|
|
197
|
+
msg: "Dummy findRuleIds() has no effect (redis is not ready)",
|
|
198
|
+
data: {
|
|
199
|
+
filter
|
|
200
|
+
}
|
|
201
|
+
}));
|
|
202
|
+
return [];
|
|
203
|
+
}
|
|
204
|
+
async fetchAllRuleIds(batchHandler) {
|
|
205
|
+
this.logger.info(() => ({
|
|
206
|
+
msg: "Dummy fetchAllRuleIds() has no effect (redis is not ready)"
|
|
207
|
+
}));
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
export {
|
|
211
|
+
DummyRedisRulesReader,
|
|
212
|
+
RedisRulesReader
|
|
213
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisRulesReader.js","sourceRoot":"","sources":["../../../src/redis/reader/redisRulesReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { Logger } from "@prosopo/common";
|
|
2
|
+
import type { RedisClientType } from "redis";
|
|
3
|
+
import { type AccessRulesReader, type AccessRulesStorage, type AccessRulesWriter } from "#policy/accessRules.js";
|
|
4
|
+
export declare const createRedisAccessRulesReader: (client: RedisClientType, logger: Logger) => AccessRulesReader;
|
|
5
|
+
export declare const createRedisAccessRulesWriter: (client: RedisClientType) => AccessRulesWriter;
|
|
6
|
+
export declare const createRedisAccessRulesStorage: (client: RedisClientType, logger: Logger) => AccessRulesStorage;
|
|
7
|
+
//# sourceMappingURL=redisAccessRules.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisAccessRules.d.ts","sourceRoot":"","sources":["../../src/redis/redisAccessRules.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,EAEN,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAEtB,MAAM,wBAAwB,CAAC;AAUhC,eAAO,MAAM,4BAA4B,WAChC,eAAe,UACf,MAAM,KACZ,iBAmGF,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAChC,eAAe,KACrB,iBAoCF,CAAC;AAEF,eAAO,MAAM,6BAA6B,WACjC,eAAe,UACf,MAAM,KACZ,kBAKF,CAAC"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import * as util from "node:util";
|
|
2
|
+
import { accessRuleSchema, } from "#policy/accessRules.js";
|
|
3
|
+
import { accessRuleRedisKeyPrefix, accessRulesRedisIndexName, accessRulesRedisSearchOptions, getRedisAccessRuleKey, getRedisAccessRuleValue, getRedisAccessRulesQuery, } from "#policy/redis/redisAccessRulesIndex.js";
|
|
4
|
+
export const createRedisAccessRulesReader = (client, logger) => {
|
|
5
|
+
return {
|
|
6
|
+
findRules: async (filter, matchingFieldsOnly = false, skipEmptyUserScopes = true) => {
|
|
7
|
+
const query = getRedisAccessRulesQuery(filter, matchingFieldsOnly);
|
|
8
|
+
if (skipEmptyUserScopes && query === "ismissing(@clientId)") {
|
|
9
|
+
return [];
|
|
10
|
+
}
|
|
11
|
+
let searchReply;
|
|
12
|
+
try {
|
|
13
|
+
searchReply = await client.ft.search(accessRulesRedisIndexName, query, accessRulesRedisSearchOptions);
|
|
14
|
+
if (searchReply.total > 0) {
|
|
15
|
+
logger.debug(() => ({
|
|
16
|
+
msg: "Executed search query",
|
|
17
|
+
data: {
|
|
18
|
+
inspect: util.inspect({
|
|
19
|
+
filter: filter,
|
|
20
|
+
searchReply: searchReply,
|
|
21
|
+
query: query,
|
|
22
|
+
}, { depth: null }),
|
|
23
|
+
},
|
|
24
|
+
}));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
logger.error(() => ({
|
|
29
|
+
err: e,
|
|
30
|
+
data: {
|
|
31
|
+
inspect: util.inspect({
|
|
32
|
+
query: query,
|
|
33
|
+
filter: filter,
|
|
34
|
+
}, {
|
|
35
|
+
depth: null,
|
|
36
|
+
}),
|
|
37
|
+
},
|
|
38
|
+
msg: "failed to execute search query",
|
|
39
|
+
}));
|
|
40
|
+
return [];
|
|
41
|
+
}
|
|
42
|
+
return extractAccessRulesFromSearchReply(searchReply, logger);
|
|
43
|
+
},
|
|
44
|
+
findRuleIds: async (filter, matchingFieldsOnly = false) => {
|
|
45
|
+
const query = getRedisAccessRulesQuery(filter, matchingFieldsOnly);
|
|
46
|
+
let searchReply;
|
|
47
|
+
try {
|
|
48
|
+
searchReply = await client.ft.searchNoContent(accessRulesRedisIndexName, query, accessRulesRedisSearchOptions);
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
logger.error(() => ({
|
|
52
|
+
err: e,
|
|
53
|
+
data: {
|
|
54
|
+
inspect: util.inspect({
|
|
55
|
+
query: query,
|
|
56
|
+
filter: filter,
|
|
57
|
+
}, {
|
|
58
|
+
depth: null,
|
|
59
|
+
}),
|
|
60
|
+
},
|
|
61
|
+
msg: "Failed to execute search query for rule IDs",
|
|
62
|
+
}));
|
|
63
|
+
return [];
|
|
64
|
+
}
|
|
65
|
+
return searchReply.documents;
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
};
|
|
69
|
+
export const createRedisAccessRulesWriter = (client) => {
|
|
70
|
+
return {
|
|
71
|
+
insertRule: async (rule, expirationTimestamp) => {
|
|
72
|
+
const ruleKey = getRedisAccessRuleKey(rule);
|
|
73
|
+
const ruleValue = getRedisAccessRuleValue(rule);
|
|
74
|
+
await client.hSet(ruleKey, ruleValue);
|
|
75
|
+
if (expirationTimestamp) {
|
|
76
|
+
const expiryDate = new Date(expirationTimestamp);
|
|
77
|
+
if (expiryDate.getUTCFullYear() === 1970) {
|
|
78
|
+
await client.expireAt(ruleKey, expirationTimestamp);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
const timestampInSeconds = Math.floor(expirationTimestamp / 1000);
|
|
82
|
+
await client.expireAt(ruleKey, timestampInSeconds);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return ruleKey;
|
|
86
|
+
},
|
|
87
|
+
deleteRules: async (ruleIds) => void (await client.del(ruleIds)),
|
|
88
|
+
deleteAllRules: async () => {
|
|
89
|
+
const keys = await client.keys(`${accessRuleRedisKeyPrefix}*`);
|
|
90
|
+
if (keys.length === 0)
|
|
91
|
+
return 0;
|
|
92
|
+
return await client.del(keys);
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
export const createRedisAccessRulesStorage = (client, logger) => {
|
|
97
|
+
return {
|
|
98
|
+
...createRedisAccessRulesReader(client, logger),
|
|
99
|
+
...createRedisAccessRulesWriter(client),
|
|
100
|
+
};
|
|
101
|
+
};
|
|
102
|
+
const extractAccessRulesFromSearchReply = (searchReply, logger) => {
|
|
103
|
+
const accessRules = [];
|
|
104
|
+
searchReply.documents.map(({ id, value: document }) => {
|
|
105
|
+
const parsedDocument = accessRuleSchema.safeParse(document);
|
|
106
|
+
if (parsedDocument.success) {
|
|
107
|
+
accessRules.push(parsedDocument.data);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
logger.debug(() => ({
|
|
111
|
+
msg: "Failed to parse access rule from search reply",
|
|
112
|
+
id: id,
|
|
113
|
+
error: parsedDocument.error,
|
|
114
|
+
}));
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
return accessRules;
|
|
118
|
+
};
|
|
119
|
+
//# sourceMappingURL=redisAccessRules.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisAccessRules.js","sourceRoot":"","sources":["../../src/redis/redisAccessRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAMlC,OAAO,EAKN,gBAAgB,GAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,wBAAwB,EACxB,yBAAyB,EACzB,6BAA6B,EAC7B,qBAAqB,EACrB,uBAAuB,EACvB,wBAAwB,GACxB,MAAM,wCAAwC,CAAC;AAEhD,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC3C,MAAuB,EACvB,MAAc,EACM,EAAE;IACtB,OAAO;QACN,SAAS,EAAE,KAAK,EACf,MAAoB,EACpB,kBAAkB,GAAG,KAAK,EAC1B,mBAAmB,GAAG,IAAI,EACF,EAAE;YAC1B,MAAM,KAAK,GAAG,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;YAEnE,IAAI,mBAAmB,IAAI,KAAK,KAAK,sBAAsB,EAAE,CAAC;gBAE7D,OAAO,EAAE,CAAC;YACX,CAAC;YAED,IAAI,WAAwB,CAAC;YAE7B,IAAI,CAAC;gBACJ,WAAW,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,CACnC,yBAAyB,EACzB,KAAK,EACL,6BAA6B,CAC7B,CAAC;gBAEF,IAAI,WAAW,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;wBACnB,GAAG,EAAE,uBAAuB;wBAC5B,IAAI,EAAE;4BACL,OAAO,EAAE,IAAI,CAAC,OAAO,CACpB;gCACC,MAAM,EAAE,MAAM;gCACd,WAAW,EAAE,WAAW;gCACxB,KAAK,EAAE,KAAK;6BACZ,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CACf;yBACD;qBACD,CAAC,CAAC,CAAC;gBACL,CAAC;YACF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACnB,GAAG,EAAE,CAAC;oBACN,IAAI,EAAE;wBACL,OAAO,EAAE,IAAI,CAAC,OAAO,CACpB;4BACC,KAAK,EAAE,KAAK;4BACZ,MAAM,EAAE,MAAM;yBACd,EACD;4BACC,KAAK,EAAE,IAAI;yBACX,CACD;qBACD;oBACD,GAAG,EAAE,gCAAgC;iBACrC,CAAC,CAAC,CAAC;gBAEJ,OAAO,EAAE,CAAC;YACX,CAAC;YAED,OAAO,iCAAiC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC/D,CAAC;QAED,WAAW,EAAE,KAAK,EACjB,MAAoB,EACpB,kBAAkB,GAAG,KAAK,EACN,EAAE;YACtB,MAAM,KAAK,GAAG,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;YAEnE,IAAI,WAAiC,CAAC;YAEtC,IAAI,CAAC;gBACJ,WAAW,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,eAAe,CAC5C,yBAAyB,EACzB,KAAK,EACL,6BAA6B,CAC7B,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAEZ,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACnB,GAAG,EAAE,CAAC;oBACN,IAAI,EAAE;wBACL,OAAO,EAAE,IAAI,CAAC,OAAO,CACpB;4BACC,KAAK,EAAE,KAAK;4BACZ,MAAM,EAAE,MAAM;yBACd,EACD;4BACC,KAAK,EAAE,IAAI;yBACX,CACD;qBACD;oBACD,GAAG,EAAE,6CAA6C;iBAClD,CAAC,CAAC,CAAC;gBAEJ,OAAO,EAAE,CAAC;YACX,CAAC;YAED,OAAO,WAAW,CAAC,SAAS,CAAC;QAC9B,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC3C,MAAuB,EACH,EAAE;IACtB,OAAO;QACN,UAAU,EAAE,KAAK,EAChB,IAAgB,EAChB,mBAA4B,EACV,EAAE;YACpB,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;YAEhD,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAEtC,IAAI,mBAAmB,EAAE,CAAC;gBACzB,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACjD,IAAI,UAAU,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;oBAE1C,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;gBACrD,CAAC;qBAAM,CAAC;oBACP,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;oBAClE,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBACpD,CAAC;YACF,CAAC;YAED,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,OAAiB,EAAiB,EAAE,CACvD,KAAK,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEjC,cAAc,EAAE,KAAK,IAAqB,EAAE;YAC3C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,wBAAwB,GAAG,CAAC,CAAC;YAE/D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;YAEhC,OAAO,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC5C,MAAuB,EACvB,MAAc,EACO,EAAE;IACvB,OAAO;QACN,GAAG,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC;QAC/C,GAAG,4BAA4B,CAAC,MAAM,CAAC;KACvC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CACzC,WAAwB,EACxB,MAAc,EACC,EAAE;IACjB,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrD,MAAM,cAAc,GAAG,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YAC5B,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACnB,GAAG,EAAE,+CAA+C;gBACpD,EAAE,EAAE,EAAE;gBACN,KAAK,EAAE,cAAc,CAAC,KAAK;aAC3B,CAAC,CAAC,CAAC;QACL,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type FtSearchOptions } from "@redis/search";
|
|
2
|
+
import type { RedisClientType } from "redis";
|
|
3
|
+
import { type PolicyFilter } from "#policy/accessPolicyResolver.js";
|
|
4
|
+
import type { AccessRule } from "#policy/accessRules.js";
|
|
5
|
+
export declare const accessRulesRedisIndexName = "index:user-access-rules";
|
|
6
|
+
export declare const accessRuleRedisKeyPrefix = "uar:";
|
|
7
|
+
export declare const createRedisAccessRulesIndex: (client: RedisClientType, indexName?: string) => Promise<void>;
|
|
8
|
+
export declare const accessRulesRedisSearchOptions: FtSearchOptions;
|
|
9
|
+
export declare const accessRulesRedisDeleteOptions: FtSearchOptions;
|
|
10
|
+
export declare const getRedisAccessRulesQuery: (filter: PolicyFilter, matchingFieldsOnly: boolean) => string;
|
|
11
|
+
export declare const getRedisAccessRuleKey: (rule: AccessRule) => string;
|
|
12
|
+
export declare const getRedisAccessRuleValue: (rule: AccessRule) => Record<string, string>;
|
|
13
|
+
//# sourceMappingURL=redisAccessRulesIndex.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redisAccessRulesIndex.d.ts","sourceRoot":"","sources":["../../src/redis/redisAccessRulesIndex.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAM7C,OAAO,EAAE,KAAK,YAAY,EAAc,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD,eAAO,MAAM,yBAAyB,4BAA4B,CAAC;AAEnE,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAmC/C,eAAO,MAAM,2BAA2B,WAC/B,eAAe,cACX,MAAM,KAChB,OAAO,CAAC,IAAI,CAKd,CAAC;AA8CF,eAAO,MAAM,6BAA6B,EAAE,eAG3C,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAO3C,CAAC;AAYF,eAAO,MAAM,wBAAwB,WAC5B,YAAY,sBACA,OAAO,KACzB,MAkBF,CAAC;AA0FF,eAAO,MAAM,qBAAqB,SAAU,UAAU,KAAG,MAUzC,CAAC;AAEjB,eAAO,MAAM,uBAAuB,SAC7B,UAAU,KACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAGtB,CAAC"}
|