Skip to content

fix: escape processing-instruction content under fallback raw-content elements #37

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
SnowingFox wants to merge 1 commit into from
Closed

fix: escape processing-instruction content under fallback raw-content elements #37

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
8 changes: 7 additions & 1 deletion lib/NodeUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,13 @@ function serializeOne(kid, parent) {
s += '<!--' + commentData + '-->';
break;
case 7: //PROCESSING_INSTRUCTION_NODE
const content = escapeProcessingInstructionContent(kid.data);
let content = escapeProcessingInstructionContent(kid.data);
if (content.includes('</')) {
const fallbackTags = fallbackRawContentTags(parent);
for (const fallbackTag of fallbackTags) {
content = escapeMatchingClosingTag(content, fallbackTag);
}
}
s += '<?' + kid.target + ' ' + content + '?>';
break;
case 10: //DOCUMENT_TYPE_NODE
Expand Down
42 changes: 42 additions & 0 deletions test/domino.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,3 +1556,45 @@ exports.worksWithBase64DataImages = function () {
'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII);"></div>'
);
};

exports.processingInstructionClosingTagEscapedInNoscript = function () {
// A processing-instruction payload that begins with a fallback raw-content
// closing tag (e.g. `</noscript `) must have that prefix escaped during
// serialization. Otherwise the serialized output closes the <noscript>
// element early in the receiving browser (RAWTEXT) and the sibling
// <img onerror> is re-parsed as live HTML.
// Regression for angular/angular#70146: the fc7e40a (#70050) and e0779df
// (#70055) fixes escaped element/text/comment branches of serializeOne()
// but the PROCESSING_INSTRUCTION_NODE branch (case 7) never called
// fallbackRawContentTags(), and escapeProcessingInstructionContent()
// only escapes `>` (leaving `<` alone).
const document = domino.createDocument('<html><body></body></html>');
const noscript = document.createElement('noscript');
noscript.appendChild(document.createProcessingInstruction('x', '</noscript '));
const img = document.createElement('img');
img.setAttribute('src', 'x');
img.setAttribute('onerror', 'alert(1)');
noscript.appendChild(img);
document.body.appendChild(noscript);

const html = document.body.serialize();
html.should.equal(
'<noscript><?x &lt;/noscript ?><img src="x" onerror="alert(1)"></noscript>'
);
// The PI payload must not leak an unescaped closing-tag prefix.
html.should.not.containEql('<?x </noscript');
};

exports.processingInstructionClosingTagEscapedForAllFallbackElements = function () {
const document = domino.createDocument('');
for (const tagName of ['noscript', 'iframe', 'noembed', 'noframes']) {
const fallback = document.createElement(tagName);
fallback.appendChild(document.createProcessingInstruction('x', '</' + tagName + '/'));
document.body.appendChild(fallback);

const html = document.body.serialize();
html.should.containEql('<?x &lt;/' + tagName + '/?>');
html.should.not.containEql('<?x </' + tagName);
document.body.removeChild(fallback);
}
};