1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

url: handle quasi-WHATWG URLs in urlToOptions()

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/26226
Refs: https://github.com/nodejs/node/issues/26198
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
cjihrig 2019-02-20 20:47:25 -05:00
parent ccd6b12fec
commit 4900863043
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/url.js
View File

@ -1257,13 +1257,13 @@ function domainToUnicode(domain) {
function urlToOptions(url) { function urlToOptions(url) {
var options = { var options = {
protocol: url.protocol, protocol: url.protocol,
hostname: url.hostname.startsWith('[') ? hostname: typeof url.hostname === 'string' && url.hostname.startsWith('[') ?
url.hostname.slice(1, -1) : url.hostname.slice(1, -1) :
url.hostname, url.hostname,
hash: url.hash, hash: url.hash,
search: url.search, search: url.search,
pathname: url.pathname, pathname: url.pathname,
path: `${url.pathname}${url.search}`, path: `${url.pathname || ''}${url.search || ''}`,
href: url.href href: url.href
}; };
if (url.port !== '') { if (url.port !== '') {

21
test/parallel/test-whatwg-url-custom-properties.js
View File

@ -133,8 +133,8 @@ assert.strictEqual(url.searchParams, oldParams);
// Test urlToOptions // Test urlToOptions
{ {
const opts = const urlObj = new URL('http://user:pass@foo.bar.com:21/aaa/zzz?l=24#test');
urlToOptions(new URL('http://user:pass@foo.bar.com:21/aaa/zzz?l=24#test')); const opts = urlToOptions(urlObj);
assert.strictEqual(opts instanceof URL, false); assert.strictEqual(opts instanceof URL, false);
assert.strictEqual(opts.protocol, 'http:'); assert.strictEqual(opts.protocol, 'http:');
assert.strictEqual(opts.auth, 'user:pass'); assert.strictEqual(opts.auth, 'user:pass');
@ -147,6 +147,23 @@ assert.strictEqual(url.searchParams, oldParams);
const { hostname } = urlToOptions(new URL('http://[::1]:21')); const { hostname } = urlToOptions(new URL('http://[::1]:21'));
assert.strictEqual(hostname, '::1'); assert.strictEqual(hostname, '::1');
// If a WHATWG URL object is copied, it is possible that the resulting copy
// contains the Symbols that Node uses for brand checking, but not the data
// properties, which are getters. Verify that urlToOptions() can handle such
// a case.
const copiedUrlObj = Object.assign({}, urlObj);
const copiedOpts = urlToOptions(copiedUrlObj);
assert.strictEqual(copiedOpts instanceof URL, false);
assert.strictEqual(copiedOpts.protocol, undefined);
assert.strictEqual(copiedOpts.auth, undefined);
assert.strictEqual(copiedOpts.hostname, undefined);
assert.strictEqual(copiedOpts.port, NaN);
assert.strictEqual(copiedOpts.path, '');
assert.strictEqual(copiedOpts.pathname, undefined);
assert.strictEqual(copiedOpts.search, undefined);
assert.strictEqual(copiedOpts.hash, undefined);
assert.strictEqual(copiedOpts.href, undefined);
} }
// Test special origins // Test special origins