Skip to content

fix(@angular/build): incomplete string escaping or encoding #28515

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

Merged
merged 1 commit into from
Sep 27, 2024
Merged

fix(@angular/build): incomplete string escaping or encoding #28515

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
20 changes: 4 additions & 16 deletions packages/angular/build/src/utils/server-rendering/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,8 @@ const MAIN_SERVER_OUTPUT_FILENAME = 'main.server.mjs';
* A mapping of unsafe characters to their escaped Unicode equivalents.
*/
const UNSAFE_CHAR_MAP: Record<string, string> = {
'<': '\\u003C',
'>': '\\u003E',
'/': '\\u002F',
'\\': '\\\\',
'\b': '\\b',
'\f': '\\f',
'\n': '\\n',
'\r': '\\r',
'\t': '\\t',
'\0': '\\0',
'\u2028': '\\u2028',
'\u2029': '\\u2029',
'`': '\\`',
'$': '\\$',
};

/**
Expand All @@ -46,7 +36,7 @@ const UNSAFE_CHAR_MAP: Record<string, string> = {
* @returns The escaped string where unsafe characters are replaced.
*/
function escapeUnsafeChars(str: string): string {
return str.replace(/[<>\b\f\n\r\t\0\u2028\u2029]/g, (c) => UNSAFE_CHAR_MAP[c]);
return str.replace(/[$`]/g, (c) => UNSAFE_CHAR_MAP[c]);
}

/**
Expand Down Expand Up @@ -149,9 +139,7 @@ export function generateAngularServerAppManifest(
file.path === INDEX_HTML_CSR ||
(inlineCriticalCss && file.path.endsWith('.css'))
) {
serverAssetsContent.push(
`['${file.path}', async () => ${escapeUnsafeChars(JSON.stringify(file.text))}]`,
);
serverAssetsContent.push(`['${file.path}', async () => \`${escapeUnsafeChars(file.text)}\`]`);
Copy link
Collaborator Author

@alan-agius4 alan-agius4 Sep 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that using string literals here makes the other replacements unnecessary. However, the code scanner does not run on pull requests to confirm.

}
}

Expand Down