Skip to content

Perf optimize cookie value validation #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blakeembrey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Perf optimize cookie value validation #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ const cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
*/
const cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;

/**
* RegExp to match invalid cookie values to be encoded, including `%` for roundtrip safety.
*/
const cookieOctetInvalidRegExp = /[\u0000-\u0020\u007F-\uFFFF",;\\%]/;

/**
* RegExp to match domain-value in RFC 6265 sec 4.1.1
*
Expand Down Expand Up @@ -68,11 +73,6 @@ const pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/;
*/
const maxAgeRegExp = /^-?\d+$/;

/**
* RegExp to match RFC 6265 cookie-octet values (without % to preserve roundtrip) that need no URL encoding.
*/
const cookieOctetRegExp = /^[!#$&'()*+\-.\/0-9:<=>?@A-Z[\]\^_`a-z{|}~]*$/;

const NullObject = /* @__PURE__ */ (() => {
const C = function () {};
C.prototype = Object.create(null);
Expand Down Expand Up @@ -175,7 +175,7 @@ export function stringifyCookie(

const value = enc(val);

if (!cookieValueRegExp.test(value)) {
if (enc !== defaultEncode && !cookieValueRegExp.test(value)) {
throw new TypeError(`cookie val is invalid: ${val}`);
}

Expand Down Expand Up @@ -294,7 +294,7 @@ export function stringifySetCookie(

const value = cookie.value == null ? "" : enc(cookie.value);

if (!cookieValueRegExp.test(value)) {
if (enc !== defaultEncode && !cookieValueRegExp.test(value)) {
throw new TypeError(`argument val is invalid: ${cookie.value}`);
}

Expand Down Expand Up @@ -527,5 +527,5 @@ function decode(str: string): string {
* URL-encode string value. Optimized to skip native call for roundtrip-safe cookie-octet values.
*/
function defaultEncode(str: string): string {
return cookieOctetRegExp.test(str) ? str : encodeURIComponent(str);
return cookieOctetInvalidRegExp.test(str) ? encodeURIComponent(str) : str;
}
Loading