Skip to content

fix: escape localName, prefix, tag names, doctypes, and XML processing instructions #23

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

fix: escape localName, prefix, tag names, doctypes, and XML processing instructions #23

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
17 changes: 9 additions & 8 deletions lib/NodeUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ function escapeAttr(s) {
function attrname(a) {
var ns = a.namespaceURI;
if (!ns)
return a.localName;
return escape(a.localName);
if (ns === NAMESPACE.XML)
return 'xml:' + a.localName;
return 'xml:' + escape(a.localName);
if (ns === NAMESPACE.XLINK)
return 'xlink:' + a.localName;
return 'xlink:' + escape(a.localName);

if (ns === NAMESPACE.XMLNS) {
if (a.localName === 'xmlns') return 'xmlns';
else return 'xmlns:' + a.localName;
else return 'xmlns:' + escape(a.localName);
}
return a.name;
return escape(a.name);
}

/**
Expand Down Expand Up @@ -176,7 +176,8 @@ function serializeOne(kid, parent) {
case 1: //ELEMENT_NODE
var ns = kid.namespaceURI;
var html = ns === NAMESPACE.HTML;
var tagname = (html || ns === NAMESPACE.SVG || ns === NAMESPACE.MATHML) ? kid.localName : kid.tagName;
var unescapedTagname = (html || ns === NAMESPACE.SVG || ns === NAMESPACE.MATHML) ? kid.localName : kid.tagName;
var tagname = escape(unescapedTagname);

s += '<' + tagname;

Expand Down Expand Up @@ -221,10 +222,10 @@ function serializeOne(kid, parent) {
break;
case 7: //PROCESSING_INSTRUCTION_NODE
const content = escapeProcessingInstructionContent(kid.data);
s += '<?' + kid.target + ' ' + content + '?>';
s += '<?' + escape(kid.target) + ' ' + content + '?>';
break;
case 10: //DOCUMENT_TYPE_NODE
s += '<!DOCTYPE ' + kid.name;
s += '<!DOCTYPE ' + escape(kid.name);

if (false) {
// Latest HTML serialization spec omits the public/system ID
Expand Down
14 changes: 7 additions & 7 deletions test/html5lib-tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10945,8 +10945,8 @@
]
}
],
"html": "<html><head></head><body><div<div></div<div></body></html>",
"noQuirksBodyHtml": "<div<div></div<div>"
"html": "<html><head></head><body><div&lt;div></div&lt;div></body></html>",
"noQuirksBodyHtml": "<div&lt;div></div<div>"
}
},
{
Expand Down Expand Up @@ -10990,7 +10990,7 @@
]
}
],
"html": "<html><head></head><body><div foo<bar=\"\"></div></body></html>",
"html": "<html><head></head><body><div foo&lt;bar=\"\"></div></body></html>",
"noQuirksBodyHtml": "<div foo<bar=\"\"></div>"
}
},
Expand Down Expand Up @@ -58367,7 +58367,7 @@
]
}
],
"html": "<!DOCTYPE <!doctype><html><head></head><body>&gt;<!--<!--x-->--&gt;</body></html>",
"html": "<!DOCTYPE &lt;!doctype><html><head></head><body>&gt;<!--<!--x-->--&gt;</body></html>",
"noQuirksBodyHtml": "&gt;<!--<!--x-->--&gt;"
}
},
Expand Down Expand Up @@ -65403,7 +65403,7 @@
]
}
],
"html": "<html><head></head><body><p><code x<=\"\" code=\"\"></code></p><code x<=\"\" code=\"\">\n</code></body></html>",
"html": "<html><head></head><body><p><code x&lt;=\"\" code=\"\"></code></p><code x&lt;=\"\" code=\"\">\n</code></body></html>",
"noQuirksBodyHtml": "<p><code x<=\"\" code=\"\"></code></p><code x<=\"\" code=\"\">\n</code>"
}
},
Expand Down Expand Up @@ -79080,8 +79080,8 @@
]
}
],
"html": "<html><head></head><body><img <=\"\" fail=\"\"></body></html>",
"noQuirksBodyHtml": "<img <=\"\" fail=\"\">"
"html": "<html><head></head><body><img &lt;=\"\" fail=\"\"></body></html>",
"noQuirksBodyHtml": "<img &lt;=\"\" fail=\"\">"
}
},
{
Expand Down
62 changes: 62 additions & 0 deletions test/xss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,66 @@ exports.verifyEscapeProcessingInstructionContent = function () {
for (const [rawContent, expected] of cases) {
NodeUtils.ɵescapeProcessingInstructionContent(rawContent).should.equal(expected);
}
}

exports.testXssInAttributeName = function () {
var document = domino.createDocument();
var attr = document.createAttribute('safe');
attr.localName = '><script>alert(1)';
var div = document.createElement('div');
div.setAttributeNode(attr);

var serialized = div.outerHTML;

serialized.should.not.containEql('<script>');
serialized.should.containEql('&lt;script&gt;');
};

exports.testXssInAttributePrefix = function () {
var document = domino.createDocument();
var attr = document.createAttributeNS('http://example.com/ns', 'p:safe');
attr.prefix = '><script>alert(1)';
var div = document.createElement('div');
div.setAttributeNode(attr);

var serialized = div.outerHTML;

serialized.should.not.containEql('<script>');
serialized.should.containEql('&lt;script&gt;');
};

exports.testXssInTagName = function () {
var document = domino.createDocument();
var div = document.createElement('div');
div.localName = 'script>alert(1)</script';

var serialized = div.outerHTML;

serialized.should.not.containEql('<script>alert(1)');
serialized.should.containEql('script&gt;alert(1)');
};

exports.testXssInDoctypeName = function () {
var document = domino.createDocument();
// Remove existing doctype/documentElement if any
while (document.firstChild) document.removeChild(document.firstChild);

var doctype = document.implementation.createDocumentType('html', '', '');
doctype.name = 'html><script>alert(1)</script>';
document.appendChild(doctype);

var serialized = document.serialize();
serialized.should.not.containEql('<script>');
serialized.should.containEql('&lt;script&gt;');
};

exports.testXssInPITarget = function () {
var document = domino.createDocument();
var pi = document.createProcessingInstruction('target', 'data');
pi.target = 'target><script>alert(1)</script>';
document.appendChild(pi);

var serialized = document.serialize();
serialized.should.not.containEql('<script>');
serialized.should.containEql('&lt;script&gt;');
};
Loading