Skip to content

fix: Escapes </noscript in raw text when scripting enabled #29

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
+23 −1
Open

fix: Escapes </noscript in raw text when scripting enabled #29

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
4 changes: 3 additions & 1 deletion lib/NodeUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@ function serializeOne(kid, parent) {
var ss = kid.serialize();
// If an element can have raw content, this content may
// potentially require escaping to avoid XSS.
if (hasRawContent[tagname.toUpperCase()]) {
var upperTag = tagname.toUpperCase();
if (hasRawContent[upperTag] ||
(upperTag === 'NOSCRIPT' && kid.ownerDocument._scripting_enabled)) {
ss = escapeMatchingClosingTag(ss, tagname);
}
if (html && extraNewLine[tagname] && ss.charAt(0)==='\n') s += '\n';
Expand Down
20 changes: 20 additions & 0 deletions test/xss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,26 @@ exports.styleMatchingClosingTagSkipsUnclosedCommentedContent = function () {
return alertFired(html).should.eventually.be.false('alert fired for: ' + html);
};

exports.noscriptMatchingClosingTagInRawText = function () {
// Use a parsed document so `_scripting_enabled` is true, matching how
// Angular SSR / platform-server uses domino. With scripting enabled,
// <noscript> is a raw-text element on serialization and its text data
// must have any `</noscript` closing-tag prefix escaped, otherwise an
// attacker-controlled text payload can break out and inject a live
// <script> sibling in the receiving browser.
const document = domino.createDocument('<!doctype html><html><body></body></html>');
const noscript = document.createElement('noscript');
noscript.textContent = 'abc</noscript><script>alert(1)</script>';
document.body.appendChild(noscript);

document.body
.serialize()
.should.equal('<noscript>abc&lt;/noscript><script>alert(1)</script></noscript>');

const html = document.serialize();
return alertFired(html).should.eventually.be.false('alert fired for: ' + html);
};

exports.scriptMatchingClosingTagInRawText = function () {
const document = domino.createDocument('');
const script = document.createElement('script');
Expand Down
Loading