lukechilds
/
node
mirror of https://github.com/lukechilds/node.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

url: fix windows drive letter handling 

Address issue with Windows drive letter handling that was
causing es-module test suite to fail.

PR-URL: https://github.com/nodejs/node/pull/15490
Ref: https://github.com/whatwg/url/pull/343
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
canary-base
Benjamin Coe 8 years ago
committed by Ruben Bridgewater
parent
d8a226673b
commit
456d8e21ea
No known key found for this signature in database GPG Key ID: F07496B3EB3C1762
3 changed files with 389 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/node_url.cc
  2. 372
      test/fixtures/url-tests.js
  3. 2
      test/parallel/test-whatwg-url-parsing.js

25
src/node_url.cc
View File

@ -552,6 +552,19 @@ static inline bool IsSpecial(std::string scheme) {
return false; return false;
} }
// https://url.spec.whatwg.org/#start-with-a-windows-drive-letter
static inline bool StartsWithWindowsDriveLetter(const char* p,
const char* end) {
const size_t length = end - p;
return length >= 2 &&
IsWindowsDriveLetter(p[0], p[1]) &&
(length == 2 ||
p[2] == '/' ||
p[2] == '\\' ||
p[2] == '?' ||
p[2] == '#');
}
static inline int NormalizePort(std::string scheme, int p) { static inline int NormalizePort(std::string scheme, int p) {
#define XX(name, port) if (scheme == name && p == port) return -1; #define XX(name, port) if (scheme == name && p == port) return -1;
SPECIALS(XX); SPECIALS(XX);
@ -1198,6 +1211,7 @@ void URL::Parse(const char* input,
bool special = (url->flags & URL_FLAGS_SPECIAL); bool special = (url->flags & URL_FLAGS_SPECIAL);
bool cannot_be_base; bool cannot_be_base;
const bool special_back_slash = (special && ch == '\\'); const bool special_back_slash = (special && ch == '\\');
switch (state) { switch (state) {
case kSchemeStart: case kSchemeStart:
if (IsASCIIAlpha(ch)) { if (IsASCIIAlpha(ch)) {
@ -1667,13 +1681,7 @@ void URL::Parse(const char* input,
state = kFragment; state = kFragment;
break; break;
default: default:
if ((remaining == 0 || if (!StartsWithWindowsDriveLetter(p, end)) {
!IsWindowsDriveLetter(ch, p[1]) ||
(remaining >= 2 &&
p[2] != '/' &&
p[2] != '\\' &&
p[2] != '?' &&
p[2] != '#'))) {
if (base->flags & URL_FLAGS_HAS_HOST) { if (base->flags & URL_FLAGS_HAS_HOST) {
url->flags |= URL_FLAGS_HAS_HOST; url->flags |= URL_FLAGS_HAS_HOST;
url->host = base->host; url->host = base->host;
@ -1697,7 +1705,8 @@ void URL::Parse(const char* input,
state = kFileHost; state = kFileHost;
} else { } else {
if (has_base && if (has_base &&
base->scheme == "file:") { base->scheme == "file:" &&
!StartsWithWindowsDriveLetter(p, end)) {
if (IsNormalizedWindowsDriveLetter(base->path[0])) { if (IsNormalizedWindowsDriveLetter(base->path[0])) {
url->flags |= URL_FLAGS_HAS_PATH; url->flags |= URL_FLAGS_HAS_PATH;
url->path.push_back(base->path[0]); url->path.push_back(base->path[0]);

372
test/fixtures/url-tests.js
View File

@ -2,7 +2,7 @@
/* The following tests are copied from WPT. Modifications to them should be /* The following tests are copied from WPT. Modifications to them should be
upstreamed first. Refs: upstreamed first. Refs:
https://github.com/w3c/web-platform-tests/blob/8df7c9c215/url/urltestdata.json https://github.com/w3c/web-platform-tests/blob/5d149f0/url/urltestdata.json
License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
*/ */
module.exports = module.exports =
@ -4981,6 +4981,17 @@ module.exports =
"search": "", "search": "",
"hash": "" "hash": ""
}, },
"More IPv4 parsing (via https://github.com/jsdom/whatwg-url/issues/92)",
{
"input": "https://0x100000000/test",
"base": "about:blank",
"failure": true
},
{
"input": "https://256.0.0.1/test",
"base": "about:blank",
"failure": true
},
"# file URLs containing percent-encoded Windows drive letters (shouldn't work)", "# file URLs containing percent-encoded Windows drive letters (shouldn't work)",
{ {
"input": "file:///C%3A/", "input": "file:///C%3A/",
@ -5561,6 +5572,63 @@ module.exports =
"search": "", "search": "",
"hash": "" "hash": ""
}, },
"# Windows drive letter quirk in the file slash state",
{
"input": "/c:/foo/bar",
"base": "file:///c:/baz/qux",
"href": "file:///c:/foo/bar",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/c:/foo/bar",
"search": "",
"hash": ""
},
{
"input": "/c|/foo/bar",
"base": "file:///c:/baz/qux",
"href": "file:///c:/foo/bar",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/c:/foo/bar",
"search": "",
"hash": ""
},
{
"input": "file:\\c:\\foo\\bar",
"base": "file:///c:/baz/qux",
"href": "file:///c:/foo/bar",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/c:/foo/bar",
"search": "",
"hash": ""
},
{
"input": "/c:/foo/bar",
"base": "file://host/path",
"href": "file:///c:/foo/bar",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/c:/foo/bar",
"search": "",
"hash": ""
},
"# Windows drive letter quirk with not empty host", "# Windows drive letter quirk with not empty host",
{ {
"input": "file://example.net/C:/", "input": "file://example.net/C:/",
@ -6173,5 +6241,307 @@ module.exports =
"pathname": "d3958f5c-0777-0845-9dcf-2cb28783acaf", "pathname": "d3958f5c-0777-0845-9dcf-2cb28783acaf",
"search": "", "search": "",
"hash": "" "hash": ""
},
"Invalid IPv4 radix digits",
{
"input": "http://0177.0.0.0189",
"base": "about:blank",
"href": "http://0177.0.0.0189/",
"protocol": "http:",
"username": "",
"password": "",
"host": "0177.0.0.0189",
"hostname": "0177.0.0.0189",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
{
"input": "http://0x7f.0.0.0x7g",
"base": "about:blank",
"href": "http://0x7f.0.0.0x7g/",
"protocol": "http:",
"username": "",
"password": "",
"host": "0x7f.0.0.0x7g",
"hostname": "0x7f.0.0.0x7g",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
{
"input": "http://0X7F.0.0.0X7G",
"base": "about:blank",
"href": "http://0x7f.0.0.0x7g/",
"protocol": "http:",
"username": "",
"password": "",
"host": "0x7f.0.0.0x7g",
"hostname": "0x7f.0.0.0x7g",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
"Invalid IPv4 portion of IPv6 address",
{
"input": "http://[::127.0.0.0.1]",
"base": "about:blank",
"failure": true
},
"Uncompressed IPv6 addresses with 0",
{
"input": "http://[0:1:0:1:0:1:0:1]",
"base": "about:blank",
"href": "http://[0:1:0:1:0:1:0:1]/",
"protocol": "http:",
"username": "",
"password": "",
"host": "[0:1:0:1:0:1:0:1]",
"hostname": "[0:1:0:1:0:1:0:1]",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
{
"input": "http://[1:0:1:0:1:0:1:0]",
"base": "about:blank",
"href": "http://[1:0:1:0:1:0:1:0]/",
"protocol": "http:",
"username": "",
"password": "",
"host": "[1:0:1:0:1:0:1:0]",
"hostname": "[1:0:1:0:1:0:1:0]",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
"Percent-encoded query and fragment",
{
"input": "http://example.org/test?\u0022",
"base": "about:blank",
"href": "http://example.org/test?%22",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%22",
"hash": ""
},
{
"input": "http://example.org/test?\u0023",
"base": "about:blank",
"href": "http://example.org/test?#",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "",
"hash": ""
},
{
"input": "http://example.org/test?\u003C",
"base": "about:blank",
"href": "http://example.org/test?%3C",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%3C",
"hash": ""
},
{
"input": "http://example.org/test?\u003E",
"base": "about:blank",
"href": "http://example.org/test?%3E",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%3E",
"hash": ""
},
{
"input": "http://example.org/test?\u2323",
"base": "about:blank",
"href": "http://example.org/test?%E2%8C%A3",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%E2%8C%A3",
"hash": ""
},
{
"input": "http://example.org/test?%23%23",
"base": "about:blank",
"href": "http://example.org/test?%23%23",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%23%23",
"hash": ""
},
{
"input": "http://example.org/test?%GH",
"base": "about:blank",
"href": "http://example.org/test?%GH",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?%GH",
"hash": ""
},
{
"input": "http://example.org/test?a#%EF",
"base": "about:blank",
"href": "http://example.org/test?a#%EF",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?a",
"hash": "#%EF"
},
{
"input": "http://example.org/test?a#%GH",
"base": "about:blank",
"href": "http://example.org/test?a#%GH",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?a",
"hash": "#%GH"
},
"Bad bases",
{
"input": "test-a.html",
"base": "a",
"failure": true
},
{
"input": "test-a-slash.html",
"base": "a/",
"failure": true
},
{
"input": "test-a-slash-slash.html",
"base": "a//",
"failure": true
},
{
"input": "test-a-colon.html",
"base": "a:",
"failure": true
},
{
"input": "test-a-colon-slash.html",
"base": "a:/",
"href": "a:/test-a-colon-slash.html",
"protocol": "a:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/test-a-colon-slash.html",
"search": "",
"hash": ""
},
{
"input": "test-a-colon-slash-slash.html",
"base": "a://",
"href": "a:///test-a-colon-slash-slash.html",
"protocol": "a:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/test-a-colon-slash-slash.html",
"search": "",
"hash": ""
},
{
"input": "test-a-colon-b.html",
"base": "a:b",
"failure": true
},
{
"input": "test-a-colon-slash-b.html",
"base": "a:/b",
"href": "a:/test-a-colon-slash-b.html",
"protocol": "a:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/test-a-colon-slash-b.html",
"search": "",
"hash": ""
},
{
"input": "test-a-colon-slash-slash-b.html",
"base": "a://b",
"href": "a://b/test-a-colon-slash-slash-b.html",
"protocol": "a:",
"username": "",
"password": "",
"host": "b",
"hostname": "b",
"port": "",
"pathname": "/test-a-colon-slash-slash-b.html",
"search": "",
"hash": ""
},
"Null code point in fragment",
{
"input": "http://example.org/test?a#b\u0000c",
"base": "about:blank",
"href": "http://example.org/test?a#bc",
"protocol": "http:",
"username": "",
"password": "",
"host": "example.org",
"hostname": "example.org",
"port": "",
"pathname": "/test",
"search": "?a",
"hash": "#bc"
} }
] ]

2
test/parallel/test-whatwg-url-parsing.js
View File

@ -26,7 +26,7 @@ const failureTests = tests.filter((test) => test.failure).concat([
]); ]);
const expectedError = common.expectsError( const expectedError = common.expectsError(
{ code: 'ERR_INVALID_URL', type: TypeError }, 102); { code: 'ERR_INVALID_URL', type: TypeError }, 110);
for (const test of failureTests) { for (const test of failureTests) {
assert.throws( assert.throws(

Write Preview
Loading…
Cancel
Save