@prosopo/user-access-policy 3.3.0 → 3.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -0
- package/dist/accessPolicy.js +71 -57
- package/dist/accessPolicyResolver.js +62 -36
- package/dist/accessRules.js +9 -6
- package/dist/api/accessRuleApiRoutes.js +73 -50
- package/dist/api/deleteAllRulesEndpoint.js +22 -19
- package/dist/api/deleteRulesEndpoint.js +30 -27
- package/dist/api/insertRulesEndpoint.js +57 -57
- package/dist/index.js +27 -14
- package/dist/redis/redisAccessRules.js +128 -112
- package/dist/redis/redisAccessRulesIndex.js +94 -70
- package/dist/redis/redisIndex.js +15 -16
- package/dist/util.js +4 -2
- package/package.json +15 -10
- package/vite.cjs.config.ts +7 -6
- package/vite.esm.config.ts +20 -0
- package/vite.test.config.ts +16 -21
- package/dist/accessPolicy.d.ts +0 -169
- package/dist/accessPolicy.d.ts.map +0 -1
- package/dist/accessPolicy.js.map +0 -1
- package/dist/accessPolicyResolver.d.ts +0 -115
- package/dist/accessPolicyResolver.d.ts.map +0 -1
- package/dist/accessPolicyResolver.js.map +0 -1
- package/dist/accessRules.d.ts +0 -16
- package/dist/accessRules.d.ts.map +0 -1
- package/dist/accessRules.js.map +0 -1
- package/dist/api/accessRuleApiRoutes.d.ts +0 -27
- package/dist/api/accessRuleApiRoutes.d.ts.map +0 -1
- package/dist/api/accessRuleApiRoutes.js.map +0 -1
- package/dist/api/deleteAllRulesEndpoint.d.ts +0 -12
- package/dist/api/deleteAllRulesEndpoint.d.ts.map +0 -1
- package/dist/api/deleteAllRulesEndpoint.js.map +0 -1
- package/dist/api/deleteRulesEndpoint.d.ts +0 -116
- package/dist/api/deleteRulesEndpoint.d.ts.map +0 -1
- package/dist/api/deleteRulesEndpoint.js.map +0 -1
- package/dist/api/insertRulesEndpoint.d.ts +0 -22
- package/dist/api/insertRulesEndpoint.d.ts.map +0 -1
- package/dist/api/insertRulesEndpoint.js.map +0 -1
- package/dist/index.d.ts +0 -15
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/redis/redisAccessRules.d.ts +0 -7
- package/dist/redis/redisAccessRules.d.ts.map +0 -1
- package/dist/redis/redisAccessRules.js.map +0 -1
- package/dist/redis/redisAccessRulesIndex.d.ts +0 -13
- package/dist/redis/redisAccessRulesIndex.d.ts.map +0 -1
- package/dist/redis/redisAccessRulesIndex.js.map +0 -1
- package/dist/redis/redisIndex.d.ts +0 -9
- package/dist/redis/redisIndex.d.ts.map +0 -1
- package/dist/redis/redisIndex.js.map +0 -1
- package/dist/tests/accessPolicy.test.d.ts +0 -2
- package/dist/tests/accessPolicy.test.d.ts.map +0 -1
- package/dist/tests/accessPolicy.test.js +0 -27
- package/dist/tests/accessPolicy.test.js.map +0 -1
- package/dist/tests/redis/redisAccessRules.test.d.ts +0 -2
- package/dist/tests/redis/redisAccessRules.test.d.ts.map +0 -1
- package/dist/tests/redis/redisAccessRules.test.js +0 -413
- package/dist/tests/redis/redisAccessRules.test.js.map +0 -1
- package/dist/tests/redis/redisIndex.test.d.ts +0 -2
- package/dist/tests/redis/redisIndex.test.d.ts.map +0 -1
- package/dist/tests/redis/redisIndex.test.js +0 -84
- package/dist/tests/redis/redisIndex.test.js.map +0 -1
- package/dist/tests/redis/testRedisClient.d.ts +0 -3
- package/dist/tests/redis/testRedisClient.d.ts.map +0 -1
- package/dist/tests/redis/testRedisClient.js +0 -8
- package/dist/tests/redis/testRedisClient.js.map +0 -1
- package/dist/tests/testLogger.d.ts +0 -4
- package/dist/tests/testLogger.d.ts.map +0 -1
- package/dist/tests/testLogger.js +0 -22
- package/dist/tests/testLogger.js.map +0 -1
- package/dist/util.d.ts +0 -2
- package/dist/util.d.ts.map +0 -1
- package/dist/util.js.map +0 -1
- package/vite.config.ts +0 -39
|
@@ -1 +0,0 @@
|
|
|
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,iBA+FF,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAChC,eAAe,KACrB,iBAoCF,CAAC;AAEF,eAAO,MAAM,6BAA6B,WACjC,eAAe,UACf,MAAM,KACZ,kBAKF,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRules.js","sourceRoot":"","sources":["../../src/redis/redisAccessRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +0,0 @@
|
|
|
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) => Promise<void>;
|
|
8
|
-
export declare const accessRulesRedisSearchOptions: FtSearchOptions;
|
|
9
|
-
export declare const accessRulesRedisDeleteOptions: FtSearchOptions;
|
|
10
|
-
export declare const getRedisAccessRulesQuery: (filter: PolicyFilter) => 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
|
|
@@ -1 +0,0 @@
|
|
|
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;AAE7C,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,KACrB,OAAO,CAAC,IAAI,CAA+C,CAAC;AAkB/D,eAAO,MAAM,6BAA6B,EAAE,eAG3C,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAO3C,CAAC;AAYF,eAAO,MAAM,wBAAwB,WAAY,YAAY,KAAG,MAe/D,CAAC;AAqDF,eAAO,MAAM,qBAAqB,SAAU,UAAU,KAAG,MAUzC,CAAC;AAEjB,eAAO,MAAM,uBAAuB,SAC7B,UAAU,KACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAGtB,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRulesIndex.js","sourceRoot":"","sources":["../../src/redis/redisAccessRulesIndex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import type { RediSearchSchema } from "@redis/search";
|
|
2
|
-
import type { RedisClientType } from "redis";
|
|
3
|
-
export type RedisIndex = {
|
|
4
|
-
name: string;
|
|
5
|
-
schema: RediSearchSchema;
|
|
6
|
-
options: object;
|
|
7
|
-
};
|
|
8
|
-
export declare const createRedisIndex: (client: RedisClientType, index: RedisIndex) => Promise<void>;
|
|
9
|
-
//# sourceMappingURL=redisIndex.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisIndex.d.ts","sourceRoot":"","sources":["../../src/redis/redisIndex.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAc7C,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AASF,eAAO,MAAM,gBAAgB,WACpB,eAAe,SAChB,UAAU,KACf,OAAO,CAAC,IAAI,CAkBd,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisIndex.js","sourceRoot":"","sources":["../../src/redis/redisIndex.ts"],"names":[],"mappings":"AAcA,OAAO,MAAM,MAAM,aAAa,CAAC;AA0BjC,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAClD,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACpC,MAAuB,EACvB,KAAiB,EACD,EAAE;IAClB,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IAEhD,IAAI,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,iBAAiB,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnE,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;YACrC,OAAO;QACR,CAAC;QAED,MAAM,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAEhE,MAAM,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAiB,EAAU,EAAE,CACrD,MAAM;KACJ,UAAU,CAAC,uBAAuB,CAAC;KACnC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;KAC7B,MAAM,CAAC,KAAK,CAAC,CAAC;AAEjB,MAAM,cAAc,GAAG,KAAK,EAC3B,MAAuB,EACvB,SAAiB,EACQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;AAE/E,MAAM,aAAa,GAAG,KAAK,EAC1B,MAAuB,EACvB,SAAiB,EACjB,SAAiB,EACC,EAAE,CACpB,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"accessPolicy.test.d.ts","sourceRoot":"","sources":["../../src/tests/accessPolicy.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { describe, expect, test } from "vitest";
|
|
2
|
-
import { userScopeInputSchema } from "#policy/accessPolicy.js";
|
|
3
|
-
describe("accessPolicy", () => {
|
|
4
|
-
describe("userScopeInputSchema", () => {
|
|
5
|
-
test("turns ip into numericIp", () => {
|
|
6
|
-
const userScope = userScopeInputSchema.parse({
|
|
7
|
-
ip: "127.0.0.1",
|
|
8
|
-
numericIp: "123",
|
|
9
|
-
});
|
|
10
|
-
expect(userScope).toEqual({
|
|
11
|
-
numericIp: BigInt(2130706433),
|
|
12
|
-
});
|
|
13
|
-
});
|
|
14
|
-
test("turns ipMask into numericIpMask", () => {
|
|
15
|
-
const userScope = userScopeInputSchema.parse({
|
|
16
|
-
ipMask: "127.0.0.1/24",
|
|
17
|
-
numericIpMaskMin: 1,
|
|
18
|
-
numericIpMaskMax: 2,
|
|
19
|
-
});
|
|
20
|
-
expect(userScope).toEqual({
|
|
21
|
-
numericIpMaskMin: BigInt(2130706432),
|
|
22
|
-
numericIpMaskMax: BigInt(2130706687),
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
//# sourceMappingURL=accessPolicy.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"accessPolicy.test.js","sourceRoot":"","sources":["../../src/tests/accessPolicy.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACrC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;YACpC,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC;gBAC5C,EAAE,EAAE,WAAW;gBACf,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;gBACzB,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC;aAC7B,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC5C,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC;gBAC5C,MAAM,EAAE,cAAc;gBACtB,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,EAAE,CAAC;aACnB,CAAC,CAAC;YAEH,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;gBACzB,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC;gBACpC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC;aACpC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRules.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisAccessRules.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,413 +0,0 @@
|
|
|
1
|
-
import { LogLevel, getLogger } from "@prosopo/common";
|
|
2
|
-
import { afterAll, beforeAll, beforeEach, describe, expect, test, } from "vitest";
|
|
3
|
-
import { AccessPolicyType } from "#policy/accessPolicy.js";
|
|
4
|
-
import { ScopeMatch } from "#policy/accessPolicyResolver.js";
|
|
5
|
-
import { createRedisAccessRulesReader, createRedisAccessRulesWriter, } from "#policy/redis/redisAccessRules.js";
|
|
6
|
-
import { accessRulesRedisIndexName, createRedisAccessRulesIndex, getRedisAccessRuleKey, getRedisAccessRuleValue, } from "#policy/redis/redisAccessRulesIndex.js";
|
|
7
|
-
import { createTestRedisClient } from "#policy/tests/redis/testRedisClient.js";
|
|
8
|
-
describe("redisAccessRules", () => {
|
|
9
|
-
let redisClient;
|
|
10
|
-
const getUniqueString = () => Math.random().toString(36).substring(2, 15);
|
|
11
|
-
const getIndexRecordsCount = async () => (await redisClient.ft.info(accessRulesRedisIndexName)).num_docs;
|
|
12
|
-
const insertRule = async (rule) => {
|
|
13
|
-
const ruleKey = getRedisAccessRuleKey(rule);
|
|
14
|
-
const ruleValue = getRedisAccessRuleValue(rule);
|
|
15
|
-
await redisClient.hSet(ruleKey, ruleValue);
|
|
16
|
-
};
|
|
17
|
-
beforeAll(async () => {
|
|
18
|
-
redisClient = await createTestRedisClient();
|
|
19
|
-
await createRedisAccessRulesIndex(redisClient);
|
|
20
|
-
});
|
|
21
|
-
beforeEach(async () => {
|
|
22
|
-
const keys = await redisClient.keys("*");
|
|
23
|
-
if (keys.length > 0) {
|
|
24
|
-
await redisClient.del(keys);
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
describe("writer", () => {
|
|
28
|
-
let accessRulesWriter;
|
|
29
|
-
beforeAll(() => {
|
|
30
|
-
accessRulesWriter = createRedisAccessRulesWriter(redisClient);
|
|
31
|
-
});
|
|
32
|
-
test("inserts rule", async () => {
|
|
33
|
-
const accessRule = {
|
|
34
|
-
type: AccessPolicyType.Block,
|
|
35
|
-
clientId: "clientId",
|
|
36
|
-
};
|
|
37
|
-
const accessRuleKey = getRedisAccessRuleKey(accessRule);
|
|
38
|
-
await accessRulesWriter.insertRule(accessRule);
|
|
39
|
-
const insertedAccessRule = await redisClient.hGetAll(accessRuleKey);
|
|
40
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
41
|
-
expect(insertedAccessRule).toEqual(accessRule);
|
|
42
|
-
expect(indexRecordsCount).toEqual(1);
|
|
43
|
-
});
|
|
44
|
-
test("inserts time limited rule", async () => {
|
|
45
|
-
const accessRule = {
|
|
46
|
-
type: AccessPolicyType.Block,
|
|
47
|
-
clientId: "clientId",
|
|
48
|
-
};
|
|
49
|
-
const accessRuleKey = getRedisAccessRuleKey(accessRule);
|
|
50
|
-
const expireIn = 60 * 60;
|
|
51
|
-
const expirationTimestamp = new Date(Date.now() + expireIn * 1000).getTime();
|
|
52
|
-
const expirationTimestampInSeconds = Math.floor(expirationTimestamp / 1000);
|
|
53
|
-
await accessRulesWriter.insertRule(accessRule, expirationTimestamp);
|
|
54
|
-
const ruleKey = getRedisAccessRuleKey(accessRule);
|
|
55
|
-
const insertedAccessRule = await redisClient.hGetAll(accessRuleKey);
|
|
56
|
-
const insertedExpirationResult = await redisClient.expireAt(ruleKey, expirationTimestampInSeconds);
|
|
57
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
58
|
-
const recordExpirySeconds = await redisClient.ttl(ruleKey);
|
|
59
|
-
expect(insertedAccessRule).toEqual(accessRule);
|
|
60
|
-
expect(insertedExpirationResult).toBe(1);
|
|
61
|
-
expect(recordExpirySeconds).toBeLessThanOrEqual(expirationTimestampInSeconds);
|
|
62
|
-
expect(indexRecordsCount).toBe(1);
|
|
63
|
-
});
|
|
64
|
-
test("deletes rules", async () => {
|
|
65
|
-
const johnAccessRule = {
|
|
66
|
-
type: AccessPolicyType.Block,
|
|
67
|
-
clientId: getUniqueString(),
|
|
68
|
-
};
|
|
69
|
-
const johnAccessRuleKey = getRedisAccessRuleKey(johnAccessRule);
|
|
70
|
-
const doeAccessRule = {
|
|
71
|
-
type: AccessPolicyType.Block,
|
|
72
|
-
clientId: getUniqueString(),
|
|
73
|
-
};
|
|
74
|
-
const doeAccessRuleKey = getRedisAccessRuleKey(doeAccessRule);
|
|
75
|
-
await insertRule(johnAccessRule);
|
|
76
|
-
await insertRule(doeAccessRule);
|
|
77
|
-
await accessRulesWriter.deleteRules([johnAccessRuleKey]);
|
|
78
|
-
const presentAccessRule = await redisClient.hGetAll(doeAccessRuleKey);
|
|
79
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
80
|
-
expect(presentAccessRule).toEqual(doeAccessRule);
|
|
81
|
-
expect(indexRecordsCount).toBe(1);
|
|
82
|
-
});
|
|
83
|
-
test("deletes all rules", async () => {
|
|
84
|
-
const johnAccessRule = {
|
|
85
|
-
type: AccessPolicyType.Block,
|
|
86
|
-
clientId: getUniqueString(),
|
|
87
|
-
};
|
|
88
|
-
const doeAccessRule = {
|
|
89
|
-
type: AccessPolicyType.Block,
|
|
90
|
-
clientId: getUniqueString(),
|
|
91
|
-
};
|
|
92
|
-
await insertRule(johnAccessRule);
|
|
93
|
-
await insertRule(doeAccessRule);
|
|
94
|
-
await accessRulesWriter.deleteAllRules();
|
|
95
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
96
|
-
expect(indexRecordsCount).toBe(0);
|
|
97
|
-
});
|
|
98
|
-
test("deletes all rules when there are 1000s of rules", async () => {
|
|
99
|
-
const rulesCount = 10000;
|
|
100
|
-
const accessRules = Array.from({ length: rulesCount }, () => ({
|
|
101
|
-
type: AccessPolicyType.Block,
|
|
102
|
-
clientId: getUniqueString(),
|
|
103
|
-
}));
|
|
104
|
-
for (const rule of accessRules) {
|
|
105
|
-
await insertRule(rule);
|
|
106
|
-
}
|
|
107
|
-
await accessRulesWriter.deleteAllRules();
|
|
108
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
109
|
-
expect(indexRecordsCount).toBe(0);
|
|
110
|
-
});
|
|
111
|
-
});
|
|
112
|
-
describe("reader", () => {
|
|
113
|
-
let accessRulesReader;
|
|
114
|
-
beforeAll(() => {
|
|
115
|
-
accessRulesReader = createRedisAccessRulesReader(redisClient, getLogger(LogLevel.enum.info, "RedisAccessRulesReader"));
|
|
116
|
-
});
|
|
117
|
-
test("finds client and global rules by greedy policy scope match", async () => {
|
|
118
|
-
const johnId = getUniqueString();
|
|
119
|
-
const johnAccessRule = {
|
|
120
|
-
type: AccessPolicyType.Block,
|
|
121
|
-
clientId: johnId,
|
|
122
|
-
};
|
|
123
|
-
const doeAccessRule = {
|
|
124
|
-
type: AccessPolicyType.Block,
|
|
125
|
-
clientId: getUniqueString(),
|
|
126
|
-
};
|
|
127
|
-
const globalAccessRule = {
|
|
128
|
-
type: AccessPolicyType.Block,
|
|
129
|
-
};
|
|
130
|
-
await insertRule(johnAccessRule);
|
|
131
|
-
await insertRule(doeAccessRule);
|
|
132
|
-
await insertRule(globalAccessRule);
|
|
133
|
-
const foundByClientAccessRules = await accessRulesReader.findRules({
|
|
134
|
-
policyScope: {
|
|
135
|
-
clientId: johnId,
|
|
136
|
-
},
|
|
137
|
-
policyScopeMatch: ScopeMatch.Greedy,
|
|
138
|
-
});
|
|
139
|
-
const foundAccessRules = await accessRulesReader.findRules({
|
|
140
|
-
policyScopeMatch: ScopeMatch.Greedy,
|
|
141
|
-
});
|
|
142
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
143
|
-
expect(indexRecordsCount).toBe(3);
|
|
144
|
-
expect(foundByClientAccessRules).toEqual([
|
|
145
|
-
johnAccessRule,
|
|
146
|
-
globalAccessRule,
|
|
147
|
-
]);
|
|
148
|
-
expect(foundAccessRules).toEqual([
|
|
149
|
-
johnAccessRule,
|
|
150
|
-
doeAccessRule,
|
|
151
|
-
globalAccessRule,
|
|
152
|
-
]);
|
|
153
|
-
});
|
|
154
|
-
test("finds client or global rules by exact policy scope match", async () => {
|
|
155
|
-
const johnId = getUniqueString();
|
|
156
|
-
const johnAccessRule = {
|
|
157
|
-
type: AccessPolicyType.Block,
|
|
158
|
-
clientId: johnId,
|
|
159
|
-
};
|
|
160
|
-
const doeAccessRule = {
|
|
161
|
-
type: AccessPolicyType.Block,
|
|
162
|
-
clientId: getUniqueString(),
|
|
163
|
-
};
|
|
164
|
-
const globalAccessRule = {
|
|
165
|
-
type: AccessPolicyType.Block,
|
|
166
|
-
};
|
|
167
|
-
await insertRule(johnAccessRule);
|
|
168
|
-
await insertRule(doeAccessRule);
|
|
169
|
-
await insertRule(globalAccessRule);
|
|
170
|
-
const foundClientAccessRules = await accessRulesReader.findRules({
|
|
171
|
-
policyScope: {
|
|
172
|
-
clientId: johnId,
|
|
173
|
-
},
|
|
174
|
-
policyScopeMatch: ScopeMatch.Exact,
|
|
175
|
-
});
|
|
176
|
-
const foundGlobalAccessRules = await accessRulesReader.findRules({
|
|
177
|
-
policyScopeMatch: ScopeMatch.Exact,
|
|
178
|
-
}, false);
|
|
179
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
180
|
-
expect(indexRecordsCount).toBe(3);
|
|
181
|
-
expect(foundClientAccessRules).toEqual([johnAccessRule]);
|
|
182
|
-
expect(foundGlobalAccessRules).toEqual([globalAccessRule]);
|
|
183
|
-
});
|
|
184
|
-
test("finds rules by greedy user scope match", async () => {
|
|
185
|
-
const johnId = getUniqueString();
|
|
186
|
-
const johnIpAccessRule = {
|
|
187
|
-
type: AccessPolicyType.Block,
|
|
188
|
-
clientId: johnId,
|
|
189
|
-
numericIp: BigInt(100),
|
|
190
|
-
};
|
|
191
|
-
const doeIpAccessRule = {
|
|
192
|
-
type: AccessPolicyType.Block,
|
|
193
|
-
clientId: getUniqueString(),
|
|
194
|
-
numericIp: BigInt(100),
|
|
195
|
-
};
|
|
196
|
-
const johnHeaderAccessRule = {
|
|
197
|
-
type: AccessPolicyType.Block,
|
|
198
|
-
headersHash: "chrome",
|
|
199
|
-
};
|
|
200
|
-
const globalJa4AccessRule = {
|
|
201
|
-
type: AccessPolicyType.Block,
|
|
202
|
-
ja4Hash: "windows",
|
|
203
|
-
};
|
|
204
|
-
await insertRule(johnIpAccessRule);
|
|
205
|
-
await insertRule(doeIpAccessRule);
|
|
206
|
-
await insertRule(johnHeaderAccessRule);
|
|
207
|
-
await insertRule(globalJa4AccessRule);
|
|
208
|
-
const foundAccessRules = await accessRulesReader.findRules({
|
|
209
|
-
policyScope: {
|
|
210
|
-
clientId: johnId,
|
|
211
|
-
},
|
|
212
|
-
userScope: {
|
|
213
|
-
numericIp: BigInt(100),
|
|
214
|
-
ja4Hash: "windows",
|
|
215
|
-
},
|
|
216
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
217
|
-
});
|
|
218
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
219
|
-
expect(indexRecordsCount).toBe(4);
|
|
220
|
-
expect(foundAccessRules).toEqual([johnIpAccessRule, globalJa4AccessRule]);
|
|
221
|
-
});
|
|
222
|
-
test("finds rules by exact user scope match", async () => {
|
|
223
|
-
const johnId = getUniqueString();
|
|
224
|
-
const johnTargetAccessRule = {
|
|
225
|
-
type: AccessPolicyType.Block,
|
|
226
|
-
clientId: johnId,
|
|
227
|
-
numericIp: BigInt(100),
|
|
228
|
-
ja4Hash: "windows",
|
|
229
|
-
};
|
|
230
|
-
const doeTargetAccessRule = {
|
|
231
|
-
type: AccessPolicyType.Block,
|
|
232
|
-
clientId: getUniqueString(),
|
|
233
|
-
numericIp: BigInt(100),
|
|
234
|
-
ja4Hash: "windows",
|
|
235
|
-
};
|
|
236
|
-
const johnHeaderAccessRule = {
|
|
237
|
-
type: AccessPolicyType.Block,
|
|
238
|
-
headersHash: "chrome",
|
|
239
|
-
};
|
|
240
|
-
const globalTargetAccessRule = {
|
|
241
|
-
type: AccessPolicyType.Block,
|
|
242
|
-
numericIp: BigInt(100),
|
|
243
|
-
ja4Hash: "windows",
|
|
244
|
-
};
|
|
245
|
-
const globalJa4AccessRule = {
|
|
246
|
-
type: AccessPolicyType.Block,
|
|
247
|
-
ja4Hash: "windows",
|
|
248
|
-
};
|
|
249
|
-
await insertRule(johnTargetAccessRule);
|
|
250
|
-
await insertRule(doeTargetAccessRule);
|
|
251
|
-
await insertRule(johnHeaderAccessRule);
|
|
252
|
-
await insertRule(globalTargetAccessRule);
|
|
253
|
-
await insertRule(globalJa4AccessRule);
|
|
254
|
-
const foundAccessRules = await accessRulesReader.findRules({
|
|
255
|
-
policyScope: {
|
|
256
|
-
clientId: johnId,
|
|
257
|
-
},
|
|
258
|
-
userScope: {
|
|
259
|
-
numericIp: BigInt(100),
|
|
260
|
-
ja4Hash: "windows",
|
|
261
|
-
},
|
|
262
|
-
userScopeMatch: ScopeMatch.Exact,
|
|
263
|
-
});
|
|
264
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
265
|
-
expect(indexRecordsCount).toBe(5);
|
|
266
|
-
expect(foundAccessRules).toEqual([
|
|
267
|
-
johnTargetAccessRule,
|
|
268
|
-
globalTargetAccessRule,
|
|
269
|
-
]);
|
|
270
|
-
});
|
|
271
|
-
test("finds rules by greedy ip match", async () => {
|
|
272
|
-
const johnId = getUniqueString();
|
|
273
|
-
const johnIpMask_0_100_AccessRule = {
|
|
274
|
-
clientId: johnId,
|
|
275
|
-
type: AccessPolicyType.Block,
|
|
276
|
-
numericIpMaskMin: BigInt(0),
|
|
277
|
-
numericIpMaskMax: BigInt(100),
|
|
278
|
-
};
|
|
279
|
-
const johnIp_100_AccessRule = {
|
|
280
|
-
clientId: johnId,
|
|
281
|
-
type: AccessPolicyType.Block,
|
|
282
|
-
numericIp: BigInt(100),
|
|
283
|
-
};
|
|
284
|
-
const globalIpMask_100_200_AccessRule = {
|
|
285
|
-
type: AccessPolicyType.Block,
|
|
286
|
-
numericIpMaskMin: BigInt(100),
|
|
287
|
-
numericIpMaskMax: BigInt(200),
|
|
288
|
-
};
|
|
289
|
-
const doeIpMask_200_300AccessRule = {
|
|
290
|
-
clientId: getUniqueString(),
|
|
291
|
-
type: AccessPolicyType.Block,
|
|
292
|
-
numericIpMaskMin: BigInt(200),
|
|
293
|
-
numericIpMaskMax: BigInt(300),
|
|
294
|
-
};
|
|
295
|
-
await insertRule(johnIpMask_0_100_AccessRule);
|
|
296
|
-
await insertRule(johnIp_100_AccessRule);
|
|
297
|
-
await insertRule(globalIpMask_100_200_AccessRule);
|
|
298
|
-
await insertRule(doeIpMask_200_300AccessRule);
|
|
299
|
-
const ip_0_accessRules = await accessRulesReader.findRules({
|
|
300
|
-
policyScope: {
|
|
301
|
-
clientId: johnId,
|
|
302
|
-
},
|
|
303
|
-
userScope: {
|
|
304
|
-
numericIp: BigInt(0),
|
|
305
|
-
},
|
|
306
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
307
|
-
});
|
|
308
|
-
const ip_99_accessRules = await accessRulesReader.findRules({
|
|
309
|
-
policyScope: {
|
|
310
|
-
clientId: johnId,
|
|
311
|
-
},
|
|
312
|
-
userScope: {
|
|
313
|
-
numericIp: BigInt(99),
|
|
314
|
-
},
|
|
315
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
316
|
-
});
|
|
317
|
-
const ip_100_accessRules = await accessRulesReader.findRules({
|
|
318
|
-
policyScope: {
|
|
319
|
-
clientId: johnId,
|
|
320
|
-
},
|
|
321
|
-
userScope: {
|
|
322
|
-
numericIp: BigInt(100),
|
|
323
|
-
},
|
|
324
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
325
|
-
});
|
|
326
|
-
const ip_101_accessRules = await accessRulesReader.findRules({
|
|
327
|
-
policyScope: {
|
|
328
|
-
clientId: johnId,
|
|
329
|
-
},
|
|
330
|
-
userScope: {
|
|
331
|
-
numericIp: BigInt(101),
|
|
332
|
-
},
|
|
333
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
334
|
-
});
|
|
335
|
-
const ip_201_accessRules = await accessRulesReader.findRules({
|
|
336
|
-
policyScope: {
|
|
337
|
-
clientId: johnId,
|
|
338
|
-
},
|
|
339
|
-
userScope: {
|
|
340
|
-
numericIp: BigInt(201),
|
|
341
|
-
},
|
|
342
|
-
userScopeMatch: ScopeMatch.Greedy,
|
|
343
|
-
});
|
|
344
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
345
|
-
expect(indexRecordsCount).toBe(4);
|
|
346
|
-
expect(ip_0_accessRules).toEqual([johnIpMask_0_100_AccessRule]);
|
|
347
|
-
expect(ip_99_accessRules).toEqual([johnIpMask_0_100_AccessRule]);
|
|
348
|
-
expect(ip_100_accessRules).toEqual([
|
|
349
|
-
johnIpMask_0_100_AccessRule,
|
|
350
|
-
johnIp_100_AccessRule,
|
|
351
|
-
globalIpMask_100_200_AccessRule,
|
|
352
|
-
]);
|
|
353
|
-
expect(ip_101_accessRules).toEqual([globalIpMask_100_200_AccessRule]);
|
|
354
|
-
expect(ip_201_accessRules).toEqual([]);
|
|
355
|
-
});
|
|
356
|
-
test("finds rules by exact ip match", async () => {
|
|
357
|
-
const johnId = getUniqueString();
|
|
358
|
-
const johnIpMask_0_100_AccessRule = {
|
|
359
|
-
clientId: johnId,
|
|
360
|
-
type: AccessPolicyType.Block,
|
|
361
|
-
numericIpMaskMin: BigInt(0),
|
|
362
|
-
numericIpMaskMax: BigInt(100),
|
|
363
|
-
};
|
|
364
|
-
const johnIp_100_AccessRule = {
|
|
365
|
-
clientId: johnId,
|
|
366
|
-
type: AccessPolicyType.Block,
|
|
367
|
-
numericIp: BigInt(100),
|
|
368
|
-
};
|
|
369
|
-
const globalIpMask_100_200_AccessRule = {
|
|
370
|
-
type: AccessPolicyType.Block,
|
|
371
|
-
numericIpMaskMin: BigInt(100),
|
|
372
|
-
numericIpMaskMax: BigInt(200),
|
|
373
|
-
};
|
|
374
|
-
const globalIp_100_AccessRule = {
|
|
375
|
-
type: AccessPolicyType.Block,
|
|
376
|
-
numericIp: BigInt(100),
|
|
377
|
-
};
|
|
378
|
-
await insertRule(johnIpMask_0_100_AccessRule);
|
|
379
|
-
await insertRule(johnIp_100_AccessRule);
|
|
380
|
-
await insertRule(globalIpMask_100_200_AccessRule);
|
|
381
|
-
await insertRule(globalIp_100_AccessRule);
|
|
382
|
-
const ip_0_accessRules = await accessRulesReader.findRules({
|
|
383
|
-
policyScope: {
|
|
384
|
-
clientId: johnId,
|
|
385
|
-
},
|
|
386
|
-
userScope: {
|
|
387
|
-
numericIp: BigInt(0),
|
|
388
|
-
},
|
|
389
|
-
userScopeMatch: ScopeMatch.Exact,
|
|
390
|
-
});
|
|
391
|
-
const ip_100_accessRules = await accessRulesReader.findRules({
|
|
392
|
-
policyScope: {
|
|
393
|
-
clientId: johnId,
|
|
394
|
-
},
|
|
395
|
-
userScope: {
|
|
396
|
-
numericIp: BigInt(100),
|
|
397
|
-
},
|
|
398
|
-
userScopeMatch: ScopeMatch.Exact,
|
|
399
|
-
});
|
|
400
|
-
const indexRecordsCount = await getIndexRecordsCount();
|
|
401
|
-
expect(indexRecordsCount).toBe(4);
|
|
402
|
-
expect(ip_0_accessRules).toEqual([]);
|
|
403
|
-
expect(ip_100_accessRules).toEqual([
|
|
404
|
-
johnIp_100_AccessRule,
|
|
405
|
-
globalIp_100_AccessRule,
|
|
406
|
-
]);
|
|
407
|
-
});
|
|
408
|
-
});
|
|
409
|
-
afterAll(async () => {
|
|
410
|
-
await redisClient.flushAll();
|
|
411
|
-
});
|
|
412
|
-
});
|
|
413
|
-
//# sourceMappingURL=redisAccessRules.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRules.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisAccessRules.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisIndex.test.d.ts","sourceRoot":"","sources":["../../../src/tests/redis/redisIndex.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,84 +0,0 @@
|
|
|
1
|
-
import { SCHEMA_FIELD_TYPE } from "@redis/search";
|
|
2
|
-
import { afterAll, beforeAll, beforeEach, describe, expect, test, } from "vitest";
|
|
3
|
-
import { createRedisIndex } from "#policy/redis/redisIndex.js";
|
|
4
|
-
import { createTestRedisClient } from "#policy/tests/redis/testRedisClient.js";
|
|
5
|
-
describe("redisIndex", () => {
|
|
6
|
-
let redisClient;
|
|
7
|
-
beforeAll(async () => {
|
|
8
|
-
redisClient = await createTestRedisClient();
|
|
9
|
-
});
|
|
10
|
-
beforeEach(async () => {
|
|
11
|
-
await redisClient.flushAll();
|
|
12
|
-
});
|
|
13
|
-
test("creates new index", async () => {
|
|
14
|
-
const redisIndex = {
|
|
15
|
-
name: "index:first",
|
|
16
|
-
schema: {
|
|
17
|
-
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
18
|
-
},
|
|
19
|
-
options: {},
|
|
20
|
-
};
|
|
21
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
22
|
-
const indexNames = await redisClient.ft._LIST();
|
|
23
|
-
expect(indexNames).toContain(redisIndex.name);
|
|
24
|
-
});
|
|
25
|
-
test("does not re-create existing index when no changes declared", async () => {
|
|
26
|
-
const redisIndex = {
|
|
27
|
-
name: "index:first",
|
|
28
|
-
schema: {
|
|
29
|
-
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
30
|
-
},
|
|
31
|
-
options: {},
|
|
32
|
-
};
|
|
33
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
34
|
-
await redisClient.ft.alter(redisIndex.name, {
|
|
35
|
-
anotherField: SCHEMA_FIELD_TYPE.TAG,
|
|
36
|
-
});
|
|
37
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
38
|
-
const indexNames = await redisClient.ft._LIST();
|
|
39
|
-
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
40
|
-
expect(indexNames).toContain(redisIndex.name);
|
|
41
|
-
expect(actualIndexInfo.attributes.length).toBe(2);
|
|
42
|
-
});
|
|
43
|
-
test("re-creates existing index when schema changes made", async () => {
|
|
44
|
-
const redisIndex = {
|
|
45
|
-
name: "index:first",
|
|
46
|
-
schema: {
|
|
47
|
-
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
48
|
-
},
|
|
49
|
-
options: {},
|
|
50
|
-
};
|
|
51
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
52
|
-
redisIndex.schema = {
|
|
53
|
-
...redisIndex.schema,
|
|
54
|
-
newField: SCHEMA_FIELD_TYPE.TAG,
|
|
55
|
-
};
|
|
56
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
57
|
-
const indexNames = await redisClient.ft._LIST();
|
|
58
|
-
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
59
|
-
expect(indexNames).toContain(redisIndex.name);
|
|
60
|
-
expect(actualIndexInfo.attributes.length).toBe(2);
|
|
61
|
-
});
|
|
62
|
-
test("re-creates existing index when option changes made", async () => {
|
|
63
|
-
const redisIndex = {
|
|
64
|
-
name: "index:first",
|
|
65
|
-
schema: {
|
|
66
|
-
tagField: SCHEMA_FIELD_TYPE.TAG,
|
|
67
|
-
},
|
|
68
|
-
options: {},
|
|
69
|
-
};
|
|
70
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
71
|
-
redisIndex.options = {
|
|
72
|
-
ON: "HASH",
|
|
73
|
-
};
|
|
74
|
-
await createRedisIndex(redisClient, redisIndex);
|
|
75
|
-
const indexNames = await redisClient.ft._LIST();
|
|
76
|
-
const actualIndexInfo = await redisClient.ft.info(redisIndex.name);
|
|
77
|
-
expect(indexNames).toContain(redisIndex.name);
|
|
78
|
-
expect(actualIndexInfo.index_definition.key_type).toBe("HASH");
|
|
79
|
-
});
|
|
80
|
-
afterAll(async () => {
|
|
81
|
-
await redisClient.flushAll();
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
//# sourceMappingURL=redisIndex.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redisIndex.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisIndex.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EACN,QAAQ,EACR,SAAS,EACT,UAAU,EACV,QAAQ,EACR,MAAM,EACN,IAAI,GACJ,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAmB,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC3B,IAAI,WAA4B,CAAC;IAEjC,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QACrB,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;QAEpC,MAAM,UAAU,GAAe;YAC9B,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACP,QAAQ,EAAE,iBAAiB,CAAC,GAAG;aAC/B;YACD,OAAO,EAAE,EAAE;SACX,CAAC;QAGF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAGhD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAEhD,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAE7E,MAAM,UAAU,GAAe;YAC9B,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACP,QAAQ,EAAE,iBAAiB,CAAC,GAAG;aAC/B;YACD,OAAO,EAAE,EAAE;SACX,CAAC;QAGF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAEhD,MAAM,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;YAC3C,YAAY,EAAE,iBAAiB,CAAC,GAAG;SACnC,CAAC,CAAC;QAGH,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAGhD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEnE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAG9C,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAErE,MAAM,UAAU,GAAe;YAC9B,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACP,QAAQ,EAAE,iBAAiB,CAAC,GAAG;aAC/B;YACD,OAAO,EAAE,EAAE;SACX,CAAC;QAGF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAEhD,UAAU,CAAC,MAAM,GAAG;YACnB,GAAG,UAAU,CAAC,MAAM;YACpB,QAAQ,EAAE,iBAAiB,CAAC,GAAG;SAC/B,CAAC;QAEF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAGhD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEnE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE9C,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAErE,MAAM,UAAU,GAAe;YAC9B,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACP,QAAQ,EAAE,iBAAiB,CAAC,GAAG;aAC/B;YACD,OAAO,EAAE,EAAE;SACX,CAAC;QAGF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAEhD,UAAU,CAAC,OAAO,GAAG;YACpB,EAAE,EAAE,MAAe;SACnB,CAAC;QAEF,MAAM,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAGhD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEnE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,eAAe,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|