Skip to content

test(security): escape every RegExp metacharacter in the icon-map matcher (CodeQL #1166, #1167) #18081

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

Closed
diegosouzapw wants to merge 1 commit into from
Closed

test(security): escape every RegExp metacharacter in the icon-map matcher (CodeQL #1166, #1167) #18081

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
10 changes: 7 additions & 3 deletions tests/unit/icon-map-object-values.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,23 @@ export function iconSlotExpressions(src: string): string[] {
const hops: string[] = [];
for (const m of src.matchAll(/\b(?:const|let)\s+([A-Za-z_$][\w$]*)\s*=\s*([^;\n]+)/g)) {
const [, name, expr] = m;
if (slots.some((s) => new RegExp(`\\b${name.replace(/\$/g, "\\$")}\\b`).test(s)))
hops.push(expr);
if (slots.some((s) => new RegExp(`\\b${escapeRegExp(name)}\\b`).test(s))) hops.push(expr);
}
return [...slots, ...hops];
}

/** Escapes every RegExp metacharacter so an identifier is matched literally. */
function escapeRegExp(text: string): string {
return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
}

/** `const NAME… = { key: "value", … }` objects whose NAME is read by an icon slot. */
export function iconLookupValues(src: string): Array<{ object: string; value: string }> {
const slots = iconSlotExpressions(src);
const found: Array<{ object: string; value: string }> = [];
for (const m of src.matchAll(/\bconst\s+([A-Za-z_$][\w$]*)\s*(?::[^=]+)?=\s*\{/g)) {
const name = m[1];
if (!slots.some((s) => new RegExp(`\\b${name.replace(/\$/g, "\\$")}\\b`).test(s))) continue;
if (!slots.some((s) => new RegExp(`\\b${escapeRegExp(name)}\\b`).test(s))) continue;
const body = braceBody(src, (m.index ?? 0) + m[0].length - 1);
if (body == null) continue;
const flat = !/\{/.test(body);
Expand Down
Loading