Skip to content

url: remove \t \n \r in url.parse() similar to WHATWG #45116

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
nodejs-github-bot merged 2 commits into from
Oct 24, 2022
Merged

url: remove \t \n \r in url.parse() similar to WHATWG #45116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b9c7b
url: remove \t \n \r in url.parse() similar to WHATWG
Trott Oct 22, 2022
607d348
fixup! url: remove \t \n \r in url.parse() similar to WHATWG
Trott Oct 22, 2022
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
Prev Previous commit
fixup! url: remove \t \n \r in url.parse() similar to WHATWG
  • Loading branch information
@Trott
Trott committed Oct 22, 2022
commit 607d3481bea89981294f82e15a9e242846c6cb11
7 changes: 4 additions & 3 deletions lib/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,6 @@ const forbiddenHostCharsIpv6 = /[\0\t\n\r #%/<>?@\\^|]/;
Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) {
validateString(url, 'url');

// WHATWG URL removes tabs, newlines, and carriage returns. Let's do that too.
url = url.replace(/[\t\r\n]/g, '');

// Copy chrome, IE, opera backslash-handling behavior.
// Back slashes before the query string get converted to forward slashes
// See: https://code.google.com/p/chromium/issues/detail?id=25916
Expand Down Expand Up @@ -322,6 +319,10 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) {
case CHAR_TAB:
case CHAR_LINE_FEED:
case CHAR_CARRIAGE_RETURN:
// WHATWG URL removes tabs, newlines, and carriage returns. Let's do that too.
rest = rest.slice(0, i) + rest.slice(i + 1);
i -= 1;
break;
case CHAR_SPACE:
case CHAR_DOUBLE_QUOTE:
case CHAR_PERCENT:
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-url-parse-format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,11 +843,11 @@ const parseTests = {
port: null,
hostname: 'a.b',
hash: null,
pathname: '/bcdref%20g%22hq%27j%3Ckl%3E',
path: '/bcdref%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz',
pathname: '/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E',
path: '/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz',
search: '?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz',
query: 'mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz',
href: 'http://a.b/bcdref%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz'
href: 'http://a.b/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz'
},

'http://a\r" \t\n<\'b:b@c\r\nd/e?f': {
Expand Down