Skip to content

Don't decode url before encoding it again #179

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
jgm merged 3 commits into from
Jan 9, 2020
Merged

Don't decode url before encoding it again #179

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
b614b65
Don't decode url before encoding it again
danielberndt Jan 8, 2020
4f2309a
adapt existing encoding-based regression test and add `%25`-based reg…
danielberndt Jan 9, 2020
edd1f4a
do not require `decode`, as it's not needed any more
danielberndt Jan 9, 2020
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: 1 addition & 2 deletions lib/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use strict";

var encode = require('mdurl/encode');
var decode = require('mdurl/decode');

var C_BACKSLASH = 92;

Expand Down Expand Up @@ -56,7 +55,7 @@ var unescapeString = function(s) {

var normalizeURI = function(uri) {
try {
return encode(decode(uri));
return encode(uri);
}
catch(err) {
return uri;
Expand Down
10 changes: 9 additions & 1 deletion test/regression.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,15 @@ Double-encoding.
```````````````````````````````` example
[XSS](javascript:alert%28'XSS'%29)
.
<p><a href="javascript&amp;colon;alert('XSS')">XSS</a></p>
<p><a href="javascript&amp;colon;alert%28'XSS'%29">XSS</a></p>
````````````````````````````````

PR #179

```````````````````````````````` example
[link](https://www.example.com/home/%25batty)
.
<p><a href="https://www.example.com/home/%25batty">link</a></p>
````````````````````````````````

Issue commonamrk#517 - script, pre, style close tag without
Expand Down