elysia 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/cookie/utils.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.js');
-const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
+const require_cookie_error = require('./error.js');
 const require_cookie_lib = require('./lib.js');
 const require_cookie_crypto = require('./crypto.js');
 const require_cookie_cookie = require('./cookie.js');
@@ -10,16 +10,11 @@ let deuri = require("deuri");
 deuri = require_runtime.__toESM(deuri);
 
 //#region src/cookie/utils.ts
-async function parseCookie(set, cookieString, options) {
-	const config = require_cookie_config.compileCookieConfig(void 0, options);
-	return buildCookieJar(set, await parseCookieRaw(cookieString, config), config);
-}
 function parseCookieRawSync(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = require_cookie_crypto.maybeJsonDecode((0, deuri.default)(v) ?? v);
@@ -33,23 +28,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
-	const cookies = require_cookie_lib.parse(cookieString);
-	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? require_cookie_lib.parse(cookieString) : require_utils.nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = (0, deuri.default)(v) ?? v;
@@ -57,35 +42,57 @@ function parseCookieRawLazy(cookieString, config) {
 	}
 	return out;
 }
-async function parseCookieRaw(cookieString, config) {
+/**
+* Raw-record value of a signed cookie that failed verification on a lane that
+* can't verify on access (asynchronous HMAC, AOT); the jar rejects its first
+* read. A string key, not a module identity, so a second Elysia copy agrees.
+* Null-prototype, which `JSON.parse` never yields, so no cookie value a client
+* sends (unsigned, or accepted by a `null` rotation secret) can take its shape
+*/
+const invalidSignature = () => {
+	const marker = require_utils.nullObject();
+	marker["~invalid"] = 1;
+	return marker;
+};
+async function parseCookieRaw(cookieString, config, lazy) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	if (require_cookie_crypto.hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (require_cookie_crypto.hasSyncHmac) return parseCookieRawSigned(cookieString, config, lazy);
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;
 		const signCheck = require_cookie_config.resolveSignSecrets(name, config);
-		if (signCheck !== void 0) value = await require_cookie_crypto.unsignWithSecrets(name, value, signCheck);
+		if (signCheck !== void 0) try {
+			value = await require_cookie_crypto.unsignWithSecrets(name, value, signCheck, require_cookie_config.legacySignatureOf(name, config));
+		} catch (error) {
+			if (!lazy || !(error instanceof require_cookie_error.InvalidCookie)) throw error;
+			out[name] = invalidSignature();
+			continue;
+		}
 		out[name] = require_cookie_crypto.maybeJsonDecode(value);
 	}
 	return out;
 }
-function parseCookieRawSigned(cookieString, config) {
+function parseCookieRawSigned(cookieString, config, lazy) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;
 		const signCheck = require_cookie_config.resolveSignSecrets(name, config);
-		if (signCheck !== void 0) value = require_cookie_crypto.unsignWithSecretsSync(name, value, signCheck);
+		if (signCheck !== void 0) try {
+			value = require_cookie_crypto.unsignWithSecretsSync(name, value, signCheck, require_cookie_config.legacySignatureOf(name, config));
+		} catch (error) {
+			if (!lazy || !(error instanceof require_cookie_error.InvalidCookie)) throw error;
+			out[name] = invalidSignature();
+			continue;
+		}
 		out[name] = require_cookie_crypto.maybeJsonDecode(value);
 	}
 	return out;
@@ -99,9 +106,13 @@ function buildCookieJar(set, raw, config, lazySign, deferDecode) {
 		const fieldDefaults = config.fields[name]?.defaults;
 		const entry = Object.assign(require_utils.nullObject(), config.defaults, fieldDefaults, { value: deferDecode ? require_cookie_crypto.maybeJsonDecode((0, deuri.default)(rawValue) ?? rawValue) : rawValue });
 		if (entry.expires instanceof Date) entry.expires = new Date(entry.expires.getTime());
-		if (lazySign && typeof entry.value === "string") {
+		if (rawValue?.["~invalid"] === 1 && Object.getPrototypeOf(rawValue) === null) entry["~unsign"] = 1;
+		else if (lazySign && typeof entry.value === "string") {
 			const secrets = require_cookie_config.resolveSignSecrets(name, config);
-			if (secrets !== void 0) entry["~unsign"] = secrets;
+			if (secrets !== void 0) {
+				entry["~unsign"] = secrets;
+				if (!require_cookie_config.legacySignatureOf(name, config)) entry["~strict"] = 1;
+			}
 		} else {
 			const value = entry.value;
 			if (value !== null && typeof value === "object") {
@@ -114,16 +125,27 @@ function buildCookieJar(set, raw, config, lazySign, deferDecode) {
 		return entry;
 	}
 	const cache = require_utils.nullObject();
+	function settle(key) {
+		if (!(key in store)) return;
+		const entry = materializeEntry(key);
+		if ("~unsign" in entry) require_cookie_crypto.resolvePendingCookie(entry, key);
+	}
 	return new Proxy(store, {
 		get(_, key) {
 			return cache[key] ??= new require_cookie_cookie.Cookie(key, set, key in store ? materializeEntry(key) : Object.assign(require_utils.nullObject(), config.defaults, config.fields[key]?.defaults));
 		},
+		has(target, key) {
+			if (typeof key === "string") settle(key);
+			return Reflect.has(target, key);
+		},
+		ownKeys(target) {
+			const keys = Reflect.ownKeys(target);
+			for (let i = 0; i < keys.length; i++) settle(keys[i]);
+			return keys;
+		},
 		getOwnPropertyDescriptor(target, key) {
-			if (typeof key === "string" && key in target) materializeEntry(key);
-			const descriptor = Reflect.getOwnPropertyDescriptor(target, key);
-			const entry = descriptor?.value;
-			if (entry && typeof entry === "object" && "~unsign" in entry) require_cookie_crypto.resolvePendingCookie(entry, String(key));
-			return descriptor;
+			if (typeof key === "string") settle(key);
+			return Reflect.getOwnPropertyDescriptor(target, key);
 		}
 	});
 }
@@ -137,43 +159,55 @@ function collectSignPending(cookies, config) {
 		if (!r.signed) continue;
 		let value = property.value;
 		if (value === void 0 || value === null) continue;
+		if (property["~signed"] === value) continue;
 		if (typeof value === "object") {
 			value = JSON.stringify(value);
 			if (property["~raw"] === value) continue;
 		} else if (typeof value !== "string") value = value + "";
 		const secret = Array.isArray(r.secrets) ? r.secrets[0] ?? null : r.secrets;
-		if (secret === null) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
+		if (!secret?.trim()) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
 		(pending ??= []).push([
 			property,
 			value,
-			secret
+			require_cookie_crypto.deriveSignKey(secret, key)
 		]);
 	}
 	return pending;
 }
+function dropSigned(cookies, config) {
+	for (const name in cookies) if (config.fields[name]?.sign || config.globalSign === true || config.globalSignSet?.has(name)) delete cookies[name];
+}
 function signCookieValues(cookies, config) {
-	const pending = collectSignPending(cookies, config);
-	if (!pending) return;
-	if (require_cookie_crypto.hasSyncHmac) {
-		for (let i = 0; i < pending.length; i++) {
-			const [property, value, secret] = pending[i];
-			property.value = require_cookie_crypto.signCookieSyncImpl(value, secret);
+	let pending;
+	try {
+		pending = collectSignPending(cookies, config);
+		if (!pending) return;
+		if (require_cookie_crypto.hasSyncHmac) {
+			for (let i = 0; i < pending.length; i++) {
+				const [property, value, key] = pending[i];
+				property["~signed"] = property.value = require_cookie_crypto.signCookieSyncImpl(value, key);
+			}
+			return;
 		}
-		return;
+	} catch (error) {
+		dropSigned(cookies, config);
+		throw error;
 	}
-	return signPending(pending);
+	return signPending(pending).catch((error) => {
+		dropSigned(cookies, config);
+		throw error;
+	});
 }
 async function signPending(pending) {
 	for (let i = 0; i < pending.length; i++) {
-		const [property, value, secret] = pending[i];
-		property.value = await require_cookie_crypto.signCookie(value, secret);
+		const [property, value, key] = pending[i];
+		property["~signed"] = property.value = await require_cookie_crypto.signCookie(value, key);
 	}
 }
 
 //#endregion
 exports.buildCookieJar = buildCookieJar;
 exports.hasSyncHmac = require_cookie_crypto.hasSyncHmac;
-exports.parseCookie = parseCookie;
 exports.parseCookieRaw = parseCookieRaw;
 exports.parseCookieRawDeferred = parseCookieRawDeferred;
 exports.parseCookieRawLazy = parseCookieRawLazy;

package/dist/cookie/utils.mjs

@@ -1,22 +1,17 @@
-import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
+import { InvalidCookie } from "./error.mjs";
 import { parse } from "./lib.mjs";
-import { hasSyncHmac, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieSyncImpl, unsignWithSecrets, unsignWithSecretsSync } from "./crypto.mjs";
+import { deriveSignKey, hasSyncHmac, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieSyncImpl, unsignWithSecrets, unsignWithSecretsSync } from "./crypto.mjs";
 import { Cookie } from "./cookie.mjs";
-import { compileCookieConfig, isCookieSigned, resolveSignSecrets } from "./config.mjs";
+import { isCookieSigned, legacySignatureOf, resolveSignSecrets } from "./config.mjs";
 import decodeComponent from "deuri";
 
 //#region src/cookie/utils.ts
-async function parseCookie(set, cookieString, options) {
-	const config = compileCookieConfig(void 0, options);
-	return buildCookieJar(set, await parseCookieRaw(cookieString, config), config);
-}
 function parseCookieRawSync(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = maybeJsonDecode(decodeComponent(v) ?? v);
@@ -30,23 +25,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
-	const cookies = parse(cookieString);
-	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? parse(cookieString) : nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = decodeComponent(v) ?? v;
@@ -54,35 +39,57 @@ function parseCookieRawLazy(cookieString, config) {
 	}
 	return out;
 }
-async function parseCookieRaw(cookieString, config) {
+/**
+* Raw-record value of a signed cookie that failed verification on a lane that
+* can't verify on access (asynchronous HMAC, AOT); the jar rejects its first
+* read. A string key, not a module identity, so a second Elysia copy agrees.
+* Null-prototype, which `JSON.parse` never yields, so no cookie value a client
+* sends (unsigned, or accepted by a `null` rotation secret) can take its shape
+*/
+const invalidSignature = () => {
+	const marker = nullObject();
+	marker["~invalid"] = 1;
+	return marker;
+};
+async function parseCookieRaw(cookieString, config, lazy) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	if (hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (hasSyncHmac) return parseCookieRawSigned(cookieString, config, lazy);
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;
 		const signCheck = resolveSignSecrets(name, config);
-		if (signCheck !== void 0) value = await unsignWithSecrets(name, value, signCheck);
+		if (signCheck !== void 0) try {
+			value = await unsignWithSecrets(name, value, signCheck, legacySignatureOf(name, config));
+		} catch (error) {
+			if (!lazy || !(error instanceof InvalidCookie)) throw error;
+			out[name] = invalidSignature();
+			continue;
+		}
 		out[name] = maybeJsonDecode(value);
 	}
 	return out;
 }
-function parseCookieRawSigned(cookieString, config) {
+function parseCookieRawSigned(cookieString, config, lazy) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;
 		const signCheck = resolveSignSecrets(name, config);
-		if (signCheck !== void 0) value = unsignWithSecretsSync(name, value, signCheck);
+		if (signCheck !== void 0) try {
+			value = unsignWithSecretsSync(name, value, signCheck, legacySignatureOf(name, config));
+		} catch (error) {
+			if (!lazy || !(error instanceof InvalidCookie)) throw error;
+			out[name] = invalidSignature();
+			continue;
+		}
 		out[name] = maybeJsonDecode(value);
 	}
 	return out;
@@ -96,9 +103,13 @@ function buildCookieJar(set, raw, config, lazySign, deferDecode) {
 		const fieldDefaults = config.fields[name]?.defaults;
 		const entry = Object.assign(nullObject(), config.defaults, fieldDefaults, { value: deferDecode ? maybeJsonDecode(decodeComponent(rawValue) ?? rawValue) : rawValue });
 		if (entry.expires instanceof Date) entry.expires = new Date(entry.expires.getTime());
-		if (lazySign && typeof entry.value === "string") {
+		if (rawValue?.["~invalid"] === 1 && Object.getPrototypeOf(rawValue) === null) entry["~unsign"] = 1;
+		else if (lazySign && typeof entry.value === "string") {
 			const secrets = resolveSignSecrets(name, config);
-			if (secrets !== void 0) entry["~unsign"] = secrets;
+			if (secrets !== void 0) {
+				entry["~unsign"] = secrets;
+				if (!legacySignatureOf(name, config)) entry["~strict"] = 1;
+			}
 		} else {
 			const value = entry.value;
 			if (value !== null && typeof value === "object") {
@@ -111,16 +122,27 @@ function buildCookieJar(set, raw, config, lazySign, deferDecode) {
 		return entry;
 	}
 	const cache = nullObject();
+	function settle(key) {
+		if (!(key in store)) return;
+		const entry = materializeEntry(key);
+		if ("~unsign" in entry) resolvePendingCookie(entry, key);
+	}
 	return new Proxy(store, {
 		get(_, key) {
 			return cache[key] ??= new Cookie(key, set, key in store ? materializeEntry(key) : Object.assign(nullObject(), config.defaults, config.fields[key]?.defaults));
 		},
+		has(target, key) {
+			if (typeof key === "string") settle(key);
+			return Reflect.has(target, key);
+		},
+		ownKeys(target) {
+			const keys = Reflect.ownKeys(target);
+			for (let i = 0; i < keys.length; i++) settle(keys[i]);
+			return keys;
+		},
 		getOwnPropertyDescriptor(target, key) {
-			if (typeof key === "string" && key in target) materializeEntry(key);
-			const descriptor = Reflect.getOwnPropertyDescriptor(target, key);
-			const entry = descriptor?.value;
-			if (entry && typeof entry === "object" && "~unsign" in entry) resolvePendingCookie(entry, String(key));
-			return descriptor;
+			if (typeof key === "string") settle(key);
+			return Reflect.getOwnPropertyDescriptor(target, key);
 		}
 	});
 }
@@ -134,38 +156,51 @@ function collectSignPending(cookies, config) {
 		if (!r.signed) continue;
 		let value = property.value;
 		if (value === void 0 || value === null) continue;
+		if (property["~signed"] === value) continue;
 		if (typeof value === "object") {
 			value = JSON.stringify(value);
 			if (property["~raw"] === value) continue;
 		} else if (typeof value !== "string") value = value + "";
 		const secret = Array.isArray(r.secrets) ? r.secrets[0] ?? null : r.secrets;
-		if (secret === null) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
+		if (!secret?.trim()) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
 		(pending ??= []).push([
 			property,
 			value,
-			secret
+			deriveSignKey(secret, key)
 		]);
 	}
 	return pending;
 }
+function dropSigned(cookies, config) {
+	for (const name in cookies) if (config.fields[name]?.sign || config.globalSign === true || config.globalSignSet?.has(name)) delete cookies[name];
+}
 function signCookieValues(cookies, config) {
-	const pending = collectSignPending(cookies, config);
-	if (!pending) return;
-	if (hasSyncHmac) {
-		for (let i = 0; i < pending.length; i++) {
-			const [property, value, secret] = pending[i];
-			property.value = signCookieSyncImpl(value, secret);
+	let pending;
+	try {
+		pending = collectSignPending(cookies, config);
+		if (!pending) return;
+		if (hasSyncHmac) {
+			for (let i = 0; i < pending.length; i++) {
+				const [property, value, key] = pending[i];
+				property["~signed"] = property.value = signCookieSyncImpl(value, key);
+			}
+			return;
 		}
-		return;
+	} catch (error) {
+		dropSigned(cookies, config);
+		throw error;
 	}
-	return signPending(pending);
+	return signPending(pending).catch((error) => {
+		dropSigned(cookies, config);
+		throw error;
+	});
 }
 async function signPending(pending) {
 	for (let i = 0; i < pending.length; i++) {
-		const [property, value, secret] = pending[i];
-		property.value = await signCookie(value, secret);
+		const [property, value, key] = pending[i];
+		property["~signed"] = property.value = await signCookie(value, key);
 	}
 }
 
 //#endregion
-export { buildCookieJar, hasSyncHmac, parseCookie, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };
+export { buildCookieJar, hasSyncHmac, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };