@getstrata/core 3.0.5 → 3.0.8
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 +22 -9
- package/README.md +17 -9
- package/dist/core/auth/policy.d.ts +4 -1
- package/dist/core/auth/saml/samlServiceProvider.d.ts +2 -3
- package/dist/core/cache/store.d.ts +2 -2
- package/dist/core/cache/tokens.d.ts +1 -1
- package/dist/core/config/envSchema.d.ts +13 -0
- package/dist/core/contracts/application.d.ts +4 -0
- package/dist/core/contracts/di.d.ts +2 -2
- package/dist/core/contracts/provider.d.ts +13 -0
- package/dist/core/contracts/serviceTokens.d.ts +12 -11
- package/dist/core/database/factory.d.ts +3 -0
- package/dist/core/database/index.d.ts +1 -1
- package/dist/core/database/migrations/declaration.d.ts +11 -0
- package/dist/core/database/migrations/runner.d.ts +2 -0
- package/dist/core/database/model.d.ts +16 -3
- package/dist/core/database/modelQuery.d.ts +1 -10
- package/dist/core/database/modelRelationLoader.d.ts +31 -0
- package/dist/core/database/mysqlConnection.d.ts +2 -2
- package/dist/core/database/mysqlNative.d.ts +2 -0
- package/dist/core/database/ormRuntime.d.ts +1 -1
- package/dist/core/database/rawMysql.d.ts +1 -1
- package/dist/core/events/eventBusClass.d.ts +6 -3
- package/dist/core/events/index.d.ts +1 -1
- package/dist/core/http/formRequest.d.ts +2 -0
- package/dist/core/http/loginThrottleMiddleware.d.ts +1 -2
- package/dist/core/http/memoryThrottleMiddleware.d.ts +1 -3
- package/dist/core/http/webFormRequest.d.ts +3 -5
- package/dist/core/mail/mailer.d.ts +6 -3
- package/dist/core/mail/markdownMailable.d.ts +2 -2
- package/dist/core/notifications/dispatcher.d.ts +5 -5
- package/dist/core/notifications/index.d.ts +1 -1
- package/dist/core/notifications/types.d.ts +9 -2
- package/dist/core/queue/index.d.ts +8 -3
- package/dist/core/queue/queueHandoff.d.ts +2 -2
- package/dist/core/runtime/application.d.ts +2 -0
- package/dist/core/security/oauthState.d.ts +12 -2
- package/dist/core/security/safeUrl.d.ts +1 -11
- package/dist/core/storage/storage.d.ts +23 -6
- package/dist/core/testing.d.ts +5 -0
- package/dist/core/testingState.d.ts +22 -0
- package/dist/entries/audit/exportAuditLogs.js +1 -0
- package/dist/entries/auth/intendedUrlCookie.js +68 -2
- package/dist/entries/auth/jwt.js +68 -6
- package/dist/entries/auth/jwtGuard.js +76 -12
- package/dist/entries/auth/oauth/samlProvider.js +4 -5
- package/dist/entries/auth/passwordConfirmCookie.js +69 -3
- package/dist/entries/auth/saml/samlServiceProvider.js +5 -7
- package/dist/entries/auth/sessionCookie.js +69 -6
- package/dist/entries/auth/sessionGuard.js +69 -6
- package/dist/entries/cache/repository.js +4 -5
- package/dist/entries/config/envSchema.js +13 -0
- package/dist/entries/contracts/serviceTokens.js +2 -0
- package/dist/entries/database/bindings.js +18 -90
- package/dist/entries/database/factory.js +4 -0
- package/dist/entries/database/migrations.js +714 -1
- package/dist/entries/http/formRequest.js +12 -6
- package/dist/entries/http/memoryThrottleMiddleware.js +7 -9
- package/dist/entries/http/pagination.js +4 -4
- package/dist/entries/http/parseMultipartUpload.js +62 -9
- package/dist/entries/http/routeModelBinding.js +4 -4
- package/dist/entries/http/securedRouteModelBinding.js +4 -4
- package/dist/entries/http/uploads.js +62 -9
- package/dist/entries/http/validation.js +4 -4
- package/dist/entries/http/webFormRequest.js +74 -95
- package/dist/entries/jobs/exportAuditLogsJob.js +9 -4
- package/dist/entries/jobs/invalidateCacheTagsJob.js +9 -4
- package/dist/entries/queue/createAppQueue.js +10 -5
- package/dist/entries/queue/publicQueue.js +10 -5
- package/dist/entries/queue/queueWorkerTransport.js +10 -5
- package/dist/entries/queue.js +9 -4
- package/dist/entries/runtime/application.js +50 -3
- package/dist/entries/security/oauthState.js +61 -2
- package/dist/entries/security/tokenExpiry.js +62 -9
- package/dist/entries/storage/storage.js +102 -1
- package/dist/entries/testing.js +18 -0
- package/dist/framework/public-api.d.ts +16 -13
- package/dist/index.js +316 -222
- package/dist/internal/mysqlNative.js +97 -0
- package/dist/internal/ormRuntime.js +41 -4
- package/dist/internal/testingState.js +31 -0
- package/dist/types/services.d.ts +4 -1
- package/package.json +17 -4
|
@@ -27,8 +27,8 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
27
27
|
if (value === null || value.trim() === "") {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
|
-
const parsed = Number
|
|
31
|
-
if (!Number.
|
|
30
|
+
const parsed = Number(value);
|
|
31
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
32
32
|
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
33
33
|
}
|
|
34
34
|
return parsed;
|
|
@@ -124,8 +124,8 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
124
124
|
return readRequiredPositiveInt(payload, field);
|
|
125
125
|
}
|
|
126
126
|
function parsePositiveIntParam(value, name = "id") {
|
|
127
|
-
const parsed = Number
|
|
128
|
-
if (!Number.
|
|
127
|
+
const parsed = Number(value);
|
|
128
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
129
129
|
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
130
130
|
}
|
|
131
131
|
return parsed;
|
|
@@ -136,11 +136,17 @@ class FormRequest {
|
|
|
136
136
|
authorize(_request) {
|
|
137
137
|
return true;
|
|
138
138
|
}
|
|
139
|
+
validatePayload(payload) {
|
|
140
|
+
return this.parse(payload);
|
|
141
|
+
}
|
|
142
|
+
readPayload(request) {
|
|
143
|
+
return parseJsonBody(request, (payload) => payload);
|
|
144
|
+
}
|
|
139
145
|
async validate(request) {
|
|
140
|
-
if (
|
|
146
|
+
if (await this.authorize(request) !== true) {
|
|
141
147
|
throw new ForbiddenError;
|
|
142
148
|
}
|
|
143
|
-
return await
|
|
149
|
+
return this.validatePayload(await this.readPayload(request));
|
|
144
150
|
}
|
|
145
151
|
}
|
|
146
152
|
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
// ../../src/core/http/memoryThrottleMiddleware.ts
|
|
3
|
+
import { testState } from "#strata-test-state";
|
|
4
|
+
|
|
2
5
|
// ../../src/core/runtime/boundedThrottleStore.ts
|
|
3
6
|
class BoundedThrottleStore {
|
|
4
7
|
decayMs;
|
|
@@ -471,17 +474,16 @@ function createThrottleMiddleware(options) {
|
|
|
471
474
|
}
|
|
472
475
|
|
|
473
476
|
// ../../src/core/http/memoryThrottleMiddleware.ts
|
|
474
|
-
var resetGeneration = 0;
|
|
475
477
|
function createMemoryThrottleMiddleware(options) {
|
|
476
478
|
options = Object.freeze({ ...options });
|
|
477
479
|
const store = new BoundedThrottleStore(options.decaySeconds * 1000, options);
|
|
478
480
|
if (!Number.isSafeInteger(options.maxAttempts) || options.maxAttempts < 0)
|
|
479
481
|
throw new Error("Invalid memory throttle limit.");
|
|
480
|
-
let generation =
|
|
482
|
+
let generation = testState.throttleGeneration;
|
|
481
483
|
const middleware = async (request, next) => {
|
|
482
|
-
if (generation !==
|
|
484
|
+
if (generation !== testState.throttleGeneration) {
|
|
483
485
|
store.clear();
|
|
484
|
-
generation =
|
|
486
|
+
generation = testState.throttleGeneration;
|
|
485
487
|
}
|
|
486
488
|
let maxAttempts;
|
|
487
489
|
try {
|
|
@@ -498,10 +500,6 @@ function createMemoryThrottleMiddleware(options) {
|
|
|
498
500
|
};
|
|
499
501
|
return Object.assign(middleware, { dispose: () => store.dispose(), stats: () => store.stats() });
|
|
500
502
|
}
|
|
501
|
-
function resetMemoryThrottleForTests() {
|
|
502
|
-
resetGeneration++;
|
|
503
|
-
}
|
|
504
503
|
export {
|
|
505
|
-
createMemoryThrottleMiddleware
|
|
506
|
-
resetMemoryThrottleForTests
|
|
504
|
+
createMemoryThrottleMiddleware
|
|
507
505
|
};
|
|
@@ -38,8 +38,8 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
38
38
|
if (value === null || value.trim() === "") {
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
|
-
const parsed = Number
|
|
42
|
-
if (!Number.
|
|
41
|
+
const parsed = Number(value);
|
|
42
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
43
43
|
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
44
44
|
}
|
|
45
45
|
return parsed;
|
|
@@ -135,8 +135,8 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
135
135
|
return readRequiredPositiveInt(payload, field);
|
|
136
136
|
}
|
|
137
137
|
function parsePositiveIntParam(value, name = "id") {
|
|
138
|
-
const parsed = Number
|
|
139
|
-
if (!Number.
|
|
138
|
+
const parsed = Number(value);
|
|
139
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
140
140
|
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
141
141
|
}
|
|
142
142
|
return parsed;
|
|
@@ -2,6 +2,67 @@
|
|
|
2
2
|
// ../../src/core/http/parseMultipartUpload.ts
|
|
3
3
|
import { BadRequestError, PayloadTooLargeError } from "@getstrata/core/errors/http";
|
|
4
4
|
|
|
5
|
+
// ../../src/core/config/envSchema.ts
|
|
6
|
+
function defineEnvSchema(schema) {
|
|
7
|
+
return schema;
|
|
8
|
+
}
|
|
9
|
+
function validateEnv(schema, env = process.env) {
|
|
10
|
+
const resolved = {};
|
|
11
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
12
|
+
if (rule.integer) {
|
|
13
|
+
if (rule.minimum !== undefined && !Number.isSafeInteger(rule.minimum) || rule.maximum !== undefined && !Number.isSafeInteger(rule.maximum) || rule.minimum !== undefined && rule.maximum !== undefined && rule.minimum > rule.maximum) {
|
|
14
|
+
throw new TypeError(`Environment integer rule for "${name}" has invalid bounds.`);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
const rawValue = env[name];
|
|
18
|
+
if (rawValue !== undefined && typeof rawValue !== "string") {
|
|
19
|
+
throw new TypeError(`Environment variable "${name}" must be a string.`);
|
|
20
|
+
}
|
|
21
|
+
const value = rawValue === undefined || rawValue.trim() === "" ? rule.default : rawValue;
|
|
22
|
+
if (value !== undefined && typeof value !== "string") {
|
|
23
|
+
throw new TypeError(`Environment variable "${name}" must resolve to a string.`);
|
|
24
|
+
}
|
|
25
|
+
if (value === undefined || value.trim() === "") {
|
|
26
|
+
if (rule.required) {
|
|
27
|
+
throw new Error(`Missing required environment variable "${name}".`);
|
|
28
|
+
}
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
if (rule.integer) {
|
|
32
|
+
const completeInteger = /^[+-]?\d+$/.test(value.trim());
|
|
33
|
+
const parsed = Number.parseInt(value, 10);
|
|
34
|
+
const minimum = rule.minimum ?? Number.NEGATIVE_INFINITY;
|
|
35
|
+
const maximum = rule.maximum ?? Number.POSITIVE_INFINITY;
|
|
36
|
+
if (!completeInteger || !Number.isSafeInteger(parsed) || parsed < minimum || parsed > maximum) {
|
|
37
|
+
const comparison = minimum !== Number.NEGATIVE_INFINITY && maximum !== Number.POSITIVE_INFINITY ? `an integer between ${minimum} and ${maximum}` : maximum !== Number.POSITIVE_INFINITY ? `an integer <= ${maximum}` : minimum === Number.NEGATIVE_INFINITY ? "an integer" : `an integer >= ${minimum}`;
|
|
38
|
+
throw new Error(`Environment variable "${name}" must be ${comparison}.`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (rule.pattern && !new RegExp(rule.pattern.source, rule.pattern.flags).test(value)) {
|
|
42
|
+
throw new Error(`Environment variable "${name}" has an invalid format.`);
|
|
43
|
+
}
|
|
44
|
+
Object.defineProperty(resolved, name, {
|
|
45
|
+
value,
|
|
46
|
+
enumerable: true,
|
|
47
|
+
configurable: true,
|
|
48
|
+
writable: true
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return resolved;
|
|
52
|
+
}
|
|
53
|
+
function resolveEnv(schema, env = process.env) {
|
|
54
|
+
const validated = validateEnv(schema, env);
|
|
55
|
+
const resolved = {};
|
|
56
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
57
|
+
const value = validated[name];
|
|
58
|
+
Object.defineProperty(resolved, name, {
|
|
59
|
+
value: value === undefined ? undefined : rule.integer ? Number(value) : value,
|
|
60
|
+
enumerable: true
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return Object.freeze(resolved);
|
|
64
|
+
}
|
|
65
|
+
|
|
5
66
|
// ../../src/core/http/uploads.ts
|
|
6
67
|
var DEFAULT_MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
|
|
7
68
|
var ALLOWED_UPLOAD_MIME_TYPES = new Set([
|
|
@@ -21,15 +82,7 @@ var DEFAULT_UPLOAD_POLICY = Object.freeze({
|
|
|
21
82
|
allowUnknownMime: false
|
|
22
83
|
});
|
|
23
84
|
function resolveMaxUploadBytes(value) {
|
|
24
|
-
|
|
25
|
-
if (!raw) {
|
|
26
|
-
return DEFAULT_MAX_UPLOAD_BYTES;
|
|
27
|
-
}
|
|
28
|
-
const parsed = Number.parseInt(raw, 10);
|
|
29
|
-
if (!Number.isInteger(parsed) || parsed <= 0) {
|
|
30
|
-
return DEFAULT_MAX_UPLOAD_BYTES;
|
|
31
|
-
}
|
|
32
|
-
return parsed;
|
|
85
|
+
return resolveEnv({ MAX_UPLOAD_BYTES: { integer: true, minimum: 1, default: String(DEFAULT_MAX_UPLOAD_BYTES) } }, { MAX_UPLOAD_BYTES: value }).MAX_UPLOAD_BYTES;
|
|
33
86
|
}
|
|
34
87
|
function normalizeMimeType(mimeType) {
|
|
35
88
|
return mimeType.split(";")[0]?.trim().toLowerCase() ?? "";
|
|
@@ -24,8 +24,8 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
24
24
|
if (value === null || value.trim() === "") {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
const parsed = Number
|
|
28
|
-
if (!Number.
|
|
27
|
+
const parsed = Number(value);
|
|
28
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
29
29
|
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
30
30
|
}
|
|
31
31
|
return parsed;
|
|
@@ -121,8 +121,8 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
121
121
|
return readRequiredPositiveInt(payload, field);
|
|
122
122
|
}
|
|
123
123
|
function parsePositiveIntParam(value, name = "id") {
|
|
124
|
-
const parsed = Number
|
|
125
|
-
if (!Number.
|
|
124
|
+
const parsed = Number(value);
|
|
125
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
126
126
|
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
127
127
|
}
|
|
128
128
|
return parsed;
|
|
@@ -128,8 +128,8 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
128
128
|
if (value === null || value.trim() === "") {
|
|
129
129
|
return;
|
|
130
130
|
}
|
|
131
|
-
const parsed = Number
|
|
132
|
-
if (!Number.
|
|
131
|
+
const parsed = Number(value);
|
|
132
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
133
133
|
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
134
134
|
}
|
|
135
135
|
return parsed;
|
|
@@ -225,8 +225,8 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
225
225
|
return readRequiredPositiveInt(payload, field);
|
|
226
226
|
}
|
|
227
227
|
function parsePositiveIntParam(value, name = "id") {
|
|
228
|
-
const parsed = Number
|
|
229
|
-
if (!Number.
|
|
228
|
+
const parsed = Number(value);
|
|
229
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
230
230
|
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
231
231
|
}
|
|
232
232
|
return parsed;
|
|
@@ -1,4 +1,65 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
// ../../src/core/config/envSchema.ts
|
|
3
|
+
function defineEnvSchema(schema) {
|
|
4
|
+
return schema;
|
|
5
|
+
}
|
|
6
|
+
function validateEnv(schema, env = process.env) {
|
|
7
|
+
const resolved = {};
|
|
8
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
9
|
+
if (rule.integer) {
|
|
10
|
+
if (rule.minimum !== undefined && !Number.isSafeInteger(rule.minimum) || rule.maximum !== undefined && !Number.isSafeInteger(rule.maximum) || rule.minimum !== undefined && rule.maximum !== undefined && rule.minimum > rule.maximum) {
|
|
11
|
+
throw new TypeError(`Environment integer rule for "${name}" has invalid bounds.`);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
const rawValue = env[name];
|
|
15
|
+
if (rawValue !== undefined && typeof rawValue !== "string") {
|
|
16
|
+
throw new TypeError(`Environment variable "${name}" must be a string.`);
|
|
17
|
+
}
|
|
18
|
+
const value = rawValue === undefined || rawValue.trim() === "" ? rule.default : rawValue;
|
|
19
|
+
if (value !== undefined && typeof value !== "string") {
|
|
20
|
+
throw new TypeError(`Environment variable "${name}" must resolve to a string.`);
|
|
21
|
+
}
|
|
22
|
+
if (value === undefined || value.trim() === "") {
|
|
23
|
+
if (rule.required) {
|
|
24
|
+
throw new Error(`Missing required environment variable "${name}".`);
|
|
25
|
+
}
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
if (rule.integer) {
|
|
29
|
+
const completeInteger = /^[+-]?\d+$/.test(value.trim());
|
|
30
|
+
const parsed = Number.parseInt(value, 10);
|
|
31
|
+
const minimum = rule.minimum ?? Number.NEGATIVE_INFINITY;
|
|
32
|
+
const maximum = rule.maximum ?? Number.POSITIVE_INFINITY;
|
|
33
|
+
if (!completeInteger || !Number.isSafeInteger(parsed) || parsed < minimum || parsed > maximum) {
|
|
34
|
+
const comparison = minimum !== Number.NEGATIVE_INFINITY && maximum !== Number.POSITIVE_INFINITY ? `an integer between ${minimum} and ${maximum}` : maximum !== Number.POSITIVE_INFINITY ? `an integer <= ${maximum}` : minimum === Number.NEGATIVE_INFINITY ? "an integer" : `an integer >= ${minimum}`;
|
|
35
|
+
throw new Error(`Environment variable "${name}" must be ${comparison}.`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (rule.pattern && !new RegExp(rule.pattern.source, rule.pattern.flags).test(value)) {
|
|
39
|
+
throw new Error(`Environment variable "${name}" has an invalid format.`);
|
|
40
|
+
}
|
|
41
|
+
Object.defineProperty(resolved, name, {
|
|
42
|
+
value,
|
|
43
|
+
enumerable: true,
|
|
44
|
+
configurable: true,
|
|
45
|
+
writable: true
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return resolved;
|
|
49
|
+
}
|
|
50
|
+
function resolveEnv(schema, env = process.env) {
|
|
51
|
+
const validated = validateEnv(schema, env);
|
|
52
|
+
const resolved = {};
|
|
53
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
54
|
+
const value = validated[name];
|
|
55
|
+
Object.defineProperty(resolved, name, {
|
|
56
|
+
value: value === undefined ? undefined : rule.integer ? Number(value) : value,
|
|
57
|
+
enumerable: true
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
return Object.freeze(resolved);
|
|
61
|
+
}
|
|
62
|
+
|
|
2
63
|
// ../../src/core/http/uploads.ts
|
|
3
64
|
var DEFAULT_MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
|
|
4
65
|
var ALLOWED_UPLOAD_MIME_TYPES = new Set([
|
|
@@ -18,15 +79,7 @@ var DEFAULT_UPLOAD_POLICY = Object.freeze({
|
|
|
18
79
|
allowUnknownMime: false
|
|
19
80
|
});
|
|
20
81
|
function resolveMaxUploadBytes(value) {
|
|
21
|
-
|
|
22
|
-
if (!raw) {
|
|
23
|
-
return DEFAULT_MAX_UPLOAD_BYTES;
|
|
24
|
-
}
|
|
25
|
-
const parsed = Number.parseInt(raw, 10);
|
|
26
|
-
if (!Number.isInteger(parsed) || parsed <= 0) {
|
|
27
|
-
return DEFAULT_MAX_UPLOAD_BYTES;
|
|
28
|
-
}
|
|
29
|
-
return parsed;
|
|
82
|
+
return resolveEnv({ MAX_UPLOAD_BYTES: { integer: true, minimum: 1, default: String(DEFAULT_MAX_UPLOAD_BYTES) } }, { MAX_UPLOAD_BYTES: value }).MAX_UPLOAD_BYTES;
|
|
30
83
|
}
|
|
31
84
|
function normalizeMimeType(mimeType) {
|
|
32
85
|
return mimeType.split(";")[0]?.trim().toLowerCase() ?? "";
|
|
@@ -24,8 +24,8 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
24
24
|
if (value === null || value.trim() === "") {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
const parsed = Number
|
|
28
|
-
if (!Number.
|
|
27
|
+
const parsed = Number(value);
|
|
28
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
29
29
|
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
30
30
|
}
|
|
31
31
|
return parsed;
|
|
@@ -121,8 +121,8 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
121
121
|
return readRequiredPositiveInt(payload, field);
|
|
122
122
|
}
|
|
123
123
|
function parsePositiveIntParam(value, name = "id") {
|
|
124
|
-
const parsed = Number
|
|
125
|
-
if (!Number.
|
|
124
|
+
const parsed = Number(value);
|
|
125
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
126
126
|
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
127
127
|
}
|
|
128
128
|
return parsed;
|
|
@@ -1,71 +1,10 @@
|
|
|
1
1
|
// @bun
|
|
2
|
-
// ../../src/core/http/
|
|
3
|
-
import { ForbiddenError
|
|
4
|
-
|
|
5
|
-
// ../../src/core/http/contentNegotiation.ts
|
|
6
|
-
function requestPrefersJson(request) {
|
|
7
|
-
if (!request) {
|
|
8
|
-
return true;
|
|
9
|
-
}
|
|
10
|
-
let pathname;
|
|
11
|
-
try {
|
|
12
|
-
pathname = new URL(request.url).pathname;
|
|
13
|
-
} catch {
|
|
14
|
-
return true;
|
|
15
|
-
}
|
|
16
|
-
if (request.headers.get("HX-Request") === "true") {
|
|
17
|
-
return false;
|
|
18
|
-
}
|
|
19
|
-
if (pathname.startsWith("/api/")) {
|
|
20
|
-
return true;
|
|
21
|
-
}
|
|
22
|
-
const accept = request.headers.get("accept")?.toLowerCase() ?? "";
|
|
23
|
-
if (accept.includes("text/html")) {
|
|
24
|
-
return false;
|
|
25
|
-
}
|
|
26
|
-
if (accept.includes("application/json")) {
|
|
27
|
-
return true;
|
|
28
|
-
}
|
|
29
|
-
const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
|
|
30
|
-
if (contentType.includes("application/x-www-form-urlencoded") || contentType.includes("multipart/form-data")) {
|
|
31
|
-
return false;
|
|
32
|
-
}
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
// ../../src/core/http/parseFormBody.ts
|
|
37
|
-
import { BadRequestError } from "@getstrata/core/errors/http";
|
|
38
|
-
async function parseFormBody(request, options = {}) {
|
|
39
|
-
const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
|
|
40
|
-
if (!contentType.includes("application/x-www-form-urlencoded") && !contentType.includes("multipart/form-data")) {
|
|
41
|
-
throw new BadRequestError("Expected a form submission.");
|
|
42
|
-
}
|
|
43
|
-
return formDataToRecord(await request.formData(), options);
|
|
44
|
-
}
|
|
45
|
-
function formDataToRecord(formData, options = {}) {
|
|
46
|
-
if (options.preserveRepeated === true) {
|
|
47
|
-
const values = new Map;
|
|
48
|
-
for (const [key, value] of formData.entries()) {
|
|
49
|
-
const entries = values.get(key);
|
|
50
|
-
if (entries)
|
|
51
|
-
entries.push(value);
|
|
52
|
-
else
|
|
53
|
-
values.set(key, [value]);
|
|
54
|
-
}
|
|
55
|
-
return Object.fromEntries(values);
|
|
56
|
-
}
|
|
57
|
-
const values = {};
|
|
58
|
-
for (const [key, value] of formData.entries()) {
|
|
59
|
-
if (typeof value === "string") {
|
|
60
|
-
values[key] = value;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
return values;
|
|
64
|
-
}
|
|
2
|
+
// ../../src/core/http/formRequest.ts
|
|
3
|
+
import { ForbiddenError } from "@getstrata/core/errors/http";
|
|
65
4
|
|
|
66
5
|
// ../../src/core/http/validation.ts
|
|
67
6
|
import { currentAuthUser } from "@getstrata/core/auth/authContext";
|
|
68
|
-
import { BadRequestError
|
|
7
|
+
import { BadRequestError } from "@getstrata/core/errors/http";
|
|
69
8
|
import { currentTenant } from "@getstrata/core/tenant/tenantContext";
|
|
70
9
|
function buildRequestCacheKey(fallbackPath, request) {
|
|
71
10
|
if (!request) {
|
|
@@ -88,9 +27,9 @@ function parseOptionalPositiveIntQueryParam(params, name) {
|
|
|
88
27
|
if (value === null || value.trim() === "") {
|
|
89
28
|
return;
|
|
90
29
|
}
|
|
91
|
-
const parsed = Number
|
|
92
|
-
if (!Number.
|
|
93
|
-
throw new
|
|
30
|
+
const parsed = Number(value);
|
|
31
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
32
|
+
throw new BadRequestError(`Invalid query parameter "${name}". Expected a positive integer.`);
|
|
94
33
|
}
|
|
95
34
|
return parsed;
|
|
96
35
|
}
|
|
@@ -107,7 +46,7 @@ function parseOptionalBooleanQueryParam(params, name) {
|
|
|
107
46
|
case "0":
|
|
108
47
|
return false;
|
|
109
48
|
default:
|
|
110
|
-
throw new
|
|
49
|
+
throw new BadRequestError(`Invalid query parameter "${name}". Expected a boolean.`);
|
|
111
50
|
}
|
|
112
51
|
}
|
|
113
52
|
function parseOptionalEnumQueryParam(params, name, allowedValues) {
|
|
@@ -116,13 +55,13 @@ function parseOptionalEnumQueryParam(params, name, allowedValues) {
|
|
|
116
55
|
return;
|
|
117
56
|
}
|
|
118
57
|
if (!allowedValues.includes(value)) {
|
|
119
|
-
throw new
|
|
58
|
+
throw new BadRequestError(`Invalid query parameter "${name}". Expected one of: ${allowedValues.join(", ")}.`);
|
|
120
59
|
}
|
|
121
60
|
return value;
|
|
122
61
|
}
|
|
123
62
|
function expectObject(value, label = "request body") {
|
|
124
63
|
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
125
|
-
throw new
|
|
64
|
+
throw new BadRequestError(`${label} must be a JSON object.`);
|
|
126
65
|
}
|
|
127
66
|
return value;
|
|
128
67
|
}
|
|
@@ -131,24 +70,24 @@ async function parseJsonBody(request, validator) {
|
|
|
131
70
|
try {
|
|
132
71
|
payload = await request.json();
|
|
133
72
|
} catch {
|
|
134
|
-
throw new
|
|
73
|
+
throw new BadRequestError("Request body must be valid JSON.");
|
|
135
74
|
}
|
|
136
75
|
return validator(payload);
|
|
137
76
|
}
|
|
138
77
|
function readRequiredString(payload, field, options = {}) {
|
|
139
78
|
const value = payload[field];
|
|
140
79
|
if (typeof value !== "string" || value.trim() === "") {
|
|
141
|
-
throw new
|
|
80
|
+
throw new BadRequestError(`"${field}" is required and must be a string.`);
|
|
142
81
|
}
|
|
143
82
|
const trimmed = value.trim();
|
|
144
83
|
if (options.minLength !== undefined && trimmed.length < options.minLength) {
|
|
145
|
-
throw new
|
|
84
|
+
throw new BadRequestError(`"${field}" must be at least ${options.minLength} characters.`);
|
|
146
85
|
}
|
|
147
86
|
if (options.maxLength !== undefined && trimmed.length > options.maxLength) {
|
|
148
|
-
throw new
|
|
87
|
+
throw new BadRequestError(`"${field}" must be at most ${options.maxLength} characters.`);
|
|
149
88
|
}
|
|
150
89
|
if (options.pattern && !options.pattern.test(trimmed)) {
|
|
151
|
-
throw new
|
|
90
|
+
throw new BadRequestError(`"${field}" has an invalid format.`);
|
|
152
91
|
}
|
|
153
92
|
return trimmed;
|
|
154
93
|
}
|
|
@@ -161,7 +100,7 @@ function readOptionalString(payload, field, options = {}) {
|
|
|
161
100
|
function readRequiredEnum(payload, field, allowedValues) {
|
|
162
101
|
const value = readRequiredString(payload, field);
|
|
163
102
|
if (!allowedValues.includes(value)) {
|
|
164
|
-
throw new
|
|
103
|
+
throw new BadRequestError(`"${field}" must be one of: ${allowedValues.join(", ")}.`);
|
|
165
104
|
}
|
|
166
105
|
return value;
|
|
167
106
|
}
|
|
@@ -174,7 +113,7 @@ function readOptionalEnum(payload, field, allowedValues) {
|
|
|
174
113
|
function readRequiredPositiveInt(payload, field) {
|
|
175
114
|
const value = payload[field];
|
|
176
115
|
if (typeof value !== "number" || !Number.isInteger(value) || value <= 0) {
|
|
177
|
-
throw new
|
|
116
|
+
throw new BadRequestError(`"${field}" is required and must be a positive integer.`);
|
|
178
117
|
}
|
|
179
118
|
return value;
|
|
180
119
|
}
|
|
@@ -185,38 +124,78 @@ function readOptionalPositiveInt(payload, field) {
|
|
|
185
124
|
return readRequiredPositiveInt(payload, field);
|
|
186
125
|
}
|
|
187
126
|
function parsePositiveIntParam(value, name = "id") {
|
|
188
|
-
const parsed = Number
|
|
189
|
-
if (!Number.
|
|
190
|
-
throw new
|
|
127
|
+
const parsed = Number(value);
|
|
128
|
+
if (!/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed <= 0) {
|
|
129
|
+
throw new BadRequestError(`Invalid ${name}. Expected a positive integer.`);
|
|
191
130
|
}
|
|
192
131
|
return parsed;
|
|
193
132
|
}
|
|
194
133
|
|
|
195
|
-
// ../../src/core/http/
|
|
196
|
-
class
|
|
197
|
-
#preserveRepeated;
|
|
198
|
-
constructor(options = {}) {
|
|
199
|
-
this.#preserveRepeated = options.preserveRepeated === true;
|
|
200
|
-
}
|
|
134
|
+
// ../../src/core/http/formRequest.ts
|
|
135
|
+
class FormRequest {
|
|
201
136
|
authorize(_request) {
|
|
202
137
|
return true;
|
|
203
138
|
}
|
|
204
139
|
validatePayload(payload) {
|
|
205
140
|
return this.parse(payload);
|
|
206
141
|
}
|
|
142
|
+
readPayload(request) {
|
|
143
|
+
return parseJsonBody(request, (payload) => payload);
|
|
144
|
+
}
|
|
207
145
|
async validate(request) {
|
|
208
|
-
if (
|
|
146
|
+
if (await this.authorize(request) !== true) {
|
|
209
147
|
throw new ForbiddenError;
|
|
210
148
|
}
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
149
|
+
return this.validatePayload(await this.readPayload(request));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
class QueryFormRequest {
|
|
154
|
+
validate(request) {
|
|
155
|
+
return this.parseQuery(request);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
// ../../src/core/http/parseFormBody.ts
|
|
160
|
+
import { BadRequestError as BadRequestError2 } from "@getstrata/core/errors/http";
|
|
161
|
+
async function parseFormBody(request, options = {}) {
|
|
162
|
+
const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
|
|
163
|
+
if (!contentType.includes("application/x-www-form-urlencoded") && !contentType.includes("multipart/form-data")) {
|
|
164
|
+
throw new BadRequestError2("Expected a form submission.");
|
|
165
|
+
}
|
|
166
|
+
return formDataToRecord(await request.formData(), options);
|
|
167
|
+
}
|
|
168
|
+
function formDataToRecord(formData, options = {}) {
|
|
169
|
+
if (options.preserveRepeated === true) {
|
|
170
|
+
const values = new Map;
|
|
171
|
+
for (const [key, value] of formData.entries()) {
|
|
172
|
+
const entries = values.get(key);
|
|
173
|
+
if (entries)
|
|
174
|
+
entries.push(value);
|
|
175
|
+
else
|
|
176
|
+
values.set(key, [value]);
|
|
219
177
|
}
|
|
178
|
+
return Object.fromEntries(values);
|
|
179
|
+
}
|
|
180
|
+
const values = {};
|
|
181
|
+
for (const [key, value] of formData.entries()) {
|
|
182
|
+
if (typeof value === "string") {
|
|
183
|
+
values[key] = value;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return values;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
// ../../src/core/http/webFormRequest.ts
|
|
190
|
+
class WebFormRequest extends FormRequest {
|
|
191
|
+
#preserveRepeated;
|
|
192
|
+
constructor(options = {}) {
|
|
193
|
+
super();
|
|
194
|
+
this.#preserveRepeated = options.preserveRepeated === true;
|
|
195
|
+
}
|
|
196
|
+
readPayload(request) {
|
|
197
|
+
const mediaType = request.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase();
|
|
198
|
+
return mediaType === "application/json" || mediaType?.match(/^application\/[^/]+\+json$/) ? parseJsonBody(request, (body) => body) : parseFormBody(request, { preserveRepeated: this.#preserveRepeated });
|
|
220
199
|
}
|
|
221
200
|
}
|
|
222
201
|
export {
|
|
@@ -59,6 +59,14 @@ class AsyncQueue {
|
|
|
59
59
|
if (this.closed)
|
|
60
60
|
throw new Error("Async queue is closed.");
|
|
61
61
|
}
|
|
62
|
+
track(running) {
|
|
63
|
+
const settled = running.then(() => {}, () => {});
|
|
64
|
+
this.active.add(settled);
|
|
65
|
+
settled.then(() => {
|
|
66
|
+
this.active.delete(settled);
|
|
67
|
+
});
|
|
68
|
+
return running;
|
|
69
|
+
}
|
|
62
70
|
enqueue(task, onError) {
|
|
63
71
|
this.assertOpen();
|
|
64
72
|
const running = new Promise((resolve) => {
|
|
@@ -66,10 +74,7 @@ class AsyncQueue {
|
|
|
66
74
|
Promise.resolve().then(task).catch(onError).finally(resolve);
|
|
67
75
|
}, 0);
|
|
68
76
|
});
|
|
69
|
-
this.
|
|
70
|
-
running.then(() => {
|
|
71
|
-
this.active.delete(running);
|
|
72
|
-
});
|
|
77
|
+
this.track(running);
|
|
73
78
|
}
|
|
74
79
|
async dispatch(job, payload, options) {
|
|
75
80
|
if (options?.handoff !== undefined)
|
|
@@ -23,6 +23,14 @@ class AsyncQueue {
|
|
|
23
23
|
if (this.closed)
|
|
24
24
|
throw new Error("Async queue is closed.");
|
|
25
25
|
}
|
|
26
|
+
track(running) {
|
|
27
|
+
const settled = running.then(() => {}, () => {});
|
|
28
|
+
this.active.add(settled);
|
|
29
|
+
settled.then(() => {
|
|
30
|
+
this.active.delete(settled);
|
|
31
|
+
});
|
|
32
|
+
return running;
|
|
33
|
+
}
|
|
26
34
|
enqueue(task, onError) {
|
|
27
35
|
this.assertOpen();
|
|
28
36
|
const running = new Promise((resolve) => {
|
|
@@ -30,10 +38,7 @@ class AsyncQueue {
|
|
|
30
38
|
Promise.resolve().then(task).catch(onError).finally(resolve);
|
|
31
39
|
}, 0);
|
|
32
40
|
});
|
|
33
|
-
this.
|
|
34
|
-
running.then(() => {
|
|
35
|
-
this.active.delete(running);
|
|
36
|
-
});
|
|
41
|
+
this.track(running);
|
|
37
42
|
}
|
|
38
43
|
async dispatch(job, payload, options) {
|
|
39
44
|
if (options?.handoff !== undefined)
|