GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — src: set HAS_USERNAME/PASSWORD more strictly · nodejs/node@eb20e3d

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • src
    • node_url.cc
  • test/parallel
    • test-whatwg-url-custom-deepequal.js
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/node_url.cc‎

Copy file name to clipboardExpand all lines: src/node_url.cc
+20-8Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,21 +1208,33 @@ inline url_data HarvestBase(Environment* env, Local<Object> base_obj) {
12081208
base_obj->Get(env->context(), env->scheme_string()).ToLocalChecked();
12091209
base.scheme = Utf8Value(env->isolate(), scheme).out();
12101210

1211-
auto GetStr = [&](std::string url_data::* member,
1211+
auto GetStr = [&](std::string url_data::*member,
12121212
int flag,
1213-
Local<String> name) {
1213+
Local<String> name,
1214+
bool empty_as_present) {
12141215
Local<Value> value = base_obj->Get(env->context(), name).ToLocalChecked();
12151216
if (value->IsString()) {
12161217
Utf8Value utf8value(env->isolate(), value.As<String>());
12171218
(base.*member).assign(*utf8value, utf8value.length());
1218-
base.flags |= flag;
1219+
if (empty_as_present || value.As<String>()->Length() != 0) {
1220+
base.flags |= flag;
1221+
}
12191222
}
12201223
};
1221-
GetStr(&url_data::username, URL_FLAGS_HAS_USERNAME, env->username_string());
1222-
GetStr(&url_data::password, URL_FLAGS_HAS_PASSWORD, env->password_string());
1223-
GetStr(&url_data::host, URL_FLAGS_HAS_HOST, env->host_string());
1224-
GetStr(&url_data::query, URL_FLAGS_HAS_QUERY, env->query_string());
1225-
GetStr(&url_data::fragment, URL_FLAGS_HAS_FRAGMENT, env->fragment_string());
1224+
GetStr(&url_data::username,
1225+
URL_FLAGS_HAS_USERNAME,
1226+
env->username_string(),
1227+
false);
1228+
GetStr(&url_data::password,
1229+
URL_FLAGS_HAS_PASSWORD,
1230+
env->password_string(),
1231+
false);
1232+
GetStr(&url_data::host, URL_FLAGS_HAS_HOST, env->host_string(), true);
1233+
GetStr(&url_data::query, URL_FLAGS_HAS_QUERY, env->query_string(), true);
1234+
GetStr(&url_data::fragment,
1235+
URL_FLAGS_HAS_FRAGMENT,
1236+
env->fragment_string(),
1237+
true);
12261238

12271239
Local<Value> port =
12281240
base_obj->Get(env->context(), env->port_string()).ToLocalChecked();
Collapse file

‎test/parallel/test-whatwg-url-custom-deepequal.js‎

Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
'use strict';
2+
// This tests that the internal flags in URL objects are consistent, as manifest
3+
// through assert libraries.
4+
// See https://github.com/nodejs/node/issues/24211
5+
6+
// Tests below are not from WPT.
7+
8+
require('../common');
9+
const assert = require('assert');
10+
11+
assert.deepStrictEqual(
12+
new URL('./foo', 'https://example.com/'),
13+
new URL('https://example.com/foo')
14+
);
15+
assert.deepStrictEqual(
16+
new URL('./foo', 'https://user:[email protected]/'),
17+
new URL('https://user:[email protected]/foo')
18+
);

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.