ab08803959
* chore: bump node in DEPS to v18.17.0 * chore: update build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch Xref: https://github.com/nodejs/node/pull/46930 manually sync patch to minor upstream code shear * chore: update build_ensure_native_module_compilation_fails_if_not_using_a_new.patch Xref: https://github.com/nodejs/node/pull/48248 manually sync patch to minor upstream code shear * chore: update fix_expose_the_built-in_electron_module_via_the_esm_loader.patch Xref: https://github.com/nodejs/node/pull/47824 chore: upstream func throwIfUnsupportedURLProtocol() has been removed, so no need to patch it * chore: update api_pass_oomdetails_to_oomerrorcallback.patch Xref: https://github.com/nodejs/node/pull/47695 manually sync patch to minor upstream code shear * chore: remove fix_prevent_changing_functiontemplateinfo_after_publish.patch Xref: https://github.com/nodejs/node/pull/46979 (upstreamed patch) Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2718147 (related) * chore: update fix_adapt_debugger_tests_for_upstream_v8_changes.patch Xref: https://github.com/nodejs/node/pull/47274 manually sync patch to minor upstream code shear some tests moved from sequential to parallel * chore: remove fix_libc_buffer_overflow_in_string_view_ctor.patch Xref: fix_libc_buffer_overflow_in_string_view_ctor.patch patch is no longer needed due to upstream bump to ada 2.2.0 * chore: remove fix_preventing_potential_oob_in_ada_no_scheme_parsing.patch Xref: https://github.com/nodejs/node/pull/47339 patch is no longer needed due to upstream bump to ada 2.2.0 * chore: rebuild filenames.json several files removed/added/changed upstream * chore: update build_add_gn_build_files.patch upstream dep histogram 0.11.7 moved its include path from src/ to include/ Xref: https://github.com/nodejs/node/pull/47742 * chore: update fix_crypto_tests_to_run_with_bssl.patch Xref: https://github.com/nodejs/node/pull/47160 BoringSSL doesn't support BIO_s_secmem() (a secure heap variant of BIO_s_mem()), so use BIO_s_mem() instead. Related discussion of secure heap support in BoringSSL: https://boringssl-review.googlesource.com/c/boringssl/+/54309 * fix: ftbfs in node dep ada * fix: ftbfs in node dep uvwasi * chore: rebuild patches * chore: update fix_handle_boringssl_and_openssl_incompatibilities.patch Upstream used `BIO_s_secmem()`, a secure heap variant of `BIO_s_mem()`. BoringSSL doesn't support it, so this PR opts for `BIO_s_mem()` instead. Upstream Node.js change that prompted this: https://github.com/nodejs/node/pull/47160 Related discussion of BoringSSL support of secure heap: https://boringssl-review.googlesource.com/c/boringssl/+/54309 * fix: work around Node 18 isURL() regression * chore: sort script/node-disabled-tests.json alphabetically * test: add parallel/test-snapshot-argv1 to disabled list test: add parallel/test-snapshot-namespaced-builtin to disabled list We don't support that type of snapshotting at the moment. * chore: disable flaky node test parallel/test-dgram-send-cb-quelches-error fails upstream in v18.x on my box as well * ci: ensure spawned node tests have ELECTRON_RUN_AS_NODE set * fixup! fix: work around Node 18 isURL() regression fix: infinite loop regression * fixup! fix: work around Node 18 isURL() regression * chore: patch fixtures/errors/force_colors.snapshot The line numbers in the stacktrace from our v8 build don't match what Node's tests are expecting, so update the stacktrace to match our build. The specific numbers probably aren't t needed for the force_colors test, which is trying to see whether or not the lines are greyed out. One option is to upstream a test change to stop hardcoding the stacktrace. * fixup! fix: work around Node 18 isURL() regression fix; pull in upstream bugfix * fixup! ci: ensure spawned node tests have ELECTRON_RUN_AS_NODE set chore: do not inject ELECTRON_RUN_AS_NODE in test-assert-colors.js * chore: disable flaky node test parallel/test-debugger-random-port-with-inspect-port --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Thu, 20 Jul 2023 14:18:19 -0500
|
|
Subject: fix: isURL() implementation
|
|
|
|
Modify Node's lib/internal/url.js isURL() to return the correct value for
|
|
URLs created both inside and outside of Node.
|
|
|
|
The isURL() impl in `main` is Electron-safe but can't be backported in
|
|
isolation because it relies on other changes from 18 to main. But we can
|
|
safely get there by trying the 18 version first (catching Node URLs),
|
|
then the `main` version (catching Electron URLs).
|
|
|
|
More background w/upstream links at
|
|
https://github.com/electron/electron/pull/39154#issuecomment-1644433388
|
|
|
|
This patch can be removed when we update to Node 20.
|
|
|
|
diff --git a/lib/internal/url.js b/lib/internal/url.js
|
|
index 36604c9de2179b5f6941dd9a7af66cdb03facd7f..525b18e58a3e2f8e5ddfb138b1c54fd9b23a20cf 100644
|
|
--- a/lib/internal/url.js
|
|
+++ b/lib/internal/url.js
|
|
@@ -592,7 +592,12 @@ ObjectDefineProperties(URLSearchParams.prototype, {
|
|
* @returns {self is URL}
|
|
*/
|
|
function isURL(self) {
|
|
- return self != null && ObjectPrototypeHasOwnProperty(self, context);
|
|
+ // if it has `context` it is a Node.js URL...
|
|
+ if (self != null && ObjectPrototypeHasOwnProperty(self, context))
|
|
+ return true;
|
|
+
|
|
+ // ...but also honor 3rd party URLs e.g. from Electron.
|
|
+ return Boolean(self?.href && self.protocol && self.auth === undefined && self.path === undefined);
|
|
}
|
|
|
|
class URL {
|
|
@@ -688,14 +693,10 @@ class URL {
|
|
}
|
|
|
|
get href() {
|
|
- if (!isURL(this))
|
|
- throw new ERR_INVALID_THIS('URL');
|
|
return this[context].href;
|
|
}
|
|
|
|
set href(value) {
|
|
- if (!isURL(this))
|
|
- throw new ERR_INVALID_THIS('URL');
|
|
value = `${value}`;
|
|
const href = bindingUrl.update(this[context].href, updateActions.kHref, value);
|
|
if (!href) { throw ERR_INVALID_URL(value); }
|
|
diff --git a/test/parallel/test-whatwg-url-invalidthis.js b/test/parallel/test-whatwg-url-invalidthis.js
|
|
index 790c28e37c13ed6763cb61b549ab4a983f384717..bddf48b8302632a275d996a53b09343938dc7dc9 100644
|
|
--- a/test/parallel/test-whatwg-url-invalidthis.js
|
|
+++ b/test/parallel/test-whatwg-url-invalidthis.js
|
|
@@ -15,7 +15,6 @@ const assert = require('assert');
|
|
});
|
|
|
|
[
|
|
- 'href',
|
|
'protocol',
|
|
'username',
|
|
'password',
|
|
@@ -36,7 +35,6 @@ const assert = require('assert');
|
|
});
|
|
|
|
[
|
|
- 'origin',
|
|
'searchParams',
|
|
].forEach((i) => {
|
|
assert.throws(() => Reflect.get(URL.prototype, i, {}), {
|