Skip to content

url: change null password handling #10601

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

url: change null password handling #10601

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
url: change null password handling 
Pulls in new URL parsing tests from w3c web-platform-tests and updates
null password handling.

Refs: web-platform-tests/wpt@e001240
Refs: whatwg/url#186.
Fixes: #10595
  • Loading branch information
@jasnell
jasnell committed Jan 4, 2017
commit 7588628f3fba274c4932cb7c9fc48c962e05008c
3 changes: 2 additions & 1 deletion lib/internal/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ Object.defineProperties(URL.prototype, {
if (ctx.host !== undefined) {
ret += '//';
const has_username = typeof ctx.username === 'string';
const has_password = typeof ctx.password === 'string';
const has_password = typeof ctx.password === 'string' &&
ctx.password !== '';
if (has_username || has_password) {
if (has_username)
ret += ctx.username;
Expand Down
68 changes: 64 additions & 4 deletions test/fixtures/url-tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,66 @@
"search": "?b",
"hash": "#c"
},
{
"input": "https://test:@test",
"base": "about:blank",
"href": "https://test@test/",
"origin": "https://test",
"protocol": "https:",
"username": "test",
"password": "",
"host": "test",
"hostname": "test",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
{
"input": "https://:@test",
"base": "about:blank",
"href": "https://test/",
"origin": "https://test",
"protocol": "https:",
"username": "",
"password": "",
"host": "test",
"hostname": "test",
"port": "",
"pathname": "/",
"search": "",
"hash": ""
},
{
"input": "non-special://test:@test/x",
"base": "about:blank",
"href": "non-special://test@test/x",
"origin": "null",
"protocol": "non-special:",
"username": "test",
"password": "",
"host": "test",
"hostname": "test",
"port": "",
"pathname": "/x",
"search": "",
"hash": ""
},
{
"input": "non-special://:@test/x",
"base": "about:blank",
"href": "non-special://test/x",
"origin": "null",
"protocol": "non-special:",
"username": "",
"password": "",
"host": "test",
"hostname": "test",
"port": "",
"pathname": "/x",
"search": "",
"hash": ""
},
{
"input": "http:foo.com",
"base": "http://example.org/foo/bar",
Expand Down Expand Up @@ -3098,7 +3158,7 @@
{
"input": "http:a:@www.example.com",
"base": "about:blank",
"href": "http://a:@www.example.com/",
"href": "http://a@www.example.com/",
"origin": "http://www.example.com",
"protocol": "http:",
"username": "a",
Expand All @@ -3113,7 +3173,7 @@
{
"input": "http:/a:@www.example.com",
"base": "about:blank",
"href": "http://a:@www.example.com/",
"href": "http://a@www.example.com/",
"origin": "http://www.example.com",
"protocol": "http:",
"username": "a",
Expand All @@ -3128,7 +3188,7 @@
{
"input": "http://a:@www.example.com",
"base": "about:blank",
"href": "http://a:@www.example.com/",
"href": "http://a@www.example.com/",
"origin": "http://www.example.com",
"protocol": "http:",
"username": "a",
Expand Down Expand Up @@ -3173,7 +3233,7 @@
{
"input": "http://:@www.example.com",
"base": "about:blank",
"href": "http://:@www.example.com/",
"href": "http://www.example.com/",
"origin": "http://www.example.com",
"protocol": "http:",
"username": "",
Expand Down