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

src: set HAS_USERNAME/PASSWORD more strictly

Browse Source 
Fixes: https://github.com/nodejs/node/issues/24211

PR-URL: https://github.com/nodejs/node/pull/24495
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Timothy Gu 2018-11-13 15:31:44 -08:00 committed by Rich Trott
parent e1438025ed
commit 639f6411a7
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/node_url.cc
View File

@ -1209,21 +1209,33 @@ inline url_data HarvestBase(Environment* env, Local<Object> base_obj) {
base_obj->Get(env->context(), env->scheme_string()).ToLocalChecked(); base_obj->Get(env->context(), env->scheme_string()).ToLocalChecked();
base.scheme = Utf8Value(env->isolate(), scheme).out(); base.scheme = Utf8Value(env->isolate(), scheme).out();
auto GetStr = [&](std::string url_data::* member, auto GetStr = [&](std::string url_data::*member,
int flag, int flag,
Local<String> name) { Local<String> name,
bool empty_as_present) {
Local<Value> value = base_obj->Get(env->context(), name).ToLocalChecked(); Local<Value> value = base_obj->Get(env->context(), name).ToLocalChecked();
if (value->IsString()) { if (value->IsString()) {
Utf8Value utf8value(env->isolate(), value.As<String>()); Utf8Value utf8value(env->isolate(), value.As<String>());
(base.*member).assign(*utf8value, utf8value.length()); (base.*member).assign(*utf8value, utf8value.length());
if (empty_as_present || value.As<String>()->Length() != 0) {
base.flags |= flag; base.flags |= flag;
} }
}
}; };
GetStr(&url_data::username, URL_FLAGS_HAS_USERNAME, env->username_string()); GetStr(&url_data::username,
GetStr(&url_data::password, URL_FLAGS_HAS_PASSWORD, env->password_string()); URL_FLAGS_HAS_USERNAME,
GetStr(&url_data::host, URL_FLAGS_HAS_HOST, env->host_string()); env->username_string(),
GetStr(&url_data::query, URL_FLAGS_HAS_QUERY, env->query_string()); false);
GetStr(&url_data::fragment, URL_FLAGS_HAS_FRAGMENT, env->fragment_string()); GetStr(&url_data::password,
URL_FLAGS_HAS_PASSWORD,
env->password_string(),
false);
GetStr(&url_data::host, URL_FLAGS_HAS_HOST, env->host_string(), true);
GetStr(&url_data::query, URL_FLAGS_HAS_QUERY, env->query_string(), true);
GetStr(&url_data::fragment,
URL_FLAGS_HAS_FRAGMENT,
env->fragment_string(),
true);
Local<Value> port = Local<Value> port =
base_obj->Get(env->context(), env->port_string()).ToLocalChecked(); base_obj->Get(env->context(), env->port_string()).ToLocalChecked();

18
test/parallel/test-whatwg-url-custom-deepequal.js Normal file
View File

@ -0,0 +1,18 @@
'use strict';
// This tests that the internal flags in URL objects are consistent, as manifest
// through assert libraries.
// See https://github.com/nodejs/node/issues/24211
// Tests below are not from WPT.
require('../common');
const assert = require('assert');
assert.deepStrictEqual(
new URL('./foo', 'https://example.com/'),
new URL('https://example.com/foo')
);
assert.deepStrictEqual(
new URL('./foo', 'https://user:pass@example.com/'),
new URL('https://user:pass@example.com/foo')
);