@getstrata/core 3.0.4 → 3.0.7
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 +28 -0
- 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/createCacheStore.d.ts +1 -1
- package/dist/core/cache/expiration.d.ts +2 -0
- package/dist/core/cache/redisCacheScript.d.ts +1 -1
- package/dist/core/cache/redisCacheStore.d.ts +5 -5
- package/dist/core/cache/repository.d.ts +2 -0
- package/dist/core/cache/simpleCache.d.ts +5 -5
- package/dist/core/cache/simpleCacheStore.d.ts +3 -3
- package/dist/core/cache/store.d.ts +5 -4
- package/dist/core/cache/taggedCache.d.ts +2 -0
- 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 +106 -18
- 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/createCacheStore.js +45 -23
- package/dist/entries/cache/repository.js +20 -5
- package/dist/entries/cache/simpleCache.js +21 -7
- package/dist/entries/cache/simpleCacheStore.js +2 -3
- package/dist/entries/config/envSchema.js +13 -0
- package/dist/entries/contracts/serviceTokens.js +2 -0
- package/dist/entries/database/bindings.js +19 -95
- package/dist/entries/database/factory.js +4 -0
- package/dist/entries/database/migrations.js +714 -1
- package/dist/entries/database/ownedReadOnlyObservation.js +1 -5
- package/dist/entries/database/sqliteConnection.js +1 -5
- package/dist/entries/http/flashMiddleware.js +33 -14
- package/dist/entries/http/flashSession.js +33 -14
- package/dist/entries/http/formRequest.js +12 -6
- package/dist/entries/http/memoryThrottleMiddleware.js +12 -11
- package/dist/entries/http/pagination.js +4 -4
- package/dist/entries/http/parseMultipartUpload.js +62 -9
- package/dist/entries/http/requirePasswordConfirmMiddleware.js +5 -2
- package/dist/entries/http/requireWebAuthMiddleware.js +5 -2
- package/dist/entries/http/routeModelBinding.js +4 -4
- package/dist/entries/http/safeInternalPath.js +5 -2
- package/dist/entries/http/scimThrottleMiddleware.js +5 -2
- package/dist/entries/http/securedRouteModelBinding.js +4 -4
- package/dist/entries/http/throttleMiddleware.js +5 -2
- 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 +380 -266
- 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 +8 -1
- package/package.json +17 -4
|
@@ -63,6 +63,67 @@ function matchesAuthVersion(issued, current) {
|
|
|
63
63
|
// ../../src/core/auth/jwt.ts
|
|
64
64
|
import { createHmac, timingSafeEqual } from "crypto";
|
|
65
65
|
|
|
66
|
+
// ../../src/core/config/envSchema.ts
|
|
67
|
+
function defineEnvSchema(schema) {
|
|
68
|
+
return schema;
|
|
69
|
+
}
|
|
70
|
+
function validateEnv(schema, env = process.env) {
|
|
71
|
+
const resolved = {};
|
|
72
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
73
|
+
if (rule.integer) {
|
|
74
|
+
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) {
|
|
75
|
+
throw new TypeError(`Environment integer rule for "${name}" has invalid bounds.`);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
const rawValue = env[name];
|
|
79
|
+
if (rawValue !== undefined && typeof rawValue !== "string") {
|
|
80
|
+
throw new TypeError(`Environment variable "${name}" must be a string.`);
|
|
81
|
+
}
|
|
82
|
+
const value = rawValue === undefined || rawValue.trim() === "" ? rule.default : rawValue;
|
|
83
|
+
if (value !== undefined && typeof value !== "string") {
|
|
84
|
+
throw new TypeError(`Environment variable "${name}" must resolve to a string.`);
|
|
85
|
+
}
|
|
86
|
+
if (value === undefined || value.trim() === "") {
|
|
87
|
+
if (rule.required) {
|
|
88
|
+
throw new Error(`Missing required environment variable "${name}".`);
|
|
89
|
+
}
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
if (rule.integer) {
|
|
93
|
+
const completeInteger = /^[+-]?\d+$/.test(value.trim());
|
|
94
|
+
const parsed = Number.parseInt(value, 10);
|
|
95
|
+
const minimum = rule.minimum ?? Number.NEGATIVE_INFINITY;
|
|
96
|
+
const maximum = rule.maximum ?? Number.POSITIVE_INFINITY;
|
|
97
|
+
if (!completeInteger || !Number.isSafeInteger(parsed) || parsed < minimum || parsed > maximum) {
|
|
98
|
+
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}`;
|
|
99
|
+
throw new Error(`Environment variable "${name}" must be ${comparison}.`);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (rule.pattern && !new RegExp(rule.pattern.source, rule.pattern.flags).test(value)) {
|
|
103
|
+
throw new Error(`Environment variable "${name}" has an invalid format.`);
|
|
104
|
+
}
|
|
105
|
+
Object.defineProperty(resolved, name, {
|
|
106
|
+
value,
|
|
107
|
+
enumerable: true,
|
|
108
|
+
configurable: true,
|
|
109
|
+
writable: true
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
return resolved;
|
|
113
|
+
}
|
|
114
|
+
function resolveEnv(schema, env = process.env) {
|
|
115
|
+
const validated = validateEnv(schema, env);
|
|
116
|
+
const resolved = {};
|
|
117
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
118
|
+
const value = validated[name];
|
|
119
|
+
Object.defineProperty(resolved, name, {
|
|
120
|
+
value: value === undefined ? undefined : rule.integer ? Number(value) : value,
|
|
121
|
+
enumerable: true
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
return Object.freeze(resolved);
|
|
125
|
+
}
|
|
126
|
+
|
|
66
127
|
// ../../src/core/runtime/appEnv.ts
|
|
67
128
|
var NON_PRODUCTION_APP_ENVS = new Set(["local", "development", "dev", "test", "testing", "ci"]);
|
|
68
129
|
function normalizeEnvValue(value) {
|
|
@@ -119,10 +180,10 @@ function otelServiceName(env = process.env) {
|
|
|
119
180
|
|
|
120
181
|
// ../../src/core/auth/jwt.ts
|
|
121
182
|
function jwtOptionsFromEnvironment(env) {
|
|
122
|
-
const
|
|
183
|
+
const ttl = resolveEnv({ JWT_TTL_SECONDS: { integer: true, minimum: 1, default: "3600" } }, env);
|
|
123
184
|
return Object.freeze({
|
|
124
185
|
secret: requireConfiguredSecret(["JWT_SECRET", "SESSION_SECRET"], "jwt-secret", env),
|
|
125
|
-
ttlSeconds:
|
|
186
|
+
ttlSeconds: ttl.JWT_TTL_SECONDS
|
|
126
187
|
});
|
|
127
188
|
}
|
|
128
189
|
function resolveJwtSecret(secret) {
|
|
@@ -132,10 +193,11 @@ function resolveJwtSecret(secret) {
|
|
|
132
193
|
throw new TypeError("Explicit JWT secret is required.");
|
|
133
194
|
}
|
|
134
195
|
function jwtTtlSeconds(override) {
|
|
135
|
-
if (
|
|
136
|
-
return
|
|
137
|
-
|
|
138
|
-
|
|
196
|
+
if (override === undefined)
|
|
197
|
+
return 3600;
|
|
198
|
+
if (!Number.isSafeInteger(override) || override <= 0)
|
|
199
|
+
throw new TypeError("JWT ttlSeconds must be a positive safe integer.");
|
|
200
|
+
return override;
|
|
139
201
|
}
|
|
140
202
|
function encodeJson(value) {
|
|
141
203
|
return Buffer.from(JSON.stringify(value)).toString("base64url");
|
|
@@ -263,15 +325,17 @@ function createSessionReader(options) {
|
|
|
263
325
|
function sessionCookieName(env) {
|
|
264
326
|
return env.SESSION_COOKIE_NAME?.trim() || appCookieName("session", env);
|
|
265
327
|
}
|
|
266
|
-
function parsePositiveSeconds(raw, fallback) {
|
|
267
|
-
const parsed = Number.parseInt(raw ?? "", 10);
|
|
268
|
-
return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
|
|
269
|
-
}
|
|
270
328
|
function sessionTtlSeconds(env) {
|
|
271
|
-
return
|
|
329
|
+
return resolveEnv({ SESSION_TTL_SECONDS: { integer: true, minimum: 1, default: String(SESSION_TTL_SECONDS) } }, env).SESSION_TTL_SECONDS;
|
|
272
330
|
}
|
|
273
331
|
function sessionRememberTtlSeconds(env) {
|
|
274
|
-
return
|
|
332
|
+
return resolveEnv({
|
|
333
|
+
SESSION_REMEMBER_TTL_SECONDS: {
|
|
334
|
+
integer: true,
|
|
335
|
+
minimum: 1,
|
|
336
|
+
default: String(SESSION_REMEMBER_TTL_SECONDS)
|
|
337
|
+
}
|
|
338
|
+
}, env).SESSION_REMEMBER_TTL_SECONDS;
|
|
275
339
|
}
|
|
276
340
|
function missingSessionSecret() {
|
|
277
341
|
throw new TypeError("Explicit session secret is required.");
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
// ../../src/core/auth/saml/samlServiceProvider.ts
|
|
3
|
+
import { testState } from "#strata-test-state";
|
|
4
|
+
|
|
2
5
|
// ../../src/core/runtime/optionalPeer.ts
|
|
3
6
|
function missingOptionalPeer(packageName, reason, error) {
|
|
4
7
|
return new Error(`Install ${packageName} ${reason} (\`bun add ${packageName}\`).`, {
|
|
@@ -140,20 +143,16 @@ function readSamlEnvOptions(env = process.env) {
|
|
|
140
143
|
disableRequestedAuthnContext: env.SAML_DISABLE_REQUESTED_AUTHN_CONTEXT === "true"
|
|
141
144
|
};
|
|
142
145
|
}
|
|
143
|
-
var nodeSamlLoader = null;
|
|
144
146
|
async function defaultLoadNodeSaml() {
|
|
145
147
|
return await import("@node-saml/node-saml");
|
|
146
148
|
}
|
|
147
149
|
async function loadNodeSaml() {
|
|
148
150
|
try {
|
|
149
|
-
return await (nodeSamlLoader ?? defaultLoadNodeSaml)();
|
|
151
|
+
return await (testState.nodeSamlLoader ?? defaultLoadNodeSaml)();
|
|
150
152
|
} catch (error) {
|
|
151
153
|
throw missingOptionalPeer("@node-saml/node-saml", "to verify SAML assertions", error);
|
|
152
154
|
}
|
|
153
155
|
}
|
|
154
|
-
function setNodeSamlLoaderForTests(loader) {
|
|
155
|
-
nodeSamlLoader = loader;
|
|
156
|
-
}
|
|
157
156
|
|
|
158
157
|
class SamlServiceProvider {
|
|
159
158
|
client = null;
|
|
@@ -2,6 +2,67 @@
|
|
|
2
2
|
// ../../src/core/auth/passwordConfirmCookie.ts
|
|
3
3
|
import { createHmac, timingSafeEqual } from "crypto";
|
|
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/cookies.ts
|
|
6
67
|
function readRequestCookie(request, name) {
|
|
7
68
|
const cookies = request.cookies;
|
|
@@ -108,8 +169,13 @@ function passwordConfirmCookieName(env) {
|
|
|
108
169
|
return env.PASSWORD_CONFIRM_COOKIE_NAME?.trim() || appCookieName("password_confirmed", env);
|
|
109
170
|
}
|
|
110
171
|
function passwordConfirmTtlSeconds(env) {
|
|
111
|
-
|
|
112
|
-
|
|
172
|
+
return resolveEnv({
|
|
173
|
+
PASSWORD_CONFIRM_TIMEOUT: {
|
|
174
|
+
integer: true,
|
|
175
|
+
minimum: 1,
|
|
176
|
+
default: String(DEFAULT_PASSWORD_CONFIRM_TTL_SECONDS)
|
|
177
|
+
}
|
|
178
|
+
}, env).PASSWORD_CONFIRM_TIMEOUT;
|
|
113
179
|
}
|
|
114
180
|
function passwordConfirmOptionsFromEnvironment(env) {
|
|
115
181
|
return Object.freeze({
|
|
@@ -124,7 +190,7 @@ function missingPasswordConfirmSecret() {
|
|
|
124
190
|
}
|
|
125
191
|
function signPasswordConfirm(userId, confirmedAt, authVersion, secret) {
|
|
126
192
|
const payload = authVersion === undefined ? `${userId}.${confirmedAt}` : `v2.${userId}.${confirmedAt}.${authVersion}`;
|
|
127
|
-
const signature = createHmac("sha256", secret ?? missingPasswordConfirmSecret()).update(payload).digest("hex");
|
|
193
|
+
const signature = createHmac("sha256", secret ?? missingPasswordConfirmSecret()).update(`password-confirm:${payload}`).digest("hex");
|
|
128
194
|
return `${payload}.${signature}`;
|
|
129
195
|
}
|
|
130
196
|
function hasFreshPasswordConfirmation(request, userId, authVersion, options) {
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
// ../../src/core/auth/saml/samlServiceProvider.ts
|
|
3
|
+
import { testState } from "#strata-test-state";
|
|
4
|
+
|
|
2
5
|
// ../../src/core/runtime/optionalPeer.ts
|
|
3
6
|
function missingOptionalPeer(packageName, reason, error) {
|
|
4
7
|
return new Error(`Install ${packageName} ${reason} (\`bun add ${packageName}\`).`, {
|
|
@@ -140,20 +143,16 @@ function readSamlEnvOptions(env = process.env) {
|
|
|
140
143
|
disableRequestedAuthnContext: env.SAML_DISABLE_REQUESTED_AUTHN_CONTEXT === "true"
|
|
141
144
|
};
|
|
142
145
|
}
|
|
143
|
-
var nodeSamlLoader = null;
|
|
144
146
|
async function defaultLoadNodeSaml() {
|
|
145
147
|
return await import("@node-saml/node-saml");
|
|
146
148
|
}
|
|
147
149
|
async function loadNodeSaml() {
|
|
148
150
|
try {
|
|
149
|
-
return await (nodeSamlLoader ?? defaultLoadNodeSaml)();
|
|
151
|
+
return await (testState.nodeSamlLoader ?? defaultLoadNodeSaml)();
|
|
150
152
|
} catch (error) {
|
|
151
153
|
throw missingOptionalPeer("@node-saml/node-saml", "to verify SAML assertions", error);
|
|
152
154
|
}
|
|
153
155
|
}
|
|
154
|
-
function setNodeSamlLoaderForTests(loader) {
|
|
155
|
-
nodeSamlLoader = loader;
|
|
156
|
-
}
|
|
157
156
|
|
|
158
157
|
class SamlServiceProvider {
|
|
159
158
|
client = null;
|
|
@@ -248,6 +247,5 @@ export {
|
|
|
248
247
|
SamlServiceProvider,
|
|
249
248
|
createSamlServiceProvider,
|
|
250
249
|
createSqlSamlAssertionReplayStore,
|
|
251
|
-
readSamlEnvOptions
|
|
252
|
-
setNodeSamlLoaderForTests
|
|
250
|
+
readSamlEnvOptions
|
|
253
251
|
};
|
|
@@ -2,6 +2,67 @@
|
|
|
2
2
|
// ../../src/core/auth/sessionCookie.ts
|
|
3
3
|
import { createHmac, timingSafeEqual } from "crypto";
|
|
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/cookies.ts
|
|
6
67
|
function readRequestCookie(request, name) {
|
|
7
68
|
const cookies = request.cookies;
|
|
@@ -110,15 +171,17 @@ function createSessionReader(options) {
|
|
|
110
171
|
function sessionCookieName(env) {
|
|
111
172
|
return env.SESSION_COOKIE_NAME?.trim() || appCookieName("session", env);
|
|
112
173
|
}
|
|
113
|
-
function parsePositiveSeconds(raw, fallback) {
|
|
114
|
-
const parsed = Number.parseInt(raw ?? "", 10);
|
|
115
|
-
return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
|
|
116
|
-
}
|
|
117
174
|
function sessionTtlSeconds(env) {
|
|
118
|
-
return
|
|
175
|
+
return resolveEnv({ SESSION_TTL_SECONDS: { integer: true, minimum: 1, default: String(SESSION_TTL_SECONDS) } }, env).SESSION_TTL_SECONDS;
|
|
119
176
|
}
|
|
120
177
|
function sessionRememberTtlSeconds(env) {
|
|
121
|
-
return
|
|
178
|
+
return resolveEnv({
|
|
179
|
+
SESSION_REMEMBER_TTL_SECONDS: {
|
|
180
|
+
integer: true,
|
|
181
|
+
minimum: 1,
|
|
182
|
+
default: String(SESSION_REMEMBER_TTL_SECONDS)
|
|
183
|
+
}
|
|
184
|
+
}, env).SESSION_REMEMBER_TTL_SECONDS;
|
|
122
185
|
}
|
|
123
186
|
function missingSessionSecret() {
|
|
124
187
|
throw new TypeError("Explicit session secret is required.");
|
|
@@ -29,6 +29,67 @@ function requireAuthCapability(value, methods, mechanism) {
|
|
|
29
29
|
// ../../src/core/auth/sessionCookie.ts
|
|
30
30
|
import { createHmac, timingSafeEqual } from "crypto";
|
|
31
31
|
|
|
32
|
+
// ../../src/core/config/envSchema.ts
|
|
33
|
+
function defineEnvSchema(schema) {
|
|
34
|
+
return schema;
|
|
35
|
+
}
|
|
36
|
+
function validateEnv(schema, env = process.env) {
|
|
37
|
+
const resolved = {};
|
|
38
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
39
|
+
if (rule.integer) {
|
|
40
|
+
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) {
|
|
41
|
+
throw new TypeError(`Environment integer rule for "${name}" has invalid bounds.`);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
const rawValue = env[name];
|
|
45
|
+
if (rawValue !== undefined && typeof rawValue !== "string") {
|
|
46
|
+
throw new TypeError(`Environment variable "${name}" must be a string.`);
|
|
47
|
+
}
|
|
48
|
+
const value = rawValue === undefined || rawValue.trim() === "" ? rule.default : rawValue;
|
|
49
|
+
if (value !== undefined && typeof value !== "string") {
|
|
50
|
+
throw new TypeError(`Environment variable "${name}" must resolve to a string.`);
|
|
51
|
+
}
|
|
52
|
+
if (value === undefined || value.trim() === "") {
|
|
53
|
+
if (rule.required) {
|
|
54
|
+
throw new Error(`Missing required environment variable "${name}".`);
|
|
55
|
+
}
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (rule.integer) {
|
|
59
|
+
const completeInteger = /^[+-]?\d+$/.test(value.trim());
|
|
60
|
+
const parsed = Number.parseInt(value, 10);
|
|
61
|
+
const minimum = rule.minimum ?? Number.NEGATIVE_INFINITY;
|
|
62
|
+
const maximum = rule.maximum ?? Number.POSITIVE_INFINITY;
|
|
63
|
+
if (!completeInteger || !Number.isSafeInteger(parsed) || parsed < minimum || parsed > maximum) {
|
|
64
|
+
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}`;
|
|
65
|
+
throw new Error(`Environment variable "${name}" must be ${comparison}.`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
if (rule.pattern && !new RegExp(rule.pattern.source, rule.pattern.flags).test(value)) {
|
|
69
|
+
throw new Error(`Environment variable "${name}" has an invalid format.`);
|
|
70
|
+
}
|
|
71
|
+
Object.defineProperty(resolved, name, {
|
|
72
|
+
value,
|
|
73
|
+
enumerable: true,
|
|
74
|
+
configurable: true,
|
|
75
|
+
writable: true
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
return resolved;
|
|
79
|
+
}
|
|
80
|
+
function resolveEnv(schema, env = process.env) {
|
|
81
|
+
const validated = validateEnv(schema, env);
|
|
82
|
+
const resolved = {};
|
|
83
|
+
for (const [name, rule] of Object.entries(schema)) {
|
|
84
|
+
const value = validated[name];
|
|
85
|
+
Object.defineProperty(resolved, name, {
|
|
86
|
+
value: value === undefined ? undefined : rule.integer ? Number(value) : value,
|
|
87
|
+
enumerable: true
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
return Object.freeze(resolved);
|
|
91
|
+
}
|
|
92
|
+
|
|
32
93
|
// ../../src/core/http/cookies.ts
|
|
33
94
|
function readRequestCookie(request, name) {
|
|
34
95
|
const cookies = request.cookies;
|
|
@@ -137,15 +198,17 @@ function createSessionReader(options) {
|
|
|
137
198
|
function sessionCookieName(env) {
|
|
138
199
|
return env.SESSION_COOKIE_NAME?.trim() || appCookieName("session", env);
|
|
139
200
|
}
|
|
140
|
-
function parsePositiveSeconds(raw, fallback) {
|
|
141
|
-
const parsed = Number.parseInt(raw ?? "", 10);
|
|
142
|
-
return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
|
|
143
|
-
}
|
|
144
201
|
function sessionTtlSeconds(env) {
|
|
145
|
-
return
|
|
202
|
+
return resolveEnv({ SESSION_TTL_SECONDS: { integer: true, minimum: 1, default: String(SESSION_TTL_SECONDS) } }, env).SESSION_TTL_SECONDS;
|
|
146
203
|
}
|
|
147
204
|
function sessionRememberTtlSeconds(env) {
|
|
148
|
-
return
|
|
205
|
+
return resolveEnv({
|
|
206
|
+
SESSION_REMEMBER_TTL_SECONDS: {
|
|
207
|
+
integer: true,
|
|
208
|
+
minimum: 1,
|
|
209
|
+
default: String(SESSION_REMEMBER_TTL_SECONDS)
|
|
210
|
+
}
|
|
211
|
+
}, env).SESSION_REMEMBER_TTL_SECONDS;
|
|
149
212
|
}
|
|
150
213
|
function missingSessionSecret() {
|
|
151
214
|
throw new TypeError("Explicit session secret is required.");
|
|
@@ -54,6 +54,15 @@ function copyApplicationConfig(value, ancestors = new Set) {
|
|
|
54
54
|
// ../../src/core/cache/redisCacheStore.ts
|
|
55
55
|
var {RedisClient } = globalThis.Bun;
|
|
56
56
|
|
|
57
|
+
// ../../src/core/cache/expiration.ts
|
|
58
|
+
function resolveCacheTtl(ttlMs, defaultTtlMs) {
|
|
59
|
+
const resolved = ttlMs === undefined ? defaultTtlMs : ttlMs;
|
|
60
|
+
if (resolved !== null && (typeof resolved !== "number" || !Number.isSafeInteger(resolved))) {
|
|
61
|
+
throw new RangeError("ttlMs must be a safe integer number of milliseconds, or null for forever.");
|
|
62
|
+
}
|
|
63
|
+
return resolved;
|
|
64
|
+
}
|
|
65
|
+
|
|
57
66
|
// ../../src/core/cache/redisCacheScript.ts
|
|
58
67
|
var CACHE_SCRIPT = `
|
|
59
68
|
local expected = {'hash', 'zset', 'zset', 'hash', 'zset'}
|
|
@@ -129,9 +138,10 @@ local function read(key, tags)
|
|
|
129
138
|
return entry.payload
|
|
130
139
|
end
|
|
131
140
|
local function write(key, payload, tags)
|
|
141
|
+
if not r.forever and r.ttlMs <= 0 then removeEntry(key); return end
|
|
132
142
|
local entry = {payload=payload, tags=tags}
|
|
133
143
|
redis.call('HSET', KEYS[1], 'e:' .. key, cjson.encode(entry))
|
|
134
|
-
redis.call('ZADD', KEYS[2], r.
|
|
144
|
+
redis.call('ZADD', KEYS[2], r.forever and '+inf' or now + r.ttlMs, key)
|
|
135
145
|
touch(key)
|
|
136
146
|
local overflow = redis.call('ZCARD', KEYS[3]) - r.capacity
|
|
137
147
|
if overflow > 0 then
|
|
@@ -181,7 +191,7 @@ elseif r.op == 'get' then
|
|
|
181
191
|
return response(payload and {kind='value', payload=payload} or {kind='missing'})
|
|
182
192
|
elseif r.op == 'set' then
|
|
183
193
|
local old = redis.call('HGET', KEYS[1], 'e:' .. r.key)
|
|
184
|
-
local tags = old and cjson.decode(old).tags or {}
|
|
194
|
+
local tags = addTags(old and cjson.decode(old).tags or {}, r.tags)
|
|
185
195
|
write(r.key, r.payload, tags)
|
|
186
196
|
removeMeta(leaseField)
|
|
187
197
|
return response({written=true})
|
|
@@ -261,8 +271,7 @@ function validateCacheNamespace(namespace) {
|
|
|
261
271
|
throw new TypeError("Cache namespace must be a nonempty string.");
|
|
262
272
|
}
|
|
263
273
|
function normalizeRedisCacheOptions(ttlMs, maxEntries, options = {}) {
|
|
264
|
-
|
|
265
|
-
throw new RangeError("ttlMs must be a non-negative safe integer.");
|
|
274
|
+
resolveCacheTtl(ttlMs, ttlMs);
|
|
266
275
|
if (!Number.isInteger(maxEntries) || maxEntries < 1 || maxEntries > 1e4)
|
|
267
276
|
throw new RangeError("maxEntries must be between 1 and 10000.");
|
|
268
277
|
const copied = copyApplicationConfig(options);
|
|
@@ -322,8 +331,13 @@ class RedisCacheStore {
|
|
|
322
331
|
const result = await this.execute("get", key);
|
|
323
332
|
return result.kind === "value" ? JSON.parse(result.payload ?? "null") : undefined;
|
|
324
333
|
}
|
|
325
|
-
async set(key, value, ttlMs) {
|
|
326
|
-
|
|
334
|
+
async set(key, value, ttlMs, tags = []) {
|
|
335
|
+
const resolved = resolveCacheTtl(ttlMs, this.ttlMs);
|
|
336
|
+
await this.execute("set", key, {
|
|
337
|
+
payload: resolved !== null && resolved <= 0 ? "null" : this.serialize(value),
|
|
338
|
+
ttlMs: resolved,
|
|
339
|
+
tags
|
|
340
|
+
});
|
|
327
341
|
}
|
|
328
342
|
async getOrSet(key, loader, ttlMs) {
|
|
329
343
|
return this.getOrSetTagged(key, loader, [], ttlMs);
|
|
@@ -332,7 +346,11 @@ class RedisCacheStore {
|
|
|
332
346
|
const owner = crypto.randomUUID();
|
|
333
347
|
const end = performance.now() + this.options.waitTimeoutMs;
|
|
334
348
|
while (!this.closed) {
|
|
335
|
-
const claim = await this.execute("claim", key, {
|
|
349
|
+
const claim = await this.execute("claim", key, {
|
|
350
|
+
owner,
|
|
351
|
+
tags,
|
|
352
|
+
ttlMs: resolveCacheTtl(ttlMs, this.ttlMs)
|
|
353
|
+
});
|
|
336
354
|
if (claim.kind === "value")
|
|
337
355
|
return JSON.parse(claim.payload ?? "null");
|
|
338
356
|
if (claim.kind === "owner")
|
|
@@ -398,10 +416,11 @@ class RedisCacheStore {
|
|
|
398
416
|
controller.signal.throwIfAborted();
|
|
399
417
|
done = true;
|
|
400
418
|
clearInterval(renew);
|
|
419
|
+
const resolved = resolveCacheTtl(ttlMs, this.ttlMs);
|
|
401
420
|
await this.execute("publish", key, {
|
|
402
421
|
owner,
|
|
403
|
-
payload: this.serialize(value),
|
|
404
|
-
ttlMs:
|
|
422
|
+
payload: resolved !== null && resolved <= 0 ? "null" : this.serialize(value),
|
|
423
|
+
ttlMs: resolved
|
|
405
424
|
});
|
|
406
425
|
return value;
|
|
407
426
|
} finally {
|
|
@@ -434,9 +453,7 @@ class RedisCacheStore {
|
|
|
434
453
|
prefixes.push(key.slice(0, i));
|
|
435
454
|
if (prefixes.length > 33)
|
|
436
455
|
throw new RangeError("Redis cache identities support at most 32 query separators.");
|
|
437
|
-
const ttlMs = extra.ttlMs
|
|
438
|
-
if (typeof ttlMs !== "number" || !Number.isSafeInteger(ttlMs) || ttlMs < 0)
|
|
439
|
-
throw new RangeError("ttlMs must be a non-negative safe integer.");
|
|
456
|
+
const ttlMs = resolveCacheTtl(extra.ttlMs, this.ttlMs);
|
|
440
457
|
if (!this.client)
|
|
441
458
|
this.client = this.createClient();
|
|
442
459
|
const client = this.client;
|
|
@@ -471,7 +488,8 @@ class RedisCacheStore {
|
|
|
471
488
|
...extra,
|
|
472
489
|
tags,
|
|
473
490
|
prefixes,
|
|
474
|
-
ttlMs
|
|
491
|
+
ttlMs,
|
|
492
|
+
forever: ttlMs === null
|
|
475
493
|
})
|
|
476
494
|
]),
|
|
477
495
|
timeout
|
|
@@ -492,9 +510,7 @@ var redisCacheStore_default = RedisCacheStore;
|
|
|
492
510
|
|
|
493
511
|
// ../../src/core/cache/simpleCache.ts
|
|
494
512
|
function validateSimpleCacheOptions(ttlMs, maxEntries) {
|
|
495
|
-
|
|
496
|
-
throw new RangeError("ttlMs must be a non-negative number.");
|
|
497
|
-
}
|
|
513
|
+
resolveCacheTtl(ttlMs, ttlMs);
|
|
498
514
|
if (!Number.isInteger(maxEntries) || maxEntries < 1) {
|
|
499
515
|
throw new RangeError("maxEntries must be a positive integer.");
|
|
500
516
|
}
|
|
@@ -515,20 +531,27 @@ class SimpleCache {
|
|
|
515
531
|
get(key) {
|
|
516
532
|
return this.getFreshEntry(key)?.value;
|
|
517
533
|
}
|
|
518
|
-
set(key, value, ttlMs) {
|
|
534
|
+
set(key, value, ttlMs, tags = []) {
|
|
519
535
|
const now = Date.now();
|
|
520
|
-
const resolvedTtlMs = ttlMs
|
|
536
|
+
const resolvedTtlMs = resolveCacheTtl(ttlMs, this.ttlMs);
|
|
537
|
+
if (resolvedTtlMs !== null && resolvedTtlMs <= 0) {
|
|
538
|
+
this.invalidate(key);
|
|
539
|
+
return;
|
|
540
|
+
}
|
|
541
|
+
this.inflight.delete(key);
|
|
521
542
|
this.cache.set(key, {
|
|
522
543
|
value,
|
|
523
|
-
expiresAt: now + resolvedTtlMs,
|
|
544
|
+
expiresAt: resolvedTtlMs === null ? Infinity : now + resolvedTtlMs,
|
|
524
545
|
lastAccessedAt: now
|
|
525
546
|
});
|
|
547
|
+
this.attachTags(key, tags);
|
|
526
548
|
this.evictOverflow();
|
|
527
549
|
}
|
|
528
550
|
async getOrSet(key, loader, ttlMs) {
|
|
529
551
|
return this.getOrSetTagged(key, loader, [], ttlMs);
|
|
530
552
|
}
|
|
531
553
|
async getOrSetTagged(key, loader, tags, ttlMs) {
|
|
554
|
+
resolveCacheTtl(ttlMs, this.ttlMs);
|
|
532
555
|
this.pruneExpired();
|
|
533
556
|
const cachedEntry = this.getFreshEntry(key);
|
|
534
557
|
if (cachedEntry) {
|
|
@@ -670,7 +693,7 @@ class SimpleCache {
|
|
|
670
693
|
oldestKey = key;
|
|
671
694
|
}
|
|
672
695
|
}
|
|
673
|
-
if (
|
|
696
|
+
if (oldestKey === undefined) {
|
|
674
697
|
return;
|
|
675
698
|
}
|
|
676
699
|
this.invalidate(oldestKey);
|
|
@@ -688,9 +711,8 @@ class SimpleCacheStore {
|
|
|
688
711
|
get(key) {
|
|
689
712
|
return Promise.resolve(this.cache.get(key));
|
|
690
713
|
}
|
|
691
|
-
set(key, value, ttlMs) {
|
|
692
|
-
this.cache.set(key, value, ttlMs);
|
|
693
|
-
return Promise.resolve();
|
|
714
|
+
async set(key, value, ttlMs, tags = []) {
|
|
715
|
+
this.cache.set(key, value, ttlMs, tags);
|
|
694
716
|
}
|
|
695
717
|
getOrSet(key, loader, ttlMs) {
|
|
696
718
|
return this.cache.getOrSet(key, loader, ttlMs);
|