Skip to content

XSS with HTML entities #592

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
matt- merged 3 commits into from
Jul 29, 2016
Merged

XSS with HTML entities #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cff859
added explicit matching for HTML entities to prevent XSS
matt- May 19, 2015
31c7799
add optional semicolon in html entities regex
rsp Jul 15, 2016
0fa05b6
Merge pull request #1 from rsp/fix/xss_html_entities_semicolon
matt- Jul 15, 2016
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
3 changes: 2 additions & 1 deletion lib/marked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,8 @@ function escape(html, encode) {
}

function unescape(html) {
return html.replace(/&([#\w]+);/g, function(_, n) {
// explicitly match decimal, hex, and named HTML entities
return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) {
n = n.toLowerCase();
if (n === 'colon') return ':';
if (n.charAt(0) === '#') {
Expand Down
4 changes: 4 additions & 0 deletions test/tests/links.sanitize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<p></p>
<p></p>
<p></p>
<p></p>
7 changes: 7 additions & 0 deletions test/tests/links.sanitize.text
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[URL](javascript:alert)

[URL](vbscript:alert)

[URL](javascript&colon;alert&#40;1&#41;)

[URL](javascript&#58document;alert&#40;1&#41;)