@prosopo/user-access-policy 3.2.0 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/accessPolicy.d.ts.map +1 -1
- package/dist/accessPolicy.js +2 -1
- package/dist/accessPolicy.js.map +1 -1
- package/dist/accessRules.d.ts +1 -1
- package/dist/accessRules.d.ts.map +1 -1
- package/dist/api/insertRulesEndpoint.js +1 -1
- package/dist/api/insertRulesEndpoint.js.map +1 -1
- package/dist/cjs/accessPolicy.cjs +4 -3
- package/dist/cjs/api/insertRulesEndpoint.cjs +1 -1
- package/dist/cjs/redis/redisAccessRules.cjs +21 -15
- package/dist/cjs/redis/redisAccessRulesIndex.cjs +7 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/redis/redisAccessRules.d.ts.map +1 -1
- package/dist/redis/redisAccessRules.js +19 -12
- package/dist/redis/redisAccessRules.js.map +1 -1
- package/dist/redis/redisAccessRulesIndex.d.ts +1 -0
- package/dist/redis/redisAccessRulesIndex.d.ts.map +1 -1
- package/dist/redis/redisAccessRulesIndex.js +5 -2
- package/dist/redis/redisAccessRulesIndex.js.map +1 -1
- package/dist/tests/redis/redisAccessRules.test.js +14 -1
- package/dist/tests/redis/redisAccessRules.test.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessPolicy.d.ts","sourceRoot":"","sources":["../src/accessPolicy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accessPolicy.d.ts","sourceRoot":"","sources":["../src/accessPolicy.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,KAAK,WAAW,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAG1C,oBAAY,gBAAgB;IAC3B,KAAK,UAAU;IACf,QAAQ,aAAa;CACrB;AAED,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAC;IAC5C,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACxC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACxC,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IACpD,cAAc,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC9C,aAAa,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,mBAAmB,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACxD,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;CACpD,CAcC,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;EAG5B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;EAS1B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoC9B,CAAC;AAEJ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC/D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC7D,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AACzD,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACrE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;UApF9B,WAAW,CAAC,MAAM,CAAC;iBACZ,WAAW,CAAC,aAAa,CAAC;iBAC1B,WAAW,CAAC,aAAa,CAAC;uBACpB,WAAW,CAAC,mBAAmB,CAAC;oBACnC,WAAW,CAAC,gBAAgB,CAAC;mBAC9B,WAAW,CAAC,eAAe,CAAC;yBACtB,WAAW,CAAC,qBAAqB,CAAC;uBACpC,WAAW,CAAC,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwFjD,CAAC;AACJ,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
|
package/dist/accessPolicy.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CaptchaTypeSchema } from "@prosopo/types";
|
|
2
|
+
import { getIPAddress } from "@prosopo/util";
|
|
2
3
|
import { Address4 } from "ip-address";
|
|
3
4
|
import { z } from "zod";
|
|
4
5
|
import { hashUserAgent } from "#policy/util.js";
|
|
@@ -39,7 +40,7 @@ export const userScopeInputSchema = userScopeSchema
|
|
|
39
40
|
.transform((inputUserScope) => {
|
|
40
41
|
const { ip, ipMask, userAgent, ...userScope } = inputUserScope;
|
|
41
42
|
if ("string" === typeof ip) {
|
|
42
|
-
userScope.numericIp =
|
|
43
|
+
userScope.numericIp = getIPAddress(ip).bigInt();
|
|
43
44
|
}
|
|
44
45
|
if ("string" === typeof ipMask) {
|
|
45
46
|
const ipObject = new Address4(ipMask);
|
package/dist/accessPolicy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessPolicy.js","sourceRoot":"","sources":["../src/accessPolicy.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAoB,CAAC,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC3B,mCAAe,CAAA;IACf,yCAAqB,CAAA;AACtB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,CAAC,MAAM,kBAAkB,GAS1B,CAAC,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;IACpC,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACzC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEzC,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE/C,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE5C,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE3C,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEjD,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAEvC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9C,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9C,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzC,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,eAAe;KACjD,MAAM,CAAC;IAGP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE7B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC;KACD,SAAS,CAAC,CAAC,cAAc,EAAE,EAAE;IAE7B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,cAAc,CAAC;IAE/D,IAAI,QAAQ,KAAK,OAAO,EAAE,EAAE,CAAC;QAC5B,SAAS,CAAC,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"accessPolicy.js","sourceRoot":"","sources":["../src/accessPolicy.ts"],"names":[],"mappings":"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"}
|
package/dist/accessRules.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { PolicyFilter } from "#policy/accessPolicyResolver.js";
|
|
|
4
4
|
export declare const accessRuleSchema: z.ZodObject<typeof accessPolicySchema.shape & typeof policyScopeSchema.shape & typeof userScopeSchema.shape>;
|
|
5
5
|
export type AccessRule = z.infer<typeof accessRuleSchema>;
|
|
6
6
|
export type AccessRulesReader = {
|
|
7
|
-
findRules(filter: PolicyFilter): Promise<AccessRule[]>;
|
|
7
|
+
findRules(filter: PolicyFilter, skipEmptyUserScopes?: boolean): Promise<AccessRule[]>;
|
|
8
8
|
findRuleIds(filter: PolicyFilter): Promise<string[]>;
|
|
9
9
|
};
|
|
10
10
|
export type AccessRulesWriter = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessRules.d.ts","sourceRoot":"","sources":["../src/accessRules.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACN,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,SAAS,CACzC,OAAO,kBAAkB,CAAC,KAAK,GAC9B,OAAO,iBAAiB,CAAC,KAAK,GAC9B,OAAO,eAAe,CAAC,KAAK,CAM5B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,MAAM,MAAM,iBAAiB,GAAG;IAC/B,SAAS,
|
|
1
|
+
{"version":3,"file":"accessRules.d.ts","sourceRoot":"","sources":["../src/accessRules.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACN,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,SAAS,CACzC,OAAO,kBAAkB,CAAC,KAAK,GAC9B,OAAO,iBAAiB,CAAC,KAAK,GAC9B,OAAO,eAAe,CAAC,KAAK,CAM5B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,MAAM,MAAM,iBAAiB,GAAG;IAC/B,SAAS,CACR,MAAM,EAAE,YAAY,EACpB,mBAAmB,CAAC,EAAE,OAAO,GAC3B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEzB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,UAAU,CACT,IAAI,EAAE,UAAU,EAChB,0BAA0B,CAAC,EAAE,MAAM,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,iBAAiB,CAAC"}
|
|
@@ -6,7 +6,7 @@ export const insertRulesEndpointSchema = z.object({
|
|
|
6
6
|
accessPolicy: accessPolicySchema,
|
|
7
7
|
policyScope: policyScopeSchema.optional(),
|
|
8
8
|
userScopes: z.array(userScopeInputSchema),
|
|
9
|
-
|
|
9
|
+
expirationTimestamp: z
|
|
10
10
|
.number()
|
|
11
11
|
.optional()
|
|
12
12
|
.transform((val) => (val !== undefined ? Math.floor(val) : val)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertRulesEndpoint.js","sourceRoot":"","sources":["../../src/api/insertRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACN,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,GACpB,MAAM,yBAAyB,CAAC;AAGjC,MAAM,CAAC,MAAM,yBAAyB,GAKjC,CAAC,CAAC,MAAM,CAAC;IACb,YAAY,EAAE,kBAAkB;IAChC,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACzC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC;IACzC,
|
|
1
|
+
{"version":3,"file":"insertRulesEndpoint.js","sourceRoot":"","sources":["../../src/api/insertRulesEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const types = require("@prosopo/types");
|
|
4
|
+
const util = require("@prosopo/util");
|
|
4
5
|
const ipAddress = require("ip-address");
|
|
5
6
|
const zod = require("zod");
|
|
6
|
-
const util = require("./util.cjs");
|
|
7
|
+
const util$1 = require("./util.cjs");
|
|
7
8
|
var AccessPolicyType = /* @__PURE__ */ ((AccessPolicyType2) => {
|
|
8
9
|
AccessPolicyType2["Block"] = "block";
|
|
9
10
|
AccessPolicyType2["Restrict"] = "restrict";
|
|
@@ -49,7 +50,7 @@ const userScopeInputSchema = userScopeSchema.extend({
|
|
|
49
50
|
}).transform((inputUserScope) => {
|
|
50
51
|
const { ip, ipMask, userAgent, ...userScope } = inputUserScope;
|
|
51
52
|
if ("string" === typeof ip) {
|
|
52
|
-
userScope.numericIp =
|
|
53
|
+
userScope.numericIp = util.getIPAddress(ip).bigInt();
|
|
53
54
|
}
|
|
54
55
|
if ("string" === typeof ipMask) {
|
|
55
56
|
const ipObject = new ipAddress.Address4(ipMask);
|
|
@@ -57,7 +58,7 @@ const userScopeInputSchema = userScopeSchema.extend({
|
|
|
57
58
|
userScope.numericIpMaskMax = ipObject.endAddress().bigInt();
|
|
58
59
|
}
|
|
59
60
|
if ("string" === typeof userAgent) {
|
|
60
|
-
userScope.userAgentHash = util.hashUserAgent(userAgent);
|
|
61
|
+
userScope.userAgentHash = util$1.hashUserAgent(userAgent);
|
|
61
62
|
}
|
|
62
63
|
return userScope;
|
|
63
64
|
});
|
|
@@ -8,7 +8,7 @@ const insertRulesEndpointSchema = zod.z.object({
|
|
|
8
8
|
accessPolicy: accessPolicy.accessPolicySchema,
|
|
9
9
|
policyScope: accessPolicy.policyScopeSchema.optional(),
|
|
10
10
|
userScopes: zod.z.array(accessPolicy.userScopeInputSchema),
|
|
11
|
-
|
|
11
|
+
expirationTimestamp: zod.z.number().optional().transform((val) => val !== void 0 ? Math.floor(val) : val)
|
|
12
12
|
});
|
|
13
13
|
class InsertRulesEndpoint {
|
|
14
14
|
constructor(accessRulesWriter) {
|
|
@@ -22,8 +22,11 @@ function _interopNamespaceDefault(e) {
|
|
|
22
22
|
const util__namespace = /* @__PURE__ */ _interopNamespaceDefault(util);
|
|
23
23
|
const createRedisAccessRulesReader = (client, logger) => {
|
|
24
24
|
return {
|
|
25
|
-
findRules: async (filter) => {
|
|
25
|
+
findRules: async (filter, skipEmptyUserScopes = true) => {
|
|
26
26
|
const query = redisAccessRulesIndex.getRedisAccessRulesQuery(filter);
|
|
27
|
+
if (skipEmptyUserScopes && query === "ismissing(@clientId)") {
|
|
28
|
+
return [];
|
|
29
|
+
}
|
|
27
30
|
let searchReply;
|
|
28
31
|
try {
|
|
29
32
|
searchReply = await client.ft.search(
|
|
@@ -31,19 +34,21 @@ const createRedisAccessRulesReader = (client, logger) => {
|
|
|
31
34
|
query,
|
|
32
35
|
redisAccessRulesIndex.accessRulesRedisSearchOptions
|
|
33
36
|
);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
37
|
+
if (searchReply.total > 0) {
|
|
38
|
+
logger.debug(() => ({
|
|
39
|
+
msg: "Executed search query",
|
|
40
|
+
data: {
|
|
41
|
+
inspect: util__namespace.inspect(
|
|
42
|
+
{
|
|
43
|
+
filter,
|
|
44
|
+
searchReply,
|
|
45
|
+
query
|
|
46
|
+
},
|
|
47
|
+
{ depth: null }
|
|
48
|
+
)
|
|
49
|
+
}
|
|
50
|
+
}));
|
|
51
|
+
}
|
|
47
52
|
} catch (e) {
|
|
48
53
|
logger.error(() => ({
|
|
49
54
|
err: e,
|
|
@@ -115,7 +120,8 @@ const createRedisAccessRulesWriter = (client) => {
|
|
|
115
120
|
deleteRules: async (ruleIds) => void await client.del(ruleIds),
|
|
116
121
|
deleteAllRules: async () => {
|
|
117
122
|
const keys = await client.keys(`${redisAccessRulesIndex.accessRuleRedisKeyPrefix}*`);
|
|
118
|
-
|
|
123
|
+
if (keys.length === 0) return 0;
|
|
124
|
+
return await client.del(keys);
|
|
119
125
|
}
|
|
120
126
|
};
|
|
121
127
|
};
|
|
@@ -7,7 +7,7 @@ const redisIndex = require("./redisIndex.cjs");
|
|
|
7
7
|
const accessRulesRedisIndexName = "index:user-access-rules";
|
|
8
8
|
const accessRuleRedisKeyPrefix = "uar:";
|
|
9
9
|
const accessRuleContentHashAlgorithm = "md5";
|
|
10
|
-
const DEFAULT_SEARCH_LIMIT =
|
|
10
|
+
const DEFAULT_SEARCH_LIMIT = 1e3;
|
|
11
11
|
const accessRulesIndex = {
|
|
12
12
|
name: accessRulesRedisIndexName,
|
|
13
13
|
/**
|
|
@@ -35,7 +35,7 @@ const accessRulesIndex = {
|
|
|
35
35
|
// the satisfy statement is to guarantee that the keys are right
|
|
36
36
|
options: {
|
|
37
37
|
ON: "HASH",
|
|
38
|
-
PREFIX: accessRuleRedisKeyPrefix
|
|
38
|
+
PREFIX: [accessRuleRedisKeyPrefix]
|
|
39
39
|
}
|
|
40
40
|
};
|
|
41
41
|
const createRedisAccessRulesIndex = async (client) => redisIndex.createRedisIndex(client, accessRulesIndex);
|
|
@@ -48,6 +48,10 @@ const greedyFieldComparisons = {
|
|
|
48
48
|
numericIp: (value) => `( @numericIp:[${value}] | ( @numericIpMaskMin:[-inf ${value}] @numericIpMaskMax:[${value} +inf] ) )`
|
|
49
49
|
};
|
|
50
50
|
const accessRulesRedisSearchOptions = {
|
|
51
|
+
// #2 is a required option when the 'ismissing()' function is in the query body
|
|
52
|
+
DIALECT: 2
|
|
53
|
+
};
|
|
54
|
+
const accessRulesRedisDeleteOptions = {
|
|
51
55
|
// #2 is a required option when the 'ismissing()' function is in the query body
|
|
52
56
|
DIALECT: 2,
|
|
53
57
|
LIMIT: {
|
|
@@ -100,6 +104,7 @@ const getRedisAccessRuleValue = (rule) => Object.fromEntries(
|
|
|
100
104
|
Object.entries(rule).map(([key, value]) => [key, String(value)])
|
|
101
105
|
);
|
|
102
106
|
exports.accessRuleRedisKeyPrefix = accessRuleRedisKeyPrefix;
|
|
107
|
+
exports.accessRulesRedisDeleteOptions = accessRulesRedisDeleteOptions;
|
|
103
108
|
exports.accessRulesRedisIndexName = accessRulesRedisIndexName;
|
|
104
109
|
exports.accessRulesRedisSearchOptions = accessRulesRedisSearchOptions;
|
|
105
110
|
exports.createRedisAccessRulesIndex = createRedisAccessRulesIndex;
|
package/dist/index.d.ts
CHANGED
|
@@ -4,12 +4,12 @@ import { type ResolveAccessPolicy, createAccessPolicyResolver } from "#policy/ac
|
|
|
4
4
|
import { type PolicyFilter, ScopeMatch } from "#policy/accessPolicyResolver.js";
|
|
5
5
|
import type { AccessRule, AccessRulesStorage } from "#policy/accessRules.js";
|
|
6
6
|
import { accessRuleApiPaths, getExpressApiRuleRateLimits } from "#policy/api/accessRuleApiRoutes.js";
|
|
7
|
-
import { deleteAllRulesEndpointSchema } from "#policy/api/deleteAllRulesEndpoint.js";
|
|
7
|
+
import { type DeleteAllRulesEndpointSchema, deleteAllRulesEndpointSchema } from "#policy/api/deleteAllRulesEndpoint.js";
|
|
8
8
|
import { type DeleteRulesEndpointSchemaInput, type DeleteRulesEndpointSchemaOutput, deleteRulesEndpointSchema } from "#policy/api/deleteRulesEndpoint.js";
|
|
9
9
|
import { type InsertManyRulesEndpointInputSchema, type InsertManyRulesEndpointOutputSchema, insertRulesEndpointSchema } from "#policy/api/insertRulesEndpoint.js";
|
|
10
10
|
import { createRedisAccessRulesStorage } from "#policy/redis/redisAccessRules.js";
|
|
11
11
|
import { createRedisAccessRulesIndex } from "#policy/redis/redisAccessRulesIndex.js";
|
|
12
12
|
import { userScopeInputSchema } from "./accessPolicy.js";
|
|
13
13
|
export declare const createApiRuleRoutesProvider: (rulesStorage: AccessRulesStorage) => ApiRoutesProvider;
|
|
14
|
-
export { type AccessPolicy, type PolicyScope, type AccessRulesStorage, type ResolveAccessPolicy, type PolicyFilter, type DeleteRulesEndpointSchemaOutput, type DeleteRulesEndpointSchemaInput, type InsertManyRulesEndpointInputSchema, type InsertManyRulesEndpointOutputSchema, type AccessRule, type UserScope, type UserScopeApiInput, type UserScopeApiOutput, type AccessRuleExtended, createAccessPolicyResolver, AccessPolicyType, ScopeMatch, createRedisAccessRulesIndex, createRedisAccessRulesStorage, accessRuleApiPaths, accessPolicySchema, policyScopeSchema, insertRulesEndpointSchema, deleteAllRulesEndpointSchema, deleteRulesEndpointSchema, getExpressApiRuleRateLimits, userScopeInputSchema, };
|
|
14
|
+
export { type AccessPolicy, type PolicyScope, type AccessRulesStorage, type ResolveAccessPolicy, type PolicyFilter, type DeleteRulesEndpointSchemaOutput, type DeleteRulesEndpointSchemaInput, type DeleteAllRulesEndpointSchema, type InsertManyRulesEndpointInputSchema, type InsertManyRulesEndpointOutputSchema, type AccessRule, type UserScope, type UserScopeApiInput, type UserScopeApiOutput, type AccessRuleExtended, createAccessPolicyResolver, AccessPolicyType, ScopeMatch, createRedisAccessRulesIndex, createRedisAccessRulesStorage, accessRuleApiPaths, accessPolicySchema, policyScopeSchema, insertRulesEndpointSchema, deleteAllRulesEndpointSchema, deleteRulesEndpointSchema, getExpressApiRuleRateLimits, userScopeInputSchema, };
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACN,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,KAAK,mBAAmB,EACxB,0BAA0B,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAEN,kBAAkB,EAClB,2BAA2B,EAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACN,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,KAAK,mBAAmB,EACxB,0BAA0B,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAEN,kBAAkB,EAClB,2BAA2B,EAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACN,KAAK,4BAA4B,EACjC,4BAA4B,EAC5B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACN,KAAK,8BAA8B,EACnC,KAAK,+BAA+B,EACpC,yBAAyB,EACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACN,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EACxC,yBAAyB,EACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,eAAO,MAAM,2BAA2B,iBACzB,kBAAkB,KAC9B,iBAEF,CAAC;AAEF,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,KAAK,+BAA+B,EACpC,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EACxC,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,0BAA0B,EAC1B,gBAAgB,EAChB,UAAU,EAEV,2BAA2B,EAC3B,6BAA6B,EAE7B,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,GACpB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import { AccessPolicyType, accessPolicySchema, policyScopeSchema, } from "#polic
|
|
|
2
2
|
import { createAccessPolicyResolver, } from "#policy/accessPolicyResolver.js";
|
|
3
3
|
import { ScopeMatch } from "#policy/accessPolicyResolver.js";
|
|
4
4
|
import { AccessRuleApiRoutes, accessRuleApiPaths, getExpressApiRuleRateLimits, } from "#policy/api/accessRuleApiRoutes.js";
|
|
5
|
-
import { deleteAllRulesEndpointSchema } from "#policy/api/deleteAllRulesEndpoint.js";
|
|
5
|
+
import { deleteAllRulesEndpointSchema, } from "#policy/api/deleteAllRulesEndpoint.js";
|
|
6
6
|
import { deleteRulesEndpointSchema, } from "#policy/api/deleteRulesEndpoint.js";
|
|
7
7
|
import { insertRulesEndpointSchema, } from "#policy/api/insertRulesEndpoint.js";
|
|
8
8
|
import { createRedisAccessRulesStorage } from "#policy/redis/redisAccessRules.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAEN,gBAAgB,EAMhB,kBAAkB,EAClB,iBAAiB,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEN,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAqB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAClB,2BAA2B,GAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAEN,gBAAgB,EAMhB,kBAAkB,EAClB,iBAAiB,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEN,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAqB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAClB,2BAA2B,GAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAEN,4BAA4B,GAC5B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAGN,yBAAyB,GACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAGN,yBAAyB,GACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,YAAgC,EACZ,EAAE;IACtB,OAAO,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,OAAO,EAgBN,0BAA0B,EAC1B,gBAAgB,EAChB,UAAU,EAEV,2BAA2B,EAC3B,6BAA6B,EAE7B,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,GACpB,CAAC"}
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -3,21 +3,26 @@ import { accessRuleSchema, } from "#policy/accessRules.js";
|
|
|
3
3
|
import { accessRuleRedisKeyPrefix, accessRulesRedisIndexName, accessRulesRedisSearchOptions, getRedisAccessRuleKey, getRedisAccessRuleValue, getRedisAccessRulesQuery, } from "#policy/redis/redisAccessRulesIndex.js";
|
|
4
4
|
export const createRedisAccessRulesReader = (client, logger) => {
|
|
5
5
|
return {
|
|
6
|
-
findRules: async (filter) => {
|
|
6
|
+
findRules: async (filter, skipEmptyUserScopes = true) => {
|
|
7
7
|
const query = getRedisAccessRulesQuery(filter);
|
|
8
|
+
if (skipEmptyUserScopes && query === "ismissing(@clientId)") {
|
|
9
|
+
return [];
|
|
10
|
+
}
|
|
8
11
|
let searchReply;
|
|
9
12
|
try {
|
|
10
13
|
searchReply = await client.ft.search(accessRulesRedisIndexName, query, accessRulesRedisSearchOptions);
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
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
|
+
}
|
|
21
26
|
}
|
|
22
27
|
catch (e) {
|
|
23
28
|
logger.error(() => ({
|
|
@@ -82,7 +87,9 @@ export const createRedisAccessRulesWriter = (client) => {
|
|
|
82
87
|
deleteRules: async (ruleIds) => void (await client.del(ruleIds)),
|
|
83
88
|
deleteAllRules: async () => {
|
|
84
89
|
const keys = await client.keys(`${accessRuleRedisKeyPrefix}*`);
|
|
85
|
-
|
|
90
|
+
if (keys.length === 0)
|
|
91
|
+
return 0;
|
|
92
|
+
return await client.del(keys);
|
|
86
93
|
},
|
|
87
94
|
};
|
|
88
95
|
};
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"redisAccessRules.js","sourceRoot":"","sources":["../../src/redis/redisAccessRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare const accessRulesRedisIndexName = "index:user-access-rules";
|
|
|
6
6
|
export declare const accessRuleRedisKeyPrefix = "uar:";
|
|
7
7
|
export declare const createRedisAccessRulesIndex: (client: RedisClientType) => Promise<void>;
|
|
8
8
|
export declare const accessRulesRedisSearchOptions: FtSearchOptions;
|
|
9
|
+
export declare const accessRulesRedisDeleteOptions: FtSearchOptions;
|
|
9
10
|
export declare const getRedisAccessRulesQuery: (filter: PolicyFilter) => string;
|
|
10
11
|
export declare const getRedisAccessRuleKey: (rule: AccessRule) => string;
|
|
11
12
|
export declare const getRedisAccessRuleValue: (rule: AccessRule) => Record<string, string>;
|
|
@@ -1 +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;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,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
|
+
{"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"}
|
|
@@ -5,7 +5,7 @@ import { createRedisIndex } from "#policy/redis/redisIndex.js";
|
|
|
5
5
|
export const accessRulesRedisIndexName = "index:user-access-rules";
|
|
6
6
|
export const accessRuleRedisKeyPrefix = "uar:";
|
|
7
7
|
const accessRuleContentHashAlgorithm = "md5";
|
|
8
|
-
const DEFAULT_SEARCH_LIMIT =
|
|
8
|
+
const DEFAULT_SEARCH_LIMIT = 1000;
|
|
9
9
|
const accessRulesIndex = {
|
|
10
10
|
name: accessRulesRedisIndexName,
|
|
11
11
|
schema: {
|
|
@@ -23,7 +23,7 @@ const accessRulesIndex = {
|
|
|
23
23
|
},
|
|
24
24
|
options: {
|
|
25
25
|
ON: "HASH",
|
|
26
|
-
PREFIX: accessRuleRedisKeyPrefix,
|
|
26
|
+
PREFIX: [accessRuleRedisKeyPrefix],
|
|
27
27
|
},
|
|
28
28
|
};
|
|
29
29
|
export const createRedisAccessRulesIndex = async (client) => createRedisIndex(client, accessRulesIndex);
|
|
@@ -37,6 +37,9 @@ const greedyFieldComparisons = {
|
|
|
37
37
|
};
|
|
38
38
|
export const accessRulesRedisSearchOptions = {
|
|
39
39
|
DIALECT: 2,
|
|
40
|
+
};
|
|
41
|
+
export const accessRulesRedisDeleteOptions = {
|
|
42
|
+
DIALECT: 2,
|
|
40
43
|
LIMIT: {
|
|
41
44
|
from: 0,
|
|
42
45
|
size: DEFAULT_SEARCH_LIMIT,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRulesIndex.js","sourceRoot":"","sources":["../../src/redis/redisAccessRulesIndex.ts"],"names":[],"mappings":"AAcA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGxE,OAAO,EAAqB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAmB,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEhF,MAAM,CAAC,MAAM,yBAAyB,GAAG,yBAAyB,CAAC;AAEnE,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAC/C,MAAM,8BAA8B,GAAG,KAAK,CAAC;AAC7C,MAAM,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"redisAccessRulesIndex.js","sourceRoot":"","sources":["../../src/redis/redisAccessRulesIndex.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,6 +95,19 @@ describe("redisAccessRules", () => {
|
|
|
95
95
|
const indexRecordsCount = await getIndexRecordsCount();
|
|
96
96
|
expect(indexRecordsCount).toBe(0);
|
|
97
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
|
+
});
|
|
98
111
|
});
|
|
99
112
|
describe("reader", () => {
|
|
100
113
|
let accessRulesReader;
|
|
@@ -162,7 +175,7 @@ describe("redisAccessRules", () => {
|
|
|
162
175
|
});
|
|
163
176
|
const foundGlobalAccessRules = await accessRulesReader.findRules({
|
|
164
177
|
policyScopeMatch: ScopeMatch.Exact,
|
|
165
|
-
});
|
|
178
|
+
}, false);
|
|
166
179
|
const indexRecordsCount = await getIndexRecordsCount();
|
|
167
180
|
expect(indexRecordsCount).toBe(3);
|
|
168
181
|
expect(foundClientAccessRules).toEqual([johnAccessRule]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisAccessRules.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisAccessRules.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"redisAccessRules.test.js","sourceRoot":"","sources":["../../../src/tests/redis/redisAccessRules.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EACN,QAAQ,EACR,SAAS,EACT,UAAU,EACV,QAAQ,EACR,MAAM,EACN,IAAI,GACJ,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAM7D,OAAO,EACN,4BAA4B,EAC5B,4BAA4B,GAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACN,yBAAyB,EACzB,2BAA2B,EAC3B,qBAAqB,EACrB,uBAAuB,GACvB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IACjC,IAAI,WAA4B,CAAC;IAEjC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,MAAM,oBAAoB,GAAG,KAAK,IAAqB,EAAE,CACxD,CAAC,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEjE,MAAM,UAAU,GAAG,KAAK,EAAE,IAAgB,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAE5C,MAAM,2BAA2B,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QACrB,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvB,IAAI,iBAAoC,CAAC;QAEzC,SAAS,CAAC,GAAG,EAAE;YACd,iBAAiB,GAAG,4BAA4B,CAAC,WAAW,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAE/B,MAAM,UAAU,GAAe;gBAC9B,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,UAAU;aACpB,CAAC;YACF,MAAM,aAAa,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAGxD,MAAM,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAG/C,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACpE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC/C,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YAE5C,MAAM,UAAU,GAAe;gBAC9B,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,UAAU;aACpB,CAAC;YACF,MAAM,aAAa,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAExD,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,CAAC;YACzB,MAAM,mBAAmB,GAAG,IAAI,IAAI,CACnC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,CAC5B,CAAC,OAAO,EAAE,CAAC;YACZ,MAAM,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAC9C,mBAAmB,GAAG,IAAI,CAC1B,CAAC;YAGF,MAAM,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAElD,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACpE,MAAM,wBAAwB,GAAG,MAAM,WAAW,CAAC,QAAQ,CAC1D,OAAO,EACP,4BAA4B,CAC5B,CAAC;YACF,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE3D,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC/C,MAAM,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,mBAAmB,CAAC,CAAC,mBAAmB,CAC9C,4BAA4B,CAC5B,CAAC;YAEF,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;YAEhC,MAAM,cAAc,GAAe;gBAClC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YACF,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;YAEhE,MAAM,aAAa,GAAe;gBACjC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YACF,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;YAE9D,MAAM,UAAU,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;YAGhC,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAGzD,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACtE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACjD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAEpC,MAAM,cAAc,GAAe;gBAClC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YACF,MAAM,aAAa,GAAe;gBACjC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YAEF,MAAM,UAAU,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;YAGhC,MAAM,iBAAiB,CAAC,cAAc,EAAE,CAAC;YAGzC,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAElE,MAAM,UAAU,GAAG,KAAK,CAAC;YACzB,MAAM,WAAW,GAAiB,KAAK,CAAC,IAAI,CAC3C,EAAE,MAAM,EAAE,UAAU,EAAE,EACtB,GAAG,EAAE,CAAC,CAAC;gBACN,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC,CACF,CAAC;YAEF,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAChC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;YAGD,MAAM,iBAAiB,CAAC,cAAc,EAAE,CAAC;YAGzC,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvB,IAAI,iBAAoC,CAAC;QAEzC,SAAS,CAAC,GAAG,EAAE;YACd,iBAAiB,GAAG,4BAA4B,CAC/C,WAAW,EACX,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,wBAAwB,CAAC,CACvD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAE7E,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YACjC,MAAM,cAAc,GAAe;gBAClC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,MAAM;aAChB,CAAC;YACF,MAAM,aAAa,GAAe;gBACjC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YACF,MAAM,gBAAgB,GAAe;gBACpC,IAAI,EAAE,gBAAgB,CAAC,KAAK;aAC5B,CAAC;YAEF,MAAM,UAAU,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;YAChC,MAAM,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAGnC,MAAM,wBAAwB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAClE,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,gBAAgB,EAAE,UAAU,CAAC,MAAM;aACnC,CAAC,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC1D,gBAAgB,EAAE,UAAU,CAAC,MAAM;aACnC,CAAC,CAAC;YAGH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC;gBACxC,cAAc;gBACd,gBAAgB;aAChB,CAAC,CAAC;YACH,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;gBAChC,cAAc;gBACd,aAAa;gBACb,gBAAgB;aAChB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YAE3E,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YAEjC,MAAM,cAAc,GAAe;gBAClC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,MAAM;aAChB,CAAC;YACF,MAAM,aAAa,GAAe;gBACjC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;aAC3B,CAAC;YACF,MAAM,gBAAgB,GAAe;gBACpC,IAAI,EAAE,gBAAgB,CAAC,KAAK;aAC5B,CAAC;YAEF,MAAM,UAAU,CAAC,cAAc,CAAC,CAAC;YACjC,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;YAChC,MAAM,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAGnC,MAAM,sBAAsB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAChE,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,gBAAgB,EAAE,UAAU,CAAC,KAAK;aAClC,CAAC,CAAC;YACH,MAAM,sBAAsB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAC/D;gBACC,gBAAgB,EAAE,UAAU,CAAC,KAAK;aAClC,EACD,KAAK,CACL,CAAC;YAGF,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACzD,MAAM,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YAGzD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YACjC,MAAM,gBAAgB,GAAe;gBACpC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,MAAM;gBAChB,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;aACtB,CAAC;YACF,MAAM,eAAe,GAAe;gBACnC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;aACtB,CAAC;YACF,MAAM,oBAAoB,GAAe;gBACxC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,WAAW,EAAE,QAAQ;aACrB,CAAC;YACF,MAAM,mBAAmB,GAAe;gBACvC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,OAAO,EAAE,SAAS;aAClB,CAAC;YAEF,MAAM,UAAU,CAAC,gBAAgB,CAAC,CAAC;YACnC,MAAM,UAAU,CAAC,eAAe,CAAC,CAAC;YAClC,MAAM,UAAU,CAAC,oBAAoB,CAAC,CAAC;YACvC,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAGtC,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;oBACtB,OAAO,EAAE,SAAS;iBAClB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YAGH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YAGxD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YAEjC,MAAM,oBAAoB,GAAe;gBACxC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,MAAM;gBAChB,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;gBACtB,OAAO,EAAE,SAAS;aAClB,CAAC;YAEF,MAAM,mBAAmB,GAAe;gBACvC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,eAAe,EAAE;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;gBACtB,OAAO,EAAE,SAAS;aAClB,CAAC;YAEF,MAAM,oBAAoB,GAAe;gBACxC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,WAAW,EAAE,QAAQ;aACrB,CAAC;YAEF,MAAM,sBAAsB,GAAe;gBAC1C,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;gBACtB,OAAO,EAAE,SAAS;aAClB,CAAC;YAEF,MAAM,mBAAmB,GAAe;gBACvC,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,OAAO,EAAE,SAAS;aAClB,CAAC;YAEF,MAAM,UAAU,CAAC,oBAAoB,CAAC,CAAC;YACvC,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACtC,MAAM,UAAU,CAAC,oBAAoB,CAAC,CAAC;YACvC,MAAM,UAAU,CAAC,sBAAsB,CAAC,CAAC;YACzC,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAGtC,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;oBACtB,OAAO,EAAE,SAAS;iBAClB;gBACD,cAAc,EAAE,UAAU,CAAC,KAAK;aAChC,CAAC,CAAC;YAGH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;gBAChC,oBAAoB;gBACpB,sBAAsB;aACtB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAEjD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YAEjC,MAAM,2BAA2B,GAAe;gBAC/C,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC3B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;aAC7B,CAAC;YACF,MAAM,qBAAqB,GAAe;gBACzC,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;aACtB,CAAC;YACF,MAAM,+BAA+B,GAAe;gBACnD,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;gBAC7B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;aAC7B,CAAC;YACF,MAAM,2BAA2B,GAAe;gBAC/C,QAAQ,EAAE,eAAe,EAAE;gBAC3B,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;gBAC7B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;aAC7B,CAAC;YAEF,MAAM,UAAU,CAAC,2BAA2B,CAAC,CAAC;YAC9C,MAAM,UAAU,CAAC,qBAAqB,CAAC,CAAC;YACxC,MAAM,UAAU,CAAC,+BAA+B,CAAC,CAAC;YAClD,MAAM,UAAU,CAAC,2BAA2B,CAAC,CAAC;YAG9C,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;iBACpB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YACH,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC3D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;iBACrB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC5D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;iBACtB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC5D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;iBACtB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC5D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;iBACtB;gBACD,cAAc,EAAE,UAAU,CAAC,MAAM;aACjC,CAAC,CAAC;YAGH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAElC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;YAChE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC;gBAClC,2BAA2B;gBAC3B,qBAAqB;gBACrB,+BAA+B;aAC/B,CAAC,CAAC;YACH,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC;YACtE,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAEhD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YAEjC,MAAM,2BAA2B,GAAe;gBAC/C,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC3B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;aAC7B,CAAC;YACF,MAAM,qBAAqB,GAAe;gBACzC,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;aACtB,CAAC;YACF,MAAM,+BAA+B,GAAe;gBACnD,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;gBAC7B,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;aAC7B,CAAC;YACF,MAAM,uBAAuB,GAAe;gBAC3C,IAAI,EAAE,gBAAgB,CAAC,KAAK;gBAC5B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;aACtB,CAAC;YAEF,MAAM,UAAU,CAAC,2BAA2B,CAAC,CAAC;YAC9C,MAAM,UAAU,CAAC,qBAAqB,CAAC,CAAC;YACxC,MAAM,UAAU,CAAC,+BAA+B,CAAC,CAAC;YAClD,MAAM,UAAU,CAAC,uBAAuB,CAAC,CAAC;YAG1C,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;iBACpB;gBACD,cAAc,EAAE,UAAU,CAAC,KAAK;aAChC,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC5D,WAAW,EAAE;oBACZ,QAAQ,EAAE,MAAM;iBAChB;gBACD,SAAS,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC;iBACtB;gBACD,cAAc,EAAE,UAAU,CAAC,KAAK;aAChC,CAAC,CAAC;YAGH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAElC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC;gBAClC,qBAAqB;gBACrB,uBAAuB;aACvB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|