Skip to content

fix(@angular/build): prevent HTML injection from inlined font CSS #33552

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
SkyZeroZx wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −2
Open

fix(@angular/build): prevent HTML injection from inlined font CSS #33552

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions packages/angular/build/src/utils/index-file/inline-fonts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ export class InlineFontsProcessor {
attrs.find(({ name, value }) => name === 'href' && hrefsContent.has(value));
if (hrefAttr) {
const href = hrefAttr.value;
const cssContent = hrefsContent.get(href);
rewriter.emitRaw(`<style>${cssContent}</style>`);
const cssContent = hrefsContent.get(href) ?? '';
// Prevent the CSS from terminating the generated raw-text style element.
rewriter.emitRaw(`<style>${cssContent.replace(/<\/(?=style)/gi, '<\\/')}</style>`);
} else {
rewriter.emitStartTag(tag);
}
Expand Down
28 changes: 28 additions & 0 deletions packages/angular/build/src/utils/index-file/inline-fonts_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
* found in the LICENSE file at https://angular.dev/license
*/

import { htmlRewritingStream } from './html-rewriting-stream';
import { InlineFontsProcessor } from './inline-fonts';
import { addNonce } from './nonce';

describe('InlineFontsProcessor', () => {
describe('Google fonts', () => {
Expand Down Expand Up @@ -100,6 +102,32 @@ describe('InlineFontsProcessor', () => {
`<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>`,
);
});

it('should escape closing style tags in inlined CSS', async () => {
const inlineFontsProcessor = new InlineFontsProcessor({
minify: true,
});
spyOn(inlineFontsProcessor, 'processURL').and.resolveTo(
'body { color: red; }</StYlE><script>globalThis.attack = true;</script><style>',
);

const html = await inlineFontsProcessor.process(`
<html>
<head>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
</head>
<body><app-root ngCspNonce="trusted-nonce"></app-root></body>
</html>`);
const htmlWithNonce = await addNonce(html);
const { rewriter, transformedContent } = await htmlRewritingStream(htmlWithNonce);
const elementNames: string[] = [];
rewriter.on('startTag', ({ tagName }) => elementNames.push(tagName));
await transformedContent();

expect(htmlWithNonce).toContain('body { color: red; }<\\/StYlE>');
expect(elementNames.filter((name) => name === 'style')).toHaveSize(1);
expect(elementNames).not.toContain('script');
});
});

describe('Adobe Typekit fonts', () => {
Expand Down
Loading