Skip to content

fix(util-endpoints): escape tilde when evaluating template #3934

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.

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

Merged
merged 1 commit into from
Sep 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions packages/util-endpoints/src/utils/evaluateTemplate.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ describe(evaluateTemplate.name, () => {
jest.clearAllMocks();
});

it("should escape tilde while processing expression", () => {
const template = "foo `bar` baz";
// This test verifies that tilde is unescaped after processing.
expect(evaluateTemplate(template, mockOptions)).toBe(template);
expect(getAttr).not.toHaveBeenCalled();
});

describe("should replace `{parameterName}` with value", () => {
const parameterName = "bar";
const template = "foo {parameterName} baz";
Expand Down
3 changes: 2 additions & 1 deletion packages/util-endpoints/src/utils/evaluateTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const evaluateTemplate = (template: string, options: EvaluateOptions) =>

const templateContextNames = Object.keys(templateContext);
const templateContextValues = Object.values(templateContext);
const templateWithTildeEscaped = templateWithAttr.replace(/\`/g, "\\`");

return new Function(...templateContextNames, `return \`${templateWithAttr}\``)(...templateContextValues);
return new Function(...templateContextNames, `return \`${templateWithTildeEscaped}\``)(...templateContextValues);
};