@prosopo/user-access-policy 2.3.2 → 2.4.2
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/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/rules/api/apiRulePaths.d.ts +1 -2
- package/dist/rules/api/apiRulePaths.d.ts.map +1 -1
- package/dist/rules/api/apiRulePaths.js +1 -2
- package/dist/rules/api/apiRulePaths.js.map +1 -1
- package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.d.ts +74 -137
- package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.d.ts.map +1 -1
- package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.js +21 -4
- package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.js.map +1 -1
- package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.d.ts +1 -0
- package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.d.ts.map +1 -1
- package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.js +89 -5
- package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.js.map +1 -1
- package/dist/rules/imageCaptchaConfigRulesResolver.d.ts +3 -1
- package/dist/rules/imageCaptchaConfigRulesResolver.d.ts.map +1 -1
- package/dist/rules/imageCaptchaConfigRulesResolver.js +8 -4
- package/dist/rules/imageCaptchaConfigRulesResolver.js.map +1 -1
- package/dist/rules/mongoose/rulesMongooseStorage.d.ts.map +1 -1
- package/dist/rules/mongoose/rulesMongooseStorage.js +12 -1
- package/dist/rules/mongoose/rulesMongooseStorage.js.map +1 -1
- package/dist/rules/mongoose/schemas/ruleMongooseSchema.d.ts.map +1 -1
- package/dist/rules/mongoose/schemas/ruleMongooseSchema.js +1 -0
- package/dist/rules/mongoose/schemas/ruleMongooseSchema.js.map +1 -1
- package/dist/rules/rule/rule.d.ts +1 -0
- package/dist/rules/rule/rule.d.ts.map +1 -1
- package/dist/tests/benchmark/storageFactory/mongooseRulesStorageFactory.d.ts.map +1 -1
- package/dist/tests/benchmark/storageFactory/mongooseRulesStorageFactory.js +1 -1
- package/dist/tests/benchmark/storageFactory/mongooseRulesStorageFactory.js.map +1 -1
- package/dist/tests/rules/mongoose/find.unit.test.js +1 -1
- package/dist/tests/rules/mongoose/find.unit.test.js.map +1 -1
- package/dist/tests/rules/mongoose/insert/insertIpV6Formatting.unit.test.js +1 -1
- package/dist/tests/rules/mongoose/insert/insertIpV6Formatting.unit.test.js.map +1 -1
- package/dist/tests/rules/mongoose/insert/insertValidation.unit.test.js +1 -1
- package/dist/tests/rules/mongoose/insert/insertValidation.unit.test.js.map +1 -1
- package/dist/tests/rules/mongoose/ip.unit.test.js +9 -21
- package/dist/tests/rules/mongoose/ip.unit.test.js.map +1 -1
- package/package.json +4 -4
- package/vite.cjs.config.ts +1 -1
- package/vite.test.config.ts +21 -2
package/dist/index.d.ts
CHANGED
|
@@ -2,7 +2,9 @@ import type { ApiRoutesProvider } from "@prosopo/api-route";
|
|
|
2
2
|
import type { Logger } from "@prosopo/common";
|
|
3
3
|
import type { Model } from "mongoose";
|
|
4
4
|
import type { BlacklistInspector } from "./blacklistInspector.js";
|
|
5
|
+
import { apiRulePaths } from "./rules/api/apiRulePaths.js";
|
|
5
6
|
import { getExpressApiRuleRateLimits } from "./rules/api/getExpressApiRuleRateLimits.js";
|
|
7
|
+
import type { ApiInsertManyRulesArgsOutputSchema, ApiInsertManyRulesArgsSchema } from "./rules/api/insertMany/apiInsertManyRulesArgsSchema.js";
|
|
6
8
|
import { ImageCaptchaConfigRulesResolver } from "./rules/imageCaptchaConfigRulesResolver.js";
|
|
7
9
|
import { getRuleMongooseSchema } from "./rules/mongoose/schemas/getRuleMongooseSchema.js";
|
|
8
10
|
import type { Rule } from "./rules/rule/rule.js";
|
|
@@ -11,5 +13,5 @@ declare const createBlacklistInspector: (rulesStorage: RulesStorage, logger: Log
|
|
|
11
13
|
declare const createImageCaptchaConfigResolver: (rulesStorage: RulesStorage, logger: Logger) => ImageCaptchaConfigRulesResolver;
|
|
12
14
|
declare const createApiRuleRoutesProvider: (rulesStorage: RulesStorage) => ApiRoutesProvider;
|
|
13
15
|
declare const createMongooseRulesStorage: (logger: Logger, readingModel: Model<Rule> | null, writingModel?: Model<Rule> | null) => RulesStorage;
|
|
14
|
-
export { type Rule, type RulesStorage, type BlacklistInspector, createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, };
|
|
16
|
+
export { type Rule, type RulesStorage, type BlacklistInspector, type ApiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsOutputSchema, createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, apiRulePaths, };
|
|
15
17
|
//# 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,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
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,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACX,kCAAkC,EAClC,4BAA4B,EAC5B,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAE7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,QAAA,MAAM,wBAAwB,iBACf,YAAY,UAClB,MAAM,KACZ,kBAEF,CAAC;AAEF,QAAA,MAAM,gCAAgC,iBACvB,YAAY,UAClB,MAAM,KACZ,+BAEF,CAAC;AAEF,QAAA,MAAM,2BAA2B,iBAClB,YAAY,KACxB,iBAEF,CAAC;AAEF,QAAA,MAAM,0BAA0B,WACvB,MAAM,gBACA,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,iBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAC9B,YAEF,CAAC;AAEF,OAAO,EACN,KAAK,IAAI,EACT,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,EACvC,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { apiRulePaths } from "./rules/api/apiRulePaths.js";
|
|
1
2
|
import { ApiRuleRoutesProvider } from "./rules/api/apiRuleRoutesProvider.js";
|
|
2
3
|
import { getExpressApiRuleRateLimits } from "./rules/api/getExpressApiRuleRateLimits.js";
|
|
3
4
|
import { BlacklistRulesInspector } from "./rules/blacklistRulesInspector.js";
|
|
@@ -16,5 +17,5 @@ const createApiRuleRoutesProvider = (rulesStorage) => {
|
|
|
16
17
|
const createMongooseRulesStorage = (logger, readingModel, writingModel = null) => {
|
|
17
18
|
return new RulesMongooseStorage(logger, readingModel, writingModel);
|
|
18
19
|
};
|
|
19
|
-
export { createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, };
|
|
20
|
+
export { createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, apiRulePaths, };
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAKzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAI1F,MAAM,wBAAwB,GAAG,CAChC,YAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACxC,YAA0B,EAC1B,MAAc,EACoB,EAAE;IACpC,OAAO,IAAI,+BAA+B,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CACnC,YAA0B,EACN,EAAE;IACtB,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAClC,MAAc,EACd,YAAgC,EAChC,eAAmC,IAAI,EACxB,EAAE;IACjB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,OAAO,EAMN,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRulePaths.d.ts","sourceRoot":"","sources":["../../../src/rules/api/apiRulePaths.ts"],"names":[],"mappings":"AAcA,
|
|
1
|
+
{"version":3,"file":"apiRulePaths.d.ts","sourceRoot":"","sources":["../../../src/rules/api/apiRulePaths.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,YAAY;;;CAGxB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRulePaths.js","sourceRoot":"","sources":["../../../src/rules/api/apiRulePaths.ts"],"names":[],"mappings":"AAcA,MAAM,YAAY,GAAG;
|
|
1
|
+
{"version":3,"file":"apiRulePaths.js","sourceRoot":"","sources":["../../../src/rules/api/apiRulePaths.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,YAAY,GAAG;IAC3B,WAAW,EAAE,kDAAkD;IAC/D,WAAW,EAAE,kDAAkD;CAC/D,CAAC"}
|
|
@@ -1,113 +1,58 @@
|
|
|
1
|
+
import { type output } from "zod";
|
|
1
2
|
declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
|
|
2
3
|
isUserBlocked: import("zod").ZodBoolean;
|
|
3
4
|
clientId: import("zod").ZodOptional<import("zod").ZodString>;
|
|
4
5
|
description: import("zod").ZodOptional<import("zod").ZodString>;
|
|
5
|
-
userIps: import("zod").
|
|
6
|
-
v4: import("zod").ZodOptional<import("zod").
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
rangeMaxAsNumeric: bigint;
|
|
20
|
-
asNumeric: number;
|
|
21
|
-
}>>;
|
|
6
|
+
userIps: import("zod").ZodObject<{
|
|
7
|
+
v4: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
|
|
8
|
+
v6: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
|
|
9
|
+
}, "strip", import("zod").ZodTypeAny, {
|
|
10
|
+
v4?: string[] | undefined;
|
|
11
|
+
v6?: string[] | undefined;
|
|
12
|
+
}, {
|
|
13
|
+
v4?: string[] | undefined;
|
|
14
|
+
v6?: string[] | undefined;
|
|
15
|
+
}>;
|
|
16
|
+
userIpMasks: import("zod").ZodObject<{
|
|
17
|
+
v4: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
|
|
18
|
+
min: import("zod").ZodString;
|
|
19
|
+
max: import("zod").ZodString;
|
|
22
20
|
}, "strip", import("zod").ZodTypeAny, {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
mask?: {
|
|
26
|
-
rangeMinAsNumeric: bigint;
|
|
27
|
-
rangeMaxAsNumeric: bigint;
|
|
28
|
-
asNumeric: number;
|
|
29
|
-
} | undefined;
|
|
21
|
+
min: string;
|
|
22
|
+
max: string;
|
|
30
23
|
}, {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
} | undefined;
|
|
38
|
-
}>>;
|
|
39
|
-
v6: import("zod").ZodOptional<import("zod").ZodObject<{
|
|
40
|
-
asNumericString: import("zod").ZodString;
|
|
41
|
-
asString: import("zod").ZodString;
|
|
42
|
-
mask: import("zod").ZodOptional<import("zod").ZodObject<{
|
|
43
|
-
rangeMinAsNumericString: import("zod").ZodString;
|
|
44
|
-
rangeMaxAsNumericString: import("zod").ZodString;
|
|
45
|
-
asNumeric: import("zod").ZodNumber;
|
|
46
|
-
}, "strip", import("zod").ZodTypeAny, {
|
|
47
|
-
asNumeric: number;
|
|
48
|
-
rangeMinAsNumericString: string;
|
|
49
|
-
rangeMaxAsNumericString: string;
|
|
50
|
-
}, {
|
|
51
|
-
asNumeric: number;
|
|
52
|
-
rangeMinAsNumericString: string;
|
|
53
|
-
rangeMaxAsNumericString: string;
|
|
54
|
-
}>>;
|
|
24
|
+
min: string;
|
|
25
|
+
max: string;
|
|
26
|
+
}>, "many">>;
|
|
27
|
+
v6: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
|
|
28
|
+
min: import("zod").ZodString;
|
|
29
|
+
max: import("zod").ZodString;
|
|
55
30
|
}, "strip", import("zod").ZodTypeAny, {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
mask?: {
|
|
59
|
-
asNumeric: number;
|
|
60
|
-
rangeMinAsNumericString: string;
|
|
61
|
-
rangeMaxAsNumericString: string;
|
|
62
|
-
} | undefined;
|
|
31
|
+
min: string;
|
|
32
|
+
max: string;
|
|
63
33
|
}, {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
asNumeric: number;
|
|
68
|
-
rangeMinAsNumericString: string;
|
|
69
|
-
rangeMaxAsNumericString: string;
|
|
70
|
-
} | undefined;
|
|
71
|
-
}>>;
|
|
34
|
+
min: string;
|
|
35
|
+
max: string;
|
|
36
|
+
}>, "many">>;
|
|
72
37
|
}, "strip", import("zod").ZodTypeAny, {
|
|
73
38
|
v4?: {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
rangeMinAsNumeric: bigint;
|
|
78
|
-
rangeMaxAsNumeric: bigint;
|
|
79
|
-
asNumeric: number;
|
|
80
|
-
} | undefined;
|
|
81
|
-
} | undefined;
|
|
39
|
+
min: string;
|
|
40
|
+
max: string;
|
|
41
|
+
}[] | undefined;
|
|
82
42
|
v6?: {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
asNumeric: number;
|
|
87
|
-
rangeMinAsNumericString: string;
|
|
88
|
-
rangeMaxAsNumericString: string;
|
|
89
|
-
} | undefined;
|
|
90
|
-
} | undefined;
|
|
43
|
+
min: string;
|
|
44
|
+
max: string;
|
|
45
|
+
}[] | undefined;
|
|
91
46
|
}, {
|
|
92
47
|
v4?: {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
rangeMinAsNumeric: bigint;
|
|
97
|
-
rangeMaxAsNumeric: bigint;
|
|
98
|
-
asNumeric: number;
|
|
99
|
-
} | undefined;
|
|
100
|
-
} | undefined;
|
|
48
|
+
min: string;
|
|
49
|
+
max: string;
|
|
50
|
+
}[] | undefined;
|
|
101
51
|
v6?: {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
rangeMinAsNumericString: string;
|
|
107
|
-
rangeMaxAsNumericString: string;
|
|
108
|
-
} | undefined;
|
|
109
|
-
} | undefined;
|
|
110
|
-
}>, "many">>;
|
|
52
|
+
min: string;
|
|
53
|
+
max: string;
|
|
54
|
+
}[] | undefined;
|
|
55
|
+
}>;
|
|
111
56
|
userIds: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
|
|
112
57
|
config: import("zod").ZodOptional<import("zod").ZodObject<{
|
|
113
58
|
imageCaptcha: import("zod").ZodOptional<import("zod").ZodObject<{
|
|
@@ -131,30 +76,25 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
|
|
|
131
76
|
unsolvedCount?: number | undefined;
|
|
132
77
|
} | undefined;
|
|
133
78
|
}>>;
|
|
79
|
+
score: import("zod").ZodOptional<import("zod").ZodNumber>;
|
|
134
80
|
}, "strip", import("zod").ZodTypeAny, {
|
|
135
81
|
isUserBlocked: boolean;
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
82
|
+
userIps: {
|
|
83
|
+
v4?: string[] | undefined;
|
|
84
|
+
v6?: string[] | undefined;
|
|
85
|
+
};
|
|
86
|
+
userIpMasks: {
|
|
139
87
|
v4?: {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
rangeMinAsNumeric: bigint;
|
|
144
|
-
rangeMaxAsNumeric: bigint;
|
|
145
|
-
asNumeric: number;
|
|
146
|
-
} | undefined;
|
|
147
|
-
} | undefined;
|
|
88
|
+
min: string;
|
|
89
|
+
max: string;
|
|
90
|
+
}[] | undefined;
|
|
148
91
|
v6?: {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
} | undefined;
|
|
156
|
-
} | undefined;
|
|
157
|
-
}[] | undefined;
|
|
92
|
+
min: string;
|
|
93
|
+
max: string;
|
|
94
|
+
}[] | undefined;
|
|
95
|
+
};
|
|
96
|
+
clientId?: string | undefined;
|
|
97
|
+
description?: string | undefined;
|
|
158
98
|
userIds?: string[] | undefined;
|
|
159
99
|
config?: {
|
|
160
100
|
imageCaptcha?: {
|
|
@@ -162,30 +102,25 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
|
|
|
162
102
|
unsolvedCount?: number | undefined;
|
|
163
103
|
} | undefined;
|
|
164
104
|
} | undefined;
|
|
105
|
+
score?: number | undefined;
|
|
165
106
|
}, {
|
|
166
107
|
isUserBlocked: boolean;
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
108
|
+
userIps: {
|
|
109
|
+
v4?: string[] | undefined;
|
|
110
|
+
v6?: string[] | undefined;
|
|
111
|
+
};
|
|
112
|
+
userIpMasks: {
|
|
170
113
|
v4?: {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
rangeMinAsNumeric: bigint;
|
|
175
|
-
rangeMaxAsNumeric: bigint;
|
|
176
|
-
asNumeric: number;
|
|
177
|
-
} | undefined;
|
|
178
|
-
} | undefined;
|
|
114
|
+
min: string;
|
|
115
|
+
max: string;
|
|
116
|
+
}[] | undefined;
|
|
179
117
|
v6?: {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
} | undefined;
|
|
187
|
-
} | undefined;
|
|
188
|
-
}[] | undefined;
|
|
118
|
+
min: string;
|
|
119
|
+
max: string;
|
|
120
|
+
}[] | undefined;
|
|
121
|
+
};
|
|
122
|
+
clientId?: string | undefined;
|
|
123
|
+
description?: string | undefined;
|
|
189
124
|
userIds?: string[] | undefined;
|
|
190
125
|
config?: {
|
|
191
126
|
imageCaptcha?: {
|
|
@@ -193,7 +128,9 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
|
|
|
193
128
|
unsolvedCount?: number | undefined;
|
|
194
129
|
} | undefined;
|
|
195
130
|
} | undefined;
|
|
131
|
+
score?: number | undefined;
|
|
196
132
|
}>;
|
|
197
133
|
type ApiInsertManyRulesArgsSchema = typeof apiInsertManyRulesArgsSchema;
|
|
198
|
-
|
|
134
|
+
type ApiInsertManyRulesArgsOutputSchema = output<typeof apiInsertManyRulesArgsSchema>;
|
|
135
|
+
export { apiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsOutputSchema, };
|
|
199
136
|
//# sourceMappingURL=apiInsertManyRulesArgsSchema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiInsertManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apiInsertManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAA2B,KAAK,MAAM,EAAU,MAAM,KAAK,CAAC;AAGnE,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBhC,CAAC;AAEH,KAAK,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAExE,KAAK,kCAAkC,GAAG,MAAM,CAC/C,OAAO,4BAA4B,CACnC,CAAC;AAEF,OAAO,EACN,4BAA4B,EAC5B,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,GACvC,CAAC"}
|
|
@@ -1,13 +1,30 @@
|
|
|
1
|
-
import { boolean, object, string } from "zod";
|
|
1
|
+
import { boolean, number, object, string } from "zod";
|
|
2
2
|
import { ruleConfigSchema } from "../../rule/config/ruleConfigSchema.js";
|
|
3
|
-
import { ruleIpSchema } from "../../rule/ip/ruleIpSchema.js";
|
|
4
3
|
const apiInsertManyRulesArgsSchema = object({
|
|
5
4
|
isUserBlocked: boolean(),
|
|
6
5
|
clientId: string().optional(),
|
|
7
6
|
description: string().optional(),
|
|
8
|
-
userIps:
|
|
7
|
+
userIps: object({
|
|
8
|
+
v4: string().array().optional(),
|
|
9
|
+
v6: string().array().optional(),
|
|
10
|
+
}),
|
|
11
|
+
userIpMasks: object({
|
|
12
|
+
v4: object({
|
|
13
|
+
min: string(),
|
|
14
|
+
max: string(),
|
|
15
|
+
})
|
|
16
|
+
.array()
|
|
17
|
+
.optional(),
|
|
18
|
+
v6: object({
|
|
19
|
+
min: string(),
|
|
20
|
+
max: string(),
|
|
21
|
+
})
|
|
22
|
+
.array()
|
|
23
|
+
.optional(),
|
|
24
|
+
}),
|
|
9
25
|
userIds: string().array().optional(),
|
|
10
26
|
config: ruleConfigSchema.optional(),
|
|
27
|
+
score: number().optional(),
|
|
11
28
|
});
|
|
12
|
-
export { apiInsertManyRulesArgsSchema };
|
|
29
|
+
export { apiInsertManyRulesArgsSchema, };
|
|
13
30
|
//# sourceMappingURL=apiInsertManyRulesArgsSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiInsertManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"apiInsertManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAe,MAAM,EAAE,MAAM,KAAK,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,4BAA4B,GAAG,MAAM,CAAC;IAC3C,aAAa,EAAE,OAAO,EAAE;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,MAAM,CAAC;QACf,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC/B,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;QACnB,EAAE,EAAE,MAAM,CAAC;YACV,GAAG,EAAE,MAAM,EAAE;YACb,GAAG,EAAE,MAAM,EAAE;SACb,CAAC;aACA,KAAK,EAAE;aACP,QAAQ,EAAE;QACZ,EAAE,EAAE,MAAM,CAAC;YACV,GAAG,EAAE,MAAM,EAAE;YACb,GAAG,EAAE,MAAM,EAAE;SACb,CAAC;aACA,KAAK,EAAE;aACP,QAAQ,EAAE;KACZ,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IACpC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAQH,OAAO,EACN,4BAA4B,GAG5B,CAAC"}
|
|
@@ -9,6 +9,7 @@ declare class ApiInsertManyRulesEndpoint implements ApiEndpoint<ApiInsertManyRul
|
|
|
9
9
|
processRequest(args: z.infer<ApiInsertManyRulesArgsSchema>): Promise<ApiEndpointResponse>;
|
|
10
10
|
getRequestArgsSchema(): ApiInsertManyRulesArgsSchema;
|
|
11
11
|
protected getUserIpRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
|
|
12
|
+
protected getUserIPMaskRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
|
|
12
13
|
protected getUserIdRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
|
|
13
14
|
}
|
|
14
15
|
export { ApiInsertManyRulesEndpoint };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiInsertManyRulesEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiInsertManyRulesEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACN,KAAK,4BAA4B,EAEjC,MAAM,mCAAmC,CAAC;AAE3C,cAAM,0BACL,YAAW,WAAW,CAAC,4BAA4B,CAAC;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAExD,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;IA0BxB,oBAAoB,IAAI,4BAA4B;IAI3D,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;IAyCT,SAAS,CAAC,kBAAkB,CAC3B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;IAkDT,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;CAkBT;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { ApiEndpointResponseStatus, } from "@prosopo/api-route";
|
|
2
|
+
import { Address4, Address6 } from "ip-address";
|
|
3
|
+
import { ruleIpSchema } from "../../rule/ip/ruleIpSchema.js";
|
|
2
4
|
import { apiInsertManyRulesArgsSchema, } from "./apiInsertManyRulesArgsSchema.js";
|
|
3
5
|
class ApiInsertManyRulesEndpoint {
|
|
4
6
|
constructor(rulesStorage) {
|
|
@@ -7,12 +9,21 @@ class ApiInsertManyRulesEndpoint {
|
|
|
7
9
|
async processRequest(args) {
|
|
8
10
|
const rules = [
|
|
9
11
|
...this.getUserIpRules(args),
|
|
12
|
+
...this.getUserIPMaskRules(args),
|
|
10
13
|
...this.getUserIdRules(args),
|
|
11
14
|
];
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
status: ApiEndpointResponseStatus.
|
|
15
|
+
let response;
|
|
16
|
+
response = {
|
|
17
|
+
status: ApiEndpointResponseStatus.PROCESSING,
|
|
15
18
|
};
|
|
19
|
+
this.rulesStorage.insertMany(rules).then(() => {
|
|
20
|
+
console.log("\nRules inserted\n");
|
|
21
|
+
response = {
|
|
22
|
+
status: ApiEndpointResponseStatus.SUCCESS,
|
|
23
|
+
};
|
|
24
|
+
});
|
|
25
|
+
await new Promise((resolve) => setTimeout(resolve, 5000));
|
|
26
|
+
return response;
|
|
16
27
|
}
|
|
17
28
|
getRequestArgsSchema() {
|
|
18
29
|
return apiInsertManyRulesArgsSchema;
|
|
@@ -20,13 +31,85 @@ class ApiInsertManyRulesEndpoint {
|
|
|
20
31
|
getUserIpRules(args) {
|
|
21
32
|
const rules = [];
|
|
22
33
|
const userIps = args.userIps || [];
|
|
23
|
-
for (const userIp of userIps) {
|
|
34
|
+
for (const userIp of userIps.v4 || []) {
|
|
35
|
+
const ipAddress = new Address4(userIp);
|
|
24
36
|
rules.push({
|
|
25
|
-
userIp:
|
|
37
|
+
userIp: ruleIpSchema.parse({
|
|
38
|
+
v4: {
|
|
39
|
+
asNumeric: ipAddress.bigInt(),
|
|
40
|
+
asString: ipAddress.address,
|
|
41
|
+
},
|
|
42
|
+
}),
|
|
26
43
|
isUserBlocked: args.isUserBlocked,
|
|
27
44
|
description: args.description,
|
|
28
45
|
clientId: args.clientId,
|
|
29
46
|
config: args.config,
|
|
47
|
+
score: args.score,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
for (const userIp of userIps.v6 || []) {
|
|
51
|
+
const ipAddress = new Address6(userIp);
|
|
52
|
+
rules.push({
|
|
53
|
+
userIp: ruleIpSchema.parse({
|
|
54
|
+
v4: {
|
|
55
|
+
asNumeric: ipAddress.bigInt(),
|
|
56
|
+
asString: ipAddress.address,
|
|
57
|
+
},
|
|
58
|
+
}),
|
|
59
|
+
isUserBlocked: args.isUserBlocked,
|
|
60
|
+
description: args.description,
|
|
61
|
+
clientId: args.clientId,
|
|
62
|
+
config: args.config,
|
|
63
|
+
score: args.score,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
return rules;
|
|
67
|
+
}
|
|
68
|
+
getUserIPMaskRules(args) {
|
|
69
|
+
const rules = [];
|
|
70
|
+
const userIpMasks = args.userIpMasks || [];
|
|
71
|
+
for (const userMask of userIpMasks.v4 || []) {
|
|
72
|
+
const min = new Address4(userMask.min);
|
|
73
|
+
const max = new Address4(userMask.max);
|
|
74
|
+
rules.push({
|
|
75
|
+
userIp: ruleIpSchema.parse({
|
|
76
|
+
v4: {
|
|
77
|
+
asNumeric: min.bigInt(),
|
|
78
|
+
asString: min.address,
|
|
79
|
+
mask: {
|
|
80
|
+
rangeMinAsNumeric: min.bigInt(),
|
|
81
|
+
rangeMaxAsNumeric: max.bigInt(),
|
|
82
|
+
asNumeric: Number(min.bigInt()),
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
}),
|
|
86
|
+
isUserBlocked: args.isUserBlocked,
|
|
87
|
+
description: args.description,
|
|
88
|
+
clientId: args.clientId,
|
|
89
|
+
config: args.config,
|
|
90
|
+
score: args.score,
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
for (const userMask of userIpMasks.v6 || []) {
|
|
94
|
+
const min = new Address6(userMask.min);
|
|
95
|
+
const max = new Address6(userMask.max);
|
|
96
|
+
rules.push({
|
|
97
|
+
userIp: ruleIpSchema.parse({
|
|
98
|
+
v6: {
|
|
99
|
+
asNumeric: min.bigInt(),
|
|
100
|
+
asString: min.address,
|
|
101
|
+
mask: {
|
|
102
|
+
rangeMinAsNumeric: min.bigInt(),
|
|
103
|
+
rangeMaxAsNumeric: max.bigInt(),
|
|
104
|
+
asNumeric: Number(min.bigInt()),
|
|
105
|
+
},
|
|
106
|
+
},
|
|
107
|
+
}),
|
|
108
|
+
isUserBlocked: args.isUserBlocked,
|
|
109
|
+
description: args.description,
|
|
110
|
+
clientId: args.clientId,
|
|
111
|
+
config: args.config,
|
|
112
|
+
score: args.score,
|
|
30
113
|
});
|
|
31
114
|
}
|
|
32
115
|
return rules;
|
|
@@ -41,6 +124,7 @@ class ApiInsertManyRulesEndpoint {
|
|
|
41
124
|
description: args.description,
|
|
42
125
|
clientId: args.clientId,
|
|
43
126
|
config: args.config,
|
|
127
|
+
score: args.score,
|
|
44
128
|
});
|
|
45
129
|
}
|
|
46
130
|
return rules;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiInsertManyRulesEndpoint.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiInsertManyRulesEndpoint.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ import type { RulesStorage } from "./storage/rulesStorage.js";
|
|
|
7
7
|
declare class ImageCaptchaConfigRulesResolver implements ImageCaptchaConfigResolver {
|
|
8
8
|
private readonly rulesStorage;
|
|
9
9
|
private readonly logger;
|
|
10
|
-
|
|
10
|
+
private _accessRule;
|
|
11
|
+
constructor(rulesStorage: RulesStorage, logger: Logger, _accessRule?: Rule | null);
|
|
12
|
+
get accessRule(): Rule | null;
|
|
11
13
|
isConfigDefined(clientId: string, userIpAddress: IPAddress, userId: string): Promise<boolean>;
|
|
12
14
|
resolveConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, userIpAddress: IPAddress, userId: string, clientId: string): Promise<ProsopoCaptchaCountConfigSchemaOutput>;
|
|
13
15
|
protected fetchUserAccessRule(userIpAddress: IPAddress, userId: string, clientId: string): Promise<Rule | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageCaptchaConfigRulesResolver.d.ts","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,+BAAgC,YAAW,0BAA0B;IAEzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"imageCaptchaConfigRulesResolver.d.ts","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,+BAAgC,YAAW,0BAA0B;IAEzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,WAAW;gBAFF,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACvB,WAAW,GAAE,IAAI,GAAG,IAAW;IAGxC,IAAI,UAAU,IAAI,IAAI,GAAG,IAAI,CAE5B;IAEY,eAAe,CAC3B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAsBN,aAAa,CACzB,QAAQ,EAAE,qCAAqC,EAC/C,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,qCAAqC,CAAC;cAqCjC,mBAAmB,CAClC,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;cAiBP,oBAAoB,CACnC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,EAAE,CAAC;IAclB,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI;IAcvE,SAAS,CAAC,qBAAqB,CAC9B,QAAQ,EAAE,qCAAqC,EAC/C,kBAAkB,EAAE,kBAAkB,GACpC,qCAAqC;CAUxC;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
class ImageCaptchaConfigRulesResolver {
|
|
2
|
-
constructor(rulesStorage, logger) {
|
|
2
|
+
constructor(rulesStorage, logger, _accessRule = null) {
|
|
3
3
|
this.rulesStorage = rulesStorage;
|
|
4
4
|
this.logger = logger;
|
|
5
|
+
this._accessRule = _accessRule;
|
|
6
|
+
}
|
|
7
|
+
get accessRule() {
|
|
8
|
+
return this._accessRule;
|
|
5
9
|
}
|
|
6
10
|
async isConfigDefined(clientId, userIpAddress, userId) {
|
|
7
11
|
const accessRule = await this.fetchUserAccessRule(userIpAddress, userId, clientId);
|
|
@@ -23,15 +27,15 @@ class ImageCaptchaConfigRulesResolver {
|
|
|
23
27
|
clientId: clientId,
|
|
24
28
|
defaults: defaults,
|
|
25
29
|
};
|
|
26
|
-
|
|
27
|
-
if (null === accessRule) {
|
|
30
|
+
this._accessRule = await this.fetchUserAccessRule(userIpAddress, userId, clientId);
|
|
31
|
+
if (null === this.accessRule) {
|
|
28
32
|
this.logger.info("ImageCaptchaConfigRulesResolver.resolveConfig", {
|
|
29
33
|
configDefined: false,
|
|
30
34
|
...logArgs,
|
|
31
35
|
});
|
|
32
36
|
return defaults;
|
|
33
37
|
}
|
|
34
|
-
const imageCaptchaConfig = accessRule.config?.imageCaptcha || {};
|
|
38
|
+
const imageCaptchaConfig = this.accessRule.config?.imageCaptcha || {};
|
|
35
39
|
const config = this.getImageCaptchaConfig(defaults, imageCaptchaConfig);
|
|
36
40
|
this.logger.info("ImageCaptchaConfigRulesResolver.resolveConfig", {
|
|
37
41
|
configDefined: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageCaptchaConfigRulesResolver.js","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAwBA,MAAM,+BAA+B;IACpC,YACkB,YAA0B,EAC1B,MAAc;
|
|
1
|
+
{"version":3,"file":"imageCaptchaConfigRulesResolver.js","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAwBA,MAAM,+BAA+B;IACpC,YACkB,YAA0B,EAC1B,MAAc,EACvB,cAA2B,IAAI;QAFtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACvB,gBAAW,GAAX,WAAW,CAAoB;IACrC,CAAC;IAEJ,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,eAAe,CAC3B,QAAgB,EAChB,aAAwB,EACxB,MAAc;QAEd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAChD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,MAAM,kBAAkB,GAAG,UAAU,EAAE,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;QAEpE,MAAM,aAAa,GAAG,IAAI,KAAK,kBAAkB,CAAC;QAElD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE;YACnE,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,QAAQ;YAClB,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;YACvC,MAAM,EAAE,MAAM;YACd,kBAAkB,EAAE,kBAAkB;SACtC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,aAAa,CACzB,QAA+C,EAC/C,aAAwB,EACxB,MAAc,EACd,QAAgB;QAEhB,MAAM,OAAO,GAAG;YACf,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC/C,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ;SAClB,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAChD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE;gBACjE,aAAa,EAAE,KAAK;gBACpB,GAAG,OAAO;aACV,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC;QAEtE,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAExE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE;YACjE,aAAa,EAAE,IAAI;YACnB,kBAAkB,EAAE,kBAAkB;YACtC,MAAM,EAAE,MAAM;YACd,GAAG,OAAO;SACV,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IACf,CAAC;IAES,KAAK,CAAC,mBAAmB,CAClC,aAAwB,EACxB,MAAc,EACd,QAAgB;QAEhB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAClD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE;YACvE,WAAW,EAAE,WAAW,CAAC,MAAM;YAC/B,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC/C,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;SAClB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAES,KAAK,CAAC,oBAAoB,CACnC,SAAoB,EACpB,IAAY,EACZ,QAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAClC;YACC,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,SAAS;SACxB,EACD;YACC,6BAA6B,EAAE,IAAI;YACnC,sCAAsC,EAAE,IAAI;SAC5C,CACD,CAAC;IACH,CAAC;IAES,2BAA2B,CAAC,WAAmB;QACxD,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CACrC,CAAC,UAAU,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,UAAU,CAAC,QAAQ,CACvD,CAAC;QACF,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CACrC,CAAC,UAAU,EAAE,EAAE,CAAC,SAAS,KAAK,UAAU,CAAC,QAAQ,CACjD,CAAC;QAEF,MAAM,UAAU,GACf,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEpE,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;IACrD,CAAC;IAES,qBAAqB,CAC9B,QAA+C,EAC/C,kBAAsC;QAEtC,OAAO;YACN,MAAM,EAAE;gBACP,KAAK,EAAE,kBAAkB,CAAC,WAAW,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK;aAC9D;YACD,QAAQ,EAAE;gBACT,KAAK,EAAE,kBAAkB,CAAC,aAAa,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK;aAClE;SACD,CAAC;IACH,CAAC;CACD;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rulesMongooseStorage.d.ts","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,cAAM,oBAAqB,YAAW,YAAY;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;gBAFH,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,EAChC,YAAY,GAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAW;IAOnC,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"rulesMongooseStorage.d.ts","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,cAAM,oBAAqB,YAAW,YAAY;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;gBAFH,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,EAChC,YAAY,GAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAW;IAOnC,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBzC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA0BlD,IAAI,CAChB,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,OAAO,CAAC,UAAU,EAAE,CAAC;IAeX,UAAU,CAAC,aAAa,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU5C,SAAS,CAAC,uBAAuB,IAAI,YAAY;IAIjD,SAAS,CAAC,iBAAiB,CAC1B,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,MAAM;IAoBT,SAAS,CAAC,qBAAqB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,sCAAsC,EAAE,OAAO,GAC7C,MAAM,EAAE;IAgBX,SAAS,CAAC,mBAAmB,CAC5B,6BAA6B,EAAE,OAAO,EACtC,QAAQ,CAAC,EAAE,MAAM,GACf,MAAM;IAeT,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM;IAMpE,SAAS,CAAC,wBAAwB,CAAC,aAAa,EAAE,SAAS,GAAG,MAAM;IAyCpE,SAAS,CAAC,mCAAmC,CAC5C,eAAe,EAAE,kBAAkB,EAAE,GACnC,UAAU,EAAE;IAQf,SAAS,CAAC,iCAAiC,CAC1C,cAAc,EAAE,kBAAkB,GAChC,UAAU;CAQb;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
|
@@ -15,7 +15,10 @@ class RulesMongooseStorage {
|
|
|
15
15
|
if (!this.writingModel) {
|
|
16
16
|
throw this.modelNotSetProsopoError();
|
|
17
17
|
}
|
|
18
|
-
|
|
18
|
+
let document = await this.writingModel.findOneAndUpdate(record);
|
|
19
|
+
if (!document) {
|
|
20
|
+
document = await this.writingModel.create(record);
|
|
21
|
+
}
|
|
19
22
|
const ruleRecord = this.convertMongooseRecordToRuleRecord(document.toObject());
|
|
20
23
|
return ruleRecord;
|
|
21
24
|
}
|
|
@@ -23,6 +26,14 @@ class RulesMongooseStorage {
|
|
|
23
26
|
if (!this.writingModel) {
|
|
24
27
|
throw this.modelNotSetProsopoError();
|
|
25
28
|
}
|
|
29
|
+
await this.writingModel.bulkWrite(records.map((record) => ({
|
|
30
|
+
deleteOne: {
|
|
31
|
+
filter: {
|
|
32
|
+
clientId: record.clientId,
|
|
33
|
+
userIp: record.userIp,
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
})));
|
|
26
37
|
const documents = await this.writingModel.insertMany(records);
|
|
27
38
|
const objectDocuments = documents.map((document) => document.toObject());
|
|
28
39
|
const ruleRecords = this.convertMongooseRecordsToRuleRecords(objectDocuments);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rulesMongooseStorage.js","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAe,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAQzF,MAAM,oBAAoB;IACzB,YACkB,MAAc,EACvB,YAAgC,EAChC,eAAmC,IAAI;QAF9B,WAAM,GAAN,MAAM,CAAQ;QACvB,iBAAY,GAAZ,YAAY,CAAoB;QAChC,iBAAY,GAAZ,YAAY,CAA2B;QAE/C,IAAI,IAAI,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAY;QAC/B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rulesMongooseStorage.js","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleMongooseSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/C,QAAA,MAAM,kBAAkB;;;;
|
|
1
|
+
{"version":3,"file":"ruleMongooseSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/C,QAAA,MAAM,kBAAkB;;;;EA2BtB,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleMongooseSchema.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAO;IAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;IAChD,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC3C,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC9C,MAAM,EAAE;QACP,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YACD,2CAA2C;SAC3C;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YACD,2CAA2C;SAC3C;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,KAAK;KACf;
|
|
1
|
+
{"version":3,"file":"ruleMongooseSchema.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAO;IAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;IAChD,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC3C,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC9C,MAAM,EAAE;QACP,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YACD,2CAA2C;SAC3C;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YACD,2CAA2C;SAC3C;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,KAAK;KACf;IACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;CACxC,CAAC,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/rules/rule/rule.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,IAAI;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/rules/rule/rule.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,IAAI;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,YAAY,EAAE,IAAI,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongooseRulesStorageFactory.d.ts","sourceRoot":"","sources":["../../../../src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts"],"names":[],"mappings":"AAcA,OAAiB,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AAGhD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,cAAM,2BAA4B,YAAW,mBAAmB;IACzD,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;cAM9C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mongooseRulesStorageFactory.d.ts","sourceRoot":"","sources":["../../../../src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts"],"names":[],"mappings":"AAcA,OAAiB,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AAGhD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,cAAM,2BAA4B,YAAW,mBAAmB;IACzD,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;cAM9C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;CAUhE;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}
|
|
@@ -9,7 +9,7 @@ class MongooseRulesStorageFactory {
|
|
|
9
9
|
}
|
|
10
10
|
async createModel(dbUrl) {
|
|
11
11
|
const mongoConnection = await mongoose.connect(`${dbUrl}`);
|
|
12
|
-
return mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema());
|
|
12
|
+
return mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema(), undefined, { overwriteModels: true });
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
export { MongooseRulesStorageFactory };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongooseRulesStorageFactory.js","sourceRoot":"","sources":["../../../../src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts"],"names":[],"mappings":"AAcA,OAAO,QAAwB,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0DAA0D,CAAC;AAGjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,MAAM,2BAA2B;IAChC,KAAK,CAAC,kBAAkB,CAAC,KAAa;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE5C,OAAO,IAAI,oBAAoB,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,KAAa;QACxC,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,KAAK,CAC3B,uBAAuB,EACvB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"mongooseRulesStorageFactory.js","sourceRoot":"","sources":["../../../../src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts"],"names":[],"mappings":"AAcA,OAAO,QAAwB,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0DAA0D,CAAC;AAGjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,MAAM,2BAA2B;IAChC,KAAK,CAAC,kBAAkB,CAAC,KAAa;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE5C,OAAO,IAAI,oBAAoB,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,KAAa;QACxC,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,KAAK,CAC3B,uBAAuB,EACvB,qBAAqB,EAAE,EACvB,SAAS,EACT,EAAE,eAAe,EAAE,IAAI,EAAE,CACzB,CAAC;IACH,CAAC;CACD;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}
|
|
@@ -13,7 +13,7 @@ describe("RulesMongooseStorage", async () => {
|
|
|
13
13
|
beforeAll(async () => {
|
|
14
14
|
mongoServer = await MongoMemoryServer.create();
|
|
15
15
|
mongoConnection = await mongoose.connect(mongoServer.getUri());
|
|
16
|
-
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema());
|
|
16
|
+
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema(), undefined, { overwriteModels: true });
|
|
17
17
|
await model.syncIndexes();
|
|
18
18
|
rulesStorage = new RulesMongooseStorage(loggerMockedInstance, model);
|
|
19
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/rules/mongoose/find.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,QAAuC,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0DAA0D,CAAC;AAGjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,QAAQ,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IAC3C,IAAI,WAA8B,CAAC;IACnC,IAAI,eAAyB,CAAC;IAC9B,IAAI,YAA0B,CAAC;IAC/B,IAAI,KAAkB,CAAC;IAEvB,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC/C,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/D,KAAK,GAAG,eAAe,CAAC,KAAK,CAC5B,uBAAuB,EACvB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"find.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/rules/mongoose/find.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ describe("ipV6RuleFormatting", async () => {
|
|
|
13
13
|
beforeAll(async () => {
|
|
14
14
|
mongoServer = await MongoMemoryServer.create();
|
|
15
15
|
mongoConnection = await mongoose.connect(mongoServer.getUri());
|
|
16
|
-
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema());
|
|
16
|
+
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema(), undefined, { overwriteModels: true });
|
|
17
17
|
await model.syncIndexes();
|
|
18
18
|
rulesStorage = new RulesMongooseStorage(loggerMockedInstance, model);
|
|
19
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertIpV6Formatting.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/rules/mongoose/insert/insertIpV6Formatting.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,QAAuC,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAGxG,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,QAAQ,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACzC,IAAI,WAA8B,CAAC;IACnC,IAAI,eAAyB,CAAC;IAC9B,IAAI,YAA0B,CAAC;IAC/B,IAAI,KAAkB,CAAC;IAEvB,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC/C,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/D,KAAK,GAAG,eAAe,CAAC,KAAK,CAC5B,uBAAuB,EACvB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"insertIpV6Formatting.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/rules/mongoose/insert/insertIpV6Formatting.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ describe("recordValidation", async () => {
|
|
|
12
12
|
beforeAll(async () => {
|
|
13
13
|
mongoServer = await MongoMemoryServer.create();
|
|
14
14
|
mongoConnection = await mongoose.connect(mongoServer.getUri());
|
|
15
|
-
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema());
|
|
15
|
+
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema(), undefined, { overwriteModels: true });
|
|
16
16
|
await model.syncIndexes();
|
|
17
17
|
rulesStorage = new RulesMongooseStorage(loggerMockedInstance, model);
|
|
18
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertValidation.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/rules/mongoose/insert/insertValidation.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,QAAuC,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAGpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,QAAQ,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;IACvC,IAAI,WAA8B,CAAC;IACnC,IAAI,eAAyB,CAAC;IAC9B,IAAI,YAA0B,CAAC;IAC/B,IAAI,KAAkB,CAAC;IAEvB,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC/C,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/D,KAAK,GAAG,eAAe,CAAC,KAAK,CAC5B,uBAAuB,EACvB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"insertValidation.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/rules/mongoose/insert/insertValidation.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ describe.each([
|
|
|
50
50
|
beforeAll(async () => {
|
|
51
51
|
mongoServer = await MongoMemoryServer.create();
|
|
52
52
|
mongoConnection = await mongoose.connect(mongoServer.getUri());
|
|
53
|
-
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema());
|
|
53
|
+
model = mongoConnection.model("UserAccessPolicyRules", getRuleMongooseSchema(), undefined, { overwriteModels: true });
|
|
54
54
|
await model.syncIndexes();
|
|
55
55
|
rulesStorage = new RulesMongooseStorage(loggerMockedInstance, model);
|
|
56
56
|
});
|
|
@@ -256,7 +256,7 @@ describe.each([
|
|
|
256
256
|
},
|
|
257
257
|
},
|
|
258
258
|
});
|
|
259
|
-
expect(insertDuplicate()).
|
|
259
|
+
expect(await insertDuplicate()).to.not.throw;
|
|
260
260
|
});
|
|
261
261
|
it.each([
|
|
262
262
|
{
|
|
@@ -301,23 +301,8 @@ describe.each([
|
|
|
301
301
|
clientId: "client",
|
|
302
302
|
},
|
|
303
303
|
{},
|
|
304
|
-
])("
|
|
305
|
-
|
|
306
|
-
...clientIdPart,
|
|
307
|
-
isUserBlocked: true,
|
|
308
|
-
userIp: {
|
|
309
|
-
[ipRange.version]: {
|
|
310
|
-
[ipRange.fieldSuffix]: getNumericIp(ipRange.min),
|
|
311
|
-
asString: ipRange.min.bigInt().toString(),
|
|
312
|
-
mask: {
|
|
313
|
-
[rangeMinKey]: getNumericIp(ipRange.min),
|
|
314
|
-
[rangeMaxKey]: getNumericIp(ipRange.max),
|
|
315
|
-
asNumeric: 24,
|
|
316
|
-
},
|
|
317
|
-
},
|
|
318
|
-
},
|
|
319
|
-
});
|
|
320
|
-
const insertDuplicate = async () => await rulesStorage.insert({
|
|
304
|
+
])("replacesDuplicatedIpMask", async (clientIdPart) => {
|
|
305
|
+
const rule = {
|
|
321
306
|
...clientIdPart,
|
|
322
307
|
isUserBlocked: true,
|
|
323
308
|
userIp: {
|
|
@@ -331,8 +316,11 @@ describe.each([
|
|
|
331
316
|
},
|
|
332
317
|
},
|
|
333
318
|
},
|
|
334
|
-
}
|
|
335
|
-
|
|
319
|
+
};
|
|
320
|
+
await rulesStorage.insert(rule);
|
|
321
|
+
const newRule = { ...rule, isUserBlocked: false };
|
|
322
|
+
const insertDuplicate = async () => await rulesStorage.insert(newRule);
|
|
323
|
+
expect(await insertDuplicate()).to.not.throw;
|
|
336
324
|
});
|
|
337
325
|
it("globalAndClientCanHaveSameIp", async () => {
|
|
338
326
|
await rulesStorage.insert({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ip.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/rules/mongoose/ip.unit.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ip.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/rules/mongoose/ip.unit.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/user-access-policy",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"storage:benchmark:mongoose:measure-find": "npm run storage:benchmark:mongoose -- measure-find --db-url=mongodb://localhost:27017 --target-ip-v4=0.0.136.184 --target-ip-v6=0000:0000:0000:0000:0000:0000:0000:7530"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@prosopo/api-route": "2.
|
|
27
|
-
"@prosopo/common": "2.
|
|
28
|
-
"@prosopo/types": "2.
|
|
26
|
+
"@prosopo/api-route": "2.4.2",
|
|
27
|
+
"@prosopo/common": "2.4.2",
|
|
28
|
+
"@prosopo/types": "2.4.2",
|
|
29
29
|
"ip-address": "10.0.1",
|
|
30
30
|
"mongoose": "8.6.2",
|
|
31
31
|
"zod": "3.23.8"
|
package/vite.cjs.config.ts
CHANGED
package/vite.test.config.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Copyright 2021-
|
|
1
|
+
// Copyright 2021-2025 Prosopo (UK) Ltd.
|
|
2
2
|
//
|
|
3
3
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
4
|
// you may not use this file except in compliance with the License.
|
|
@@ -14,4 +14,23 @@
|
|
|
14
14
|
|
|
15
15
|
import { ViteTestConfig } from "@prosopo/config";
|
|
16
16
|
|
|
17
|
-
export default
|
|
17
|
+
export default () => {
|
|
18
|
+
const testConfig = ViteTestConfig();
|
|
19
|
+
|
|
20
|
+
return {
|
|
21
|
+
...testConfig,
|
|
22
|
+
test: {
|
|
23
|
+
// @ts-ignore
|
|
24
|
+
...testConfig.test,
|
|
25
|
+
poolOptions: {
|
|
26
|
+
// @ts-ignore
|
|
27
|
+
...testConfig.test.poolOptions,
|
|
28
|
+
forks: {
|
|
29
|
+
// @ts-ignore
|
|
30
|
+
...testConfig.test.poolOptions.forks,
|
|
31
|
+
singleFork: true,
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
};
|