@adaptivestone/framework 5.6.0 → 5.7.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 +78 -1
- package/README.md +98 -0
- package/dist/clusterRunner.js +9 -4
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +7 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +3 -0
- package/dist/codegen/astExtract.js +1 -0
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astResolve.d.ts +2 -0
- package/dist/codegen/astResolve.js +1 -0
- package/dist/codegen/astResolve.js.map +1 -1
- package/dist/codegen/emit.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +13 -2
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.d.ts +22 -14
- package/dist/controllers/Auth.js +38 -72
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +1 -1
- package/dist/controllers/Auth.routes.gen.js +1 -1
- package/dist/controllers/Health.d.ts +8 -5
- package/dist/controllers/Health.js +11 -6
- package/dist/controllers/Health.js.map +1 -1
- package/dist/controllers/Health.routes.gen.d.ts +1 -1
- package/dist/controllers/Health.routes.gen.js +1 -1
- package/dist/controllers/Home.d.ts +3 -2
- package/dist/controllers/Home.js +6 -2
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/Home.routes.gen.d.ts +1 -1
- package/dist/controllers/Home.routes.gen.js +1 -1
- package/dist/controllers/index.js +83 -42
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +21 -4
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +11 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/passwordPolicy.d.ts +23 -0
- package/dist/helpers/passwordPolicy.js +62 -0
- package/dist/helpers/passwordPolicy.js.map +1 -0
- package/dist/helpers/redis/redisConnection.d.ts +1 -0
- package/dist/helpers/redis/redisConnection.js +1 -0
- package/dist/helpers/redis/redisConnection.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -5
- package/dist/helpers/yup.js +12 -6
- package/dist/helpers/yup.js.map +1 -1
- package/dist/locales/ru/translation.json +31 -0
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.d.ts +5 -4
- package/dist/models/User.js +4 -4
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -0
- package/dist/models/UserOld.js +9 -3
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +22 -2
- package/dist/server.js +127 -18
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +16 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
- package/dist/services/http/ExpressResponseWriter.js +447 -0
- package/dist/services/http/ExpressResponseWriter.js.map +1 -0
- package/dist/services/http/HttpServer.d.ts +17 -11
- package/dist/services/http/HttpServer.js +71 -23
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/ResponseWriter.d.ts +11 -0
- package/dist/services/http/ResponseWriter.js +2 -0
- package/dist/services/http/ResponseWriter.js.map +1 -0
- package/dist/services/http/builtInResponse.d.ts +26 -0
- package/dist/services/http/builtInResponse.js +70 -0
- package/dist/services/http/builtInResponse.js.map +1 -0
- package/dist/services/http/builtinErrorHandlers.d.ts +60 -7
- package/dist/services/http/builtinErrorHandlers.js +86 -5
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/files.d.ts +21 -8
- package/dist/services/http/files.js +2 -18
- package/dist/services/http/files.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +40 -2
- package/dist/services/http/httpErrors.js +50 -2
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +37 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +9 -3
- package/dist/services/http/middleware/RequestParser.js +108 -36
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/responses.d.ts +114 -0
- package/dist/services/http/responses.js +191 -0
- package/dist/services/http/responses.js.map +1 -0
- package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
- package/dist/services/http/routing/ExpressAdapter.js +82 -9
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidationError.d.ts +8 -1
- package/dist/services/validate/ValidationError.js +10 -2
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,18 +1,31 @@
|
|
|
1
|
+
import { type File as ParsedFile, PersistentFile } from 'formidable';
|
|
1
2
|
/**
|
|
2
3
|
* Uploaded-file type. Today it aliases formidable's `PersistentFile`; the
|
|
3
4
|
* future transport-neutral parser swap (P3) re-points it at the web-standard
|
|
4
5
|
* `File`. Import this instead of the concrete parser class so your file
|
|
5
6
|
* validation survives that swap untouched.
|
|
6
7
|
*
|
|
7
|
-
* Validate uploads with
|
|
8
|
+
* Validate uploads with an `instanceof` check. A file field always arrives as
|
|
9
|
+
* an array; check the array as a whole, so an error stays under the field name
|
|
10
|
+
* (a per-element check reports `avatar[0]`, not `avatar`):
|
|
8
11
|
*
|
|
9
12
|
* import { File } from '@adaptivestone/framework/types.js';
|
|
10
|
-
*
|
|
11
|
-
* //
|
|
12
|
-
* //
|
|
13
|
-
* //
|
|
13
|
+
* const files = (v: unknown) => Array.isArray(v) && v.every((f) => f instanceof File);
|
|
14
|
+
* // zod: z.custom<File[]>(files, 'not a file')
|
|
15
|
+
* // valibot: v.custom<File[]>(files, 'not a file')
|
|
16
|
+
* // arktype: type('unknown').narrow((v, ctx) => files(v) || ctx.mustBe('an array of files'))
|
|
17
|
+
* // yup: mixed<File[]>().test('file', 'not a file', files)
|
|
14
18
|
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
19
|
+
* A missing field fails these checks; for an optional one, let `files` also
|
|
20
|
+
* accept `undefined`.
|
|
21
|
+
*
|
|
22
|
+
* `File` is both a value (the parser's class, for `instanceof`) and a type
|
|
23
|
+
* (an upload with `filepath`, `mimetype`, `originalFilename`, `size`, …).
|
|
17
24
|
*/
|
|
18
|
-
export
|
|
25
|
+
export type File = InstanceType<typeof PersistentFile> & ParsedFile;
|
|
26
|
+
interface FileClass {
|
|
27
|
+
new (...args: ConstructorParameters<typeof PersistentFile>): File;
|
|
28
|
+
readonly prototype: File;
|
|
29
|
+
}
|
|
30
|
+
export declare const File: FileClass;
|
|
31
|
+
export {};
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* future transport-neutral parser swap (P3) re-points it at the web-standard
|
|
4
|
-
* `File`. Import this instead of the concrete parser class so your file
|
|
5
|
-
* validation survives that swap untouched.
|
|
6
|
-
*
|
|
7
|
-
* Validate uploads with your validator's idiomatic `instanceof` check:
|
|
8
|
-
*
|
|
9
|
-
* import { File } from '@adaptivestone/framework/types.js';
|
|
10
|
-
* // zod: z.instanceof(File)
|
|
11
|
-
* // valibot: v.instance(File)
|
|
12
|
-
* // arktype: type.instanceOf(File)
|
|
13
|
-
* // yup: mixed().test('file', 'not a file', (v) => v instanceof File)
|
|
14
|
-
*
|
|
15
|
-
* `File` is both a value (for `instanceof`) and a type (for annotations),
|
|
16
|
-
* because it is a class.
|
|
17
|
-
*/
|
|
18
|
-
export { PersistentFile as File } from 'formidable';
|
|
1
|
+
import { PersistentFile } from 'formidable';
|
|
2
|
+
export const File = PersistentFile;
|
|
19
3
|
//# sourceMappingURL=files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/services/http/files.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/services/http/files.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,cAAc,EAAE,MAAM,YAAY,CAAC;AAgCrE,MAAM,CAAC,MAAM,IAAI,GAAG,cAAsC,CAAC"}
|
|
@@ -31,6 +31,29 @@ export interface HttpErrorBodyDetails {
|
|
|
31
31
|
errors?: never;
|
|
32
32
|
}
|
|
33
33
|
export type HttpErrorDetails = HttpErrorContractDetails | HttpErrorBodyDetails;
|
|
34
|
+
/**
|
|
35
|
+
* The `error` codes of the framework's validation, routing, body-parsing and
|
|
36
|
+
* server error responses, so a client can tell them apart without parsing the
|
|
37
|
+
* translated `message`.
|
|
38
|
+
*/
|
|
39
|
+
export declare const FRAMEWORK_ERROR_CODES: {
|
|
40
|
+
/** 400: a `params:`/`request:`/`query:` schema rejected the input (also the Mongoose safety nets). */
|
|
41
|
+
readonly validationFailed: 'VALIDATION_FAILED';
|
|
42
|
+
/** 400: the URL path could not be decoded. */
|
|
43
|
+
readonly malformedUrl: 'MALFORMED_URL';
|
|
44
|
+
/** 400: the request body could not be parsed. */
|
|
45
|
+
readonly malformedBody: 'MALFORMED_BODY';
|
|
46
|
+
/** 404: no route matches the path. */
|
|
47
|
+
readonly notFound: 'NOT_FOUND';
|
|
48
|
+
/** 405: a route matches the path, but not the method. */
|
|
49
|
+
readonly methodNotAllowed: 'METHOD_NOT_ALLOWED';
|
|
50
|
+
/** 413: the request body exceeds the configured limits. */
|
|
51
|
+
readonly payloadTooLarge: 'PAYLOAD_TOO_LARGE';
|
|
52
|
+
/** 415: the route accepts none of the request's content type. */
|
|
53
|
+
readonly unsupportedContentType: 'UNSUPPORTED_CONTENT_TYPE';
|
|
54
|
+
/** 500: an error nothing in the error-handler registry resolved. */
|
|
55
|
+
readonly serverError: 'SERVER_ERROR';
|
|
56
|
+
};
|
|
34
57
|
/**
|
|
35
58
|
* Throwable HTTP errors — the deliberate way to produce a status from deep
|
|
36
59
|
* business logic without threading `res`. Thrown from a route handler or a
|
|
@@ -38,9 +61,9 @@ export type HttpErrorDetails = HttpErrorContractDetails | HttpErrorBodyDetails;
|
|
|
38
61
|
* (`HttpServer.registerErrorHandler`) via a built-in mapper:
|
|
39
62
|
* `status` + `{ error?: code, message, errors? }` (message translated via
|
|
40
63
|
* `i18nKey`, field errors like request validation) or a custom `body`, logged
|
|
41
|
-
* at `verbose` (control flow, not a defect).
|
|
64
|
+
* at `verbose` (control flow, not a defect), or `error` for a 5xx.
|
|
42
65
|
* Subclass for other statuses, or construct the base directly:
|
|
43
|
-
* `new HttpError(
|
|
66
|
+
* `new HttpError(402, 'Payment required')`.
|
|
44
67
|
*/
|
|
45
68
|
export declare class HttpError extends Error {
|
|
46
69
|
readonly status: number;
|
|
@@ -81,3 +104,18 @@ export declare class ConflictError extends HttpError {
|
|
|
81
104
|
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
82
105
|
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
83
106
|
}
|
|
107
|
+
export declare class UnprocessableEntityError extends HttpError {
|
|
108
|
+
constructor(message?: string | HttpErrorDetails);
|
|
109
|
+
}
|
|
110
|
+
export declare class TooManyRequestsError extends HttpError {
|
|
111
|
+
constructor(message?: string | HttpErrorDetails);
|
|
112
|
+
}
|
|
113
|
+
export declare class InternalServerError extends HttpError {
|
|
114
|
+
constructor(message?: string | HttpErrorDetails);
|
|
115
|
+
}
|
|
116
|
+
export declare class BadGatewayError extends HttpError {
|
|
117
|
+
constructor(message?: string | HttpErrorDetails);
|
|
118
|
+
}
|
|
119
|
+
export declare class ServiceUnavailableError extends HttpError {
|
|
120
|
+
constructor(message?: string | HttpErrorDetails);
|
|
121
|
+
}
|
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
import { makeOncePerClassWarner } from '../../helpers/deprecation.js';
|
|
2
2
|
import { ValidationError, } from '../validate/ValidationError.js';
|
|
3
|
+
/**
|
|
4
|
+
* The `error` codes of the framework's validation, routing, body-parsing and
|
|
5
|
+
* server error responses, so a client can tell them apart without parsing the
|
|
6
|
+
* translated `message`.
|
|
7
|
+
*/
|
|
8
|
+
export const FRAMEWORK_ERROR_CODES = {
|
|
9
|
+
/** 400: a `params:`/`request:`/`query:` schema rejected the input (also the Mongoose safety nets). */
|
|
10
|
+
validationFailed: 'VALIDATION_FAILED',
|
|
11
|
+
/** 400: the URL path could not be decoded. */
|
|
12
|
+
malformedUrl: 'MALFORMED_URL',
|
|
13
|
+
/** 400: the request body could not be parsed. */
|
|
14
|
+
malformedBody: 'MALFORMED_BODY',
|
|
15
|
+
/** 404: no route matches the path. */
|
|
16
|
+
notFound: 'NOT_FOUND',
|
|
17
|
+
/** 405: a route matches the path, but not the method. */
|
|
18
|
+
methodNotAllowed: 'METHOD_NOT_ALLOWED',
|
|
19
|
+
/** 413: the request body exceeds the configured limits. */
|
|
20
|
+
payloadTooLarge: 'PAYLOAD_TOO_LARGE',
|
|
21
|
+
/** 415: the route accepts none of the request's content type. */
|
|
22
|
+
unsupportedContentType: 'UNSUPPORTED_CONTENT_TYPE',
|
|
23
|
+
/** 500: an error nothing in the error-handler registry resolved. */
|
|
24
|
+
serverError: 'SERVER_ERROR',
|
|
25
|
+
};
|
|
3
26
|
const CONTRACT_FIELDS = ['code', 'i18nKey', 'errors'];
|
|
4
27
|
const warnBodyMixed = makeOncePerClassWarner('ASF_HTTP_ERROR_BODY_MIXED', (name, ignored) => `${name} received body together with ${String(ignored)}. body replaces the whole response, so those are ignored. Pass body alone, or drop it to answer { error?, message, errors? }.`, 'Warning');
|
|
5
28
|
const warnBodyArgument = makeOncePerClassWarner('ASF_DEP_HTTP_ERROR_BODY', (name) => `${name} received the positional body argument, which is deprecated. Use the details object instead: { message, errors } for field errors, or { message, body } for a custom body. The argument will be removed in v6.`);
|
|
@@ -10,9 +33,9 @@ const warnBodyArgument = makeOncePerClassWarner('ASF_DEP_HTTP_ERROR_BODY', (name
|
|
|
10
33
|
* (`HttpServer.registerErrorHandler`) via a built-in mapper:
|
|
11
34
|
* `status` + `{ error?: code, message, errors? }` (message translated via
|
|
12
35
|
* `i18nKey`, field errors like request validation) or a custom `body`, logged
|
|
13
|
-
* at `verbose` (control flow, not a defect).
|
|
36
|
+
* at `verbose` (control flow, not a defect), or `error` for a 5xx.
|
|
14
37
|
* Subclass for other statuses, or construct the base directly:
|
|
15
|
-
* `new HttpError(
|
|
38
|
+
* `new HttpError(402, 'Payment required')`.
|
|
16
39
|
*/
|
|
17
40
|
export class HttpError extends Error {
|
|
18
41
|
status;
|
|
@@ -79,4 +102,29 @@ export class ConflictError extends HttpError {
|
|
|
79
102
|
super(409, message, body);
|
|
80
103
|
}
|
|
81
104
|
}
|
|
105
|
+
export class UnprocessableEntityError extends HttpError {
|
|
106
|
+
constructor(message = 'Unprocessable entity') {
|
|
107
|
+
super(422, message);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
export class TooManyRequestsError extends HttpError {
|
|
111
|
+
constructor(message = 'Too many requests') {
|
|
112
|
+
super(429, message);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
export class InternalServerError extends HttpError {
|
|
116
|
+
constructor(message = 'Internal server error') {
|
|
117
|
+
super(500, message);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
export class BadGatewayError extends HttpError {
|
|
121
|
+
constructor(message = 'Bad gateway') {
|
|
122
|
+
super(502, message);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
export class ServiceUnavailableError extends HttpError {
|
|
126
|
+
constructor(message = 'Service unavailable') {
|
|
127
|
+
super(503, message);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
82
130
|
//# sourceMappingURL=httpErrors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpErrors.js","sourceRoot":"","sources":["../../../src/services/http/httpErrors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"httpErrors.js","sourceRoot":"","sources":["../../../src/services/http/httpErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,EACL,eAAe,GAEhB,MAAM,gCAAgC,CAAC;AAoCxC;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,sGAAsG;IACtG,gBAAgB,EAAE,mBAAmB;IACrC,8CAA8C;IAC9C,YAAY,EAAE,eAAe;IAC7B,iDAAiD;IACjD,aAAa,EAAE,gBAAgB;IAC/B,sCAAsC;IACtC,QAAQ,EAAE,WAAW;IACrB,yDAAyD;IACzD,gBAAgB,EAAE,oBAAoB;IACtC,2DAA2D;IAC3D,eAAe,EAAE,mBAAmB;IACpC,iEAAiE;IACjE,sBAAsB,EAAE,0BAA0B;IAClD,oEAAoE;IACpE,WAAW,EAAE,cAAc;CACnB,CAAC;AAEX,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAU,CAAC;AAE/D,MAAM,aAAa,GAAG,sBAAsB,CAC1C,2BAA2B,EAC3B,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAChB,GAAG,IAAI,gCAAgC,MAAM,CAAC,OAAO,CAAC,+HAA+H,EACvL,SAAS,CACV,CAAC;AAEF,MAAM,gBAAgB,GAAG,sBAAsB,CAC7C,yBAAyB,EACzB,CAAC,IAAI,EAAE,EAAE,CACP,GAAG,IAAI,gNAAgN,CAC1N,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,OAAO,SAAU,SAAQ,KAAK;IACzB,MAAM,CAAS;IAExB,4FAA4F;IACnF,IAAI,CAAW;IAEf,IAAI,CAAU;IAEd,OAAO,CAAU;IAE1B,2EAA2E;IAClE,MAAM,CAAkC;IACjD,+CAA+C;IACtC,OAAO,CAA0B;IAS1C,YACE,MAAc,EACd,OAAkC,EAClC,IAAc;QAEd,MAAM,OAAO,GACX,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,gBAAgB,CAAC,IAAI,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,oEAAoE;YACpE,qEAAqE;YACrE,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;YACxE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,aAAa,CAAC,IAAI,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAChD,CAAC;YACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACzB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAI5C,YACE,OAAO,GAA8B,aAAa,EAClD,IAAc;QAEd,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IAI9C,YACE,OAAO,GAA8B,cAAc,EACnD,IAAc;QAEd,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,SAAS;IAI3C,YACE,OAAO,GAA8B,WAAW,EAChD,IAAc;QAEd,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,SAAS;IAI1C,YACE,OAAO,GAA8B,WAAW,EAChD,IAAc;QAEd,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,SAAS;IAI1C,YAAY,OAAO,GAA8B,UAAU,EAAE,IAAc;QACzE,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACrD,YAAY,OAAO,GAA8B,sBAAsB;QACrE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IACjD,YAAY,OAAO,GAA8B,mBAAmB;QAClE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IAChD,YAAY,OAAO,GAA8B,uBAAuB;QACtE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5C,YAAY,OAAO,GAA8B,aAAa;QAC5D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IACpD,YAAY,OAAO,GAA8B,qBAAqB;QACpE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;CACF"}
|
|
@@ -28,6 +28,11 @@ class Cors extends AbstractMiddleware {
|
|
|
28
28
|
// response varies by it. `vary` appends instead of replacing other values.
|
|
29
29
|
res.vary('Origin');
|
|
30
30
|
for (const host of origins) {
|
|
31
|
+
// Global/sticky regexes update lastIndex on test(), making the result
|
|
32
|
+
// depend on which request used this middleware instance most recently.
|
|
33
|
+
if (host instanceof RegExp) {
|
|
34
|
+
host.lastIndex = 0;
|
|
35
|
+
}
|
|
31
36
|
if ((typeof host === 'string' && req.headers.origin === host) ||
|
|
32
37
|
(host instanceof RegExp && host.test(req.headers.origin ?? ''))) {
|
|
33
38
|
res.set('Access-Control-Allow-Origin', req.headers.origin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,YACE,GAAS,EACT,MAIC;QAED,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,yEAAyE;QACzE,0EAA0E;QAC1E,sBAAsB;QACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IACE,MAAM,YAAY,MAAM;gBACxB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAChE,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,eAAe,MAAM,CAAC,MAAM,kGAAkG,CAC/H,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,sEAAsE;QACtE,2EAA2E;QAC3E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,OAA8B,EAAE,CAAC;YAClD,IACE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC;gBACzD,CAAC,IAAI,YAAY,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,EAC/D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE3D,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC7B,GAAG,CAAC,GAAG,CACL,8BAA8B,EAC9B,gCAAgC,CACjC,CAAC;oBACF,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBAE3C,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;oBACrE,IAAI,cAAc,EAAE,CAAC;wBACnB,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;oBAC1D,CAAC;oBACD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBAC/B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;gBACnB,CAAC;gBAED,6DAA6D;gBAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,EAAE,cAEvB,CAAC;gBACd,IAAI,cAAc,EAAE,MAAM,EAAE,CAAC;oBAC3B,GAAG,CAAC,GAAG,CAAC,+BAA+B,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
import { BlockList, isIP } from 'node:net';
|
|
2
2
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
3
|
+
/** Accept standard IPs plus the common IPv4:port and [IPv6]:port proxy forms. */
|
|
4
|
+
function forwardedIpAddress(value) {
|
|
5
|
+
if (isIP(value)) {
|
|
6
|
+
return value;
|
|
7
|
+
}
|
|
8
|
+
const ipv4WithPort = /^(\d{1,3}(?:\.\d{1,3}){3}):(\d{1,5})$/.exec(value);
|
|
9
|
+
const ipv6WithPort = /^\[([^\]]+)\]:(\d{1,5})$/.exec(value);
|
|
10
|
+
const address = ipv4WithPort?.[1] ?? ipv6WithPort?.[1];
|
|
11
|
+
const port = Number(ipv4WithPort?.[2] ?? ipv6WithPort?.[2]);
|
|
12
|
+
if (address &&
|
|
13
|
+
Number.isInteger(port) &&
|
|
14
|
+
port >= 0 &&
|
|
15
|
+
port <= 65535 &&
|
|
16
|
+
isIP(address) > 0) {
|
|
17
|
+
return address;
|
|
18
|
+
}
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
3
21
|
class IpDetector extends AbstractMiddleware {
|
|
4
22
|
static get description() {
|
|
5
23
|
return 'Detect real user IP address. Support proxy and load balancer';
|
|
@@ -52,14 +70,15 @@ class IpDetector extends AbstractMiddleware {
|
|
|
52
70
|
const candidate = entries[i];
|
|
53
71
|
// A non-IP entry means the left part of the chain is attacker-
|
|
54
72
|
// controlled garbage — stop and keep the last trustworthy value.
|
|
55
|
-
|
|
73
|
+
const address = forwardedIpAddress(candidate);
|
|
74
|
+
if (!address) {
|
|
56
75
|
break;
|
|
57
76
|
}
|
|
58
|
-
ip =
|
|
77
|
+
ip = address;
|
|
59
78
|
// addressType must be per-candidate: an IPv6 socket can still carry
|
|
60
79
|
// IPv4 entries in the header (and vice versa).
|
|
61
|
-
const type =
|
|
62
|
-
if (!this.blockList.check(
|
|
80
|
+
const type = address.includes(':') ? 'ipv6' : 'ipv4';
|
|
81
|
+
if (!this.blockList.check(address, type)) {
|
|
63
82
|
// first untrusted hop = the client
|
|
64
83
|
break;
|
|
65
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IpDetector.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/IpDetector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"IpDetector.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/IpDetector.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ class Pagination extends AbstractMiddleware {
|
|
|
58
58
|
// configured default — never 0, which Mongoose treats as "no limit" and
|
|
59
59
|
// would bypass `maxLimit`. Then clamp to `maxLimit`.
|
|
60
60
|
const requestedLimit = typeof req?.query?.limit === 'string'
|
|
61
|
-
?
|
|
61
|
+
? Math.trunc(Number(req.query.limit))
|
|
62
62
|
: limit;
|
|
63
63
|
let effectiveLimit = Number.isFinite(requestedLimit) && requestedLimit > 0
|
|
64
64
|
? requestedLimit
|
|
@@ -66,7 +66,9 @@ class Pagination extends AbstractMiddleware {
|
|
|
66
66
|
if (effectiveLimit > maxLimit) {
|
|
67
67
|
effectiveLimit = maxLimit;
|
|
68
68
|
}
|
|
69
|
-
const requestedPage = typeof req?.query?.page === 'string'
|
|
69
|
+
const requestedPage = typeof req?.query?.page === 'string'
|
|
70
|
+
? Math.trunc(Number(req.query.page))
|
|
71
|
+
: 1;
|
|
70
72
|
// A malformed, non-positive or absurdly large page (hundreds of digits
|
|
71
73
|
// parse to Infinity) falls back to 1, so `skip` is always a safe integer.
|
|
72
74
|
let page = Number.isSafeInteger(requestedPage) && requestedPage > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG9D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAYzD,MAAM,yBAAyB,GAAG,YAAY,CAI5C,CAAC,KAAK,EAAE,EAAE;IACR,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAA4B,CAAC;IACnD,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAsC,EAAE,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7D,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,0EAA0E;QAC1E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,mBAAmB,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC,EACD;IACE,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,wBAAwB;aACtC;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,+CAA+C;aAC7D;SACF;KACF;CACF,CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAW,SAAQ,kBAAkB;IACzC,MAAM,KAAK,WAAW;QACpB,OAAO,yEAAyE,CAAC;IACnF,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAA4C,CAAC;IACtD,CAAC;IAED,MAAM,KAAK,sBAAsB;QAC/B,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GAAmD,EACnD,IAAc,EACd,IAAkB;QAElB,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAG9B,CAAC;QAEF,KAAK,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxE,QAAQ;YACN,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;QAE5E,wEAAwE;QACxE,wEAAwE;QACxE,qDAAqD;QACrD,MAAM,cAAc,GAClB,OAAO,GAAG,EAAE,KAAK,EAAE,KAAK,KAAK,QAAQ;YACnC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import type { FrameworkRequest } from '../HttpServer.ts';
|
|
|
6
6
|
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
7
7
|
import type { GetUserByTokenAppInfo } from './GetUserByToken.ts';
|
|
8
8
|
declare class RateLimiter extends AbstractMiddleware {
|
|
9
|
+
#private;
|
|
9
10
|
static get description(): string;
|
|
10
11
|
finalOptions: typeof rateLimiterConfig;
|
|
11
12
|
limiter: RateLimiterAbstract;
|
|
@@ -3,7 +3,7 @@ import merge from 'deepmerge';
|
|
|
3
3
|
import mongoose from 'mongoose';
|
|
4
4
|
import { RateLimiterMemory, RateLimiterMongo, RateLimiterRedis, } from 'rate-limiter-flexible';
|
|
5
5
|
import { makeOncePerClassWarner } from '../../../helpers/deprecation.js';
|
|
6
|
-
import { HttpError } from '../httpErrors.js';
|
|
6
|
+
import { FRAMEWORK_ERROR_CODES, HttpError } from '../httpErrors.js';
|
|
7
7
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
8
8
|
const warnMisspelledKeyOverride = makeOncePerClassWarner('ASF_DEP_RATE_LIMITER_KEY_METHOD', (name) => `Middleware "${name}" overrides RateLimiter.gerenateConsumeKey, which is renamed to generateConsumeKey. Rename the override — the old name will be removed in v6.`);
|
|
9
9
|
class RateLimiter extends AbstractMiddleware {
|
|
@@ -19,6 +19,8 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
19
19
|
* first request.
|
|
20
20
|
*/
|
|
21
21
|
whenReady = Promise.resolve();
|
|
22
|
+
/** The shared-bucket warning is logged once per limiter. */
|
|
23
|
+
#warnedSharedBucket = false;
|
|
22
24
|
constructor(app, params) {
|
|
23
25
|
super(app, params);
|
|
24
26
|
const limiterOptions = this.app.getConfig('rateLimiter');
|
|
@@ -65,6 +67,7 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
65
67
|
this.limiter = new RateLimiterRedis({
|
|
66
68
|
storeClient: redisClient,
|
|
67
69
|
useRedisPackage: true,
|
|
70
|
+
rejectIfRedisNotReady: true,
|
|
68
71
|
// Memory fallback so a Redis outage doesn't drop limiting entirely; the
|
|
69
72
|
// library serves from this when the store errors, and doc-10's fail-open
|
|
70
73
|
// in `consumeResult` is the last resort.
|
|
@@ -74,12 +77,22 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
74
77
|
}
|
|
75
78
|
catch (e) {
|
|
76
79
|
// Leave `this.limiter` undefined so `middleware()` returns 500 (same as an
|
|
77
|
-
// unknown driver) rather than crashing — e.g. `@redis/client` not
|
|
78
|
-
|
|
80
|
+
// unknown driver) rather than crashing — e.g. `@redis/client` not
|
|
81
|
+
// installed, or a malformed `redis.url` the client cannot parse.
|
|
82
|
+
this.logger?.error(`RateLimiter redis init failed, so its routes answer 500: ${e}. Check that redis.url (REDIS_URI) is a valid redis:// or rediss:// URL and that '@redis/client' is installed.`);
|
|
79
83
|
}
|
|
80
84
|
}
|
|
81
85
|
generateConsumeKey(req) {
|
|
82
86
|
const { ip, route, user, request } = this.finalOptions.consumeKeyComponents;
|
|
87
|
+
// Concrete URLs are attacker-controlled: aliases and different IDs
|
|
88
|
+
// must consume the registered route's budget. A global/unmatched limiter
|
|
89
|
+
// uses one fixed bucket until routing has established a template.
|
|
90
|
+
const method = req.method === 'HEAD' &&
|
|
91
|
+
req.route?.methods?.get &&
|
|
92
|
+
!req.route?.methods?.head
|
|
93
|
+
? 'GET'
|
|
94
|
+
: (req.method ?? 'ALL');
|
|
95
|
+
const routePath = req.route?.path ?? 'unmatched';
|
|
83
96
|
const key = [];
|
|
84
97
|
if (ip) {
|
|
85
98
|
if (!req.appInfo.ip) {
|
|
@@ -90,18 +103,14 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
90
103
|
}
|
|
91
104
|
}
|
|
92
105
|
if (route) {
|
|
93
|
-
|
|
94
|
-
// must consume the registered route's budget. A global/unmatched limiter
|
|
95
|
-
// uses one fixed bucket until routing has established a template.
|
|
96
|
-
const method = req.method === 'HEAD' &&
|
|
97
|
-
req.route?.methods?.get &&
|
|
98
|
-
!req.route?.methods?.head
|
|
99
|
-
? 'GET'
|
|
100
|
-
: (req.method ?? 'ALL');
|
|
101
|
-
key.push(`${method}:${req.route?.path ?? 'unmatched'}`);
|
|
106
|
+
key.push(`${method}:${routePath}`);
|
|
102
107
|
}
|
|
108
|
+
// Only a truthy id identifies a user (a model with `id: false` has none);
|
|
109
|
+
// the key keeps the empty part as before.
|
|
110
|
+
let identified = false;
|
|
103
111
|
if (user && req.appInfo?.user) {
|
|
104
112
|
key.push(req.appInfo?.user.id);
|
|
113
|
+
identified = Boolean(req.appInfo.user.id);
|
|
105
114
|
}
|
|
106
115
|
if (request?.length) {
|
|
107
116
|
// Raw body, before validation: fold the spellings a normalizing lookup
|
|
@@ -122,8 +131,20 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
122
131
|
// out of stored keys and the 429 log line.
|
|
123
132
|
if (fields.length) {
|
|
124
133
|
key.push(createHash('sha256').update(JSON.stringify(fields)).digest('hex'));
|
|
134
|
+
identified = true;
|
|
125
135
|
}
|
|
126
136
|
}
|
|
137
|
+
// Without ip, all requests lacking every enabled identity share one
|
|
138
|
+
// bucket per route. With every identity disabled, that shared bucket is
|
|
139
|
+
// the intended per-route budget.
|
|
140
|
+
if (!ip &&
|
|
141
|
+
(user || request?.length) &&
|
|
142
|
+
!identified &&
|
|
143
|
+
!this.#warnedSharedBucket) {
|
|
144
|
+
this.#warnedSharedBucket = true;
|
|
145
|
+
const missing = [...(user ? ['user'] : []), ...(request ?? [])];
|
|
146
|
+
this.logger?.warn(`RateLimiter on ${method} ${routePath}: ip is disabled and this request has no ${missing.join(' or ')}, so such requests share one rate-limit bucket. Enable ip in consumeKeyComponents, or limit only routes where the identity is always present.`);
|
|
147
|
+
}
|
|
127
148
|
return key.join('_');
|
|
128
149
|
}
|
|
129
150
|
/** @deprecated Misspelled; use {@link generateConsumeKey}. Removed in v6. */
|
|
@@ -158,7 +179,10 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
158
179
|
await this.whenReady;
|
|
159
180
|
if (!this.limiter) {
|
|
160
181
|
this.logger?.info(`RateLimiter not inited correclty! Please check init logs `);
|
|
161
|
-
return res.status(500).json({
|
|
182
|
+
return res.status(500).json({
|
|
183
|
+
error: FRAMEWORK_ERROR_CODES.serverError,
|
|
184
|
+
message: 'RateLimiter error',
|
|
185
|
+
});
|
|
162
186
|
}
|
|
163
187
|
// The redis `namespace` prefixes the consume key regardless of driver
|
|
164
188
|
// (memory/mongo too) — intentional, so keys stay stable across a driver
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
import type { NextFunction, Response } from 'express';
|
|
2
2
|
import type { FrameworkRequest } from '../HttpServer.ts';
|
|
3
3
|
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
4
|
+
/** Built-in body formats that other media types can be parsed as. */
|
|
5
|
+
export type RequestBodyFormat = 'json' | 'urlencoded';
|
|
4
6
|
/**
|
|
5
7
|
* Parses multipart / urlencoded / json request bodies (via formidable) into
|
|
6
8
|
* `req.body`. Size and count limits come from `config.http.requestParser`
|
|
7
|
-
* (explicit per-mount params override them)
|
|
9
|
+
* (explicit per-mount params override them), and so do extra media types to
|
|
10
|
+
* parse as JSON or urlencoded (`mediaTypes`). Spooled upload temp files are
|
|
8
11
|
* unlinked once the response finishes — a handler that needs to keep an upload
|
|
9
|
-
* MUST move or copy it (e.g. `fs.rename`) before responding.
|
|
12
|
+
* MUST move or copy it (e.g. `fs.rename`) before responding. An oversized body
|
|
13
|
+
* (413) or an unparsable one (400) is passed on as an `HttpError`, so the
|
|
14
|
+
* error-handler registry answers it.
|
|
10
15
|
*/
|
|
11
16
|
declare class RequestParser extends AbstractMiddleware {
|
|
17
|
+
#private;
|
|
12
18
|
static get description(): string;
|
|
13
|
-
middleware(req: FrameworkRequest, res: Response, next: NextFunction): Promise<void | Response
|
|
19
|
+
middleware(req: FrameworkRequest, res: Response, next: NextFunction): Promise<void | Response>;
|
|
14
20
|
}
|
|
15
21
|
export default RequestParser;
|