mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
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>
70 lines
3.2 KiB
Diff
70 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <samuel.r.attard@gmail.com>
|
|
Date: Mon, 7 Mar 2022 16:36:28 -0800
|
|
Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
|
|
SIGUSR1 handling
|
|
|
|
This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent. Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
|
|
|
|
diff --git a/src/env-inl.h b/src/env-inl.h
|
|
index 7ceab0da0c632f857f6e2d0fbf479bbc4f55df07..debd982c75805c51ea7d01229b9d635550060503 100644
|
|
--- a/src/env-inl.h
|
|
+++ b/src/env-inl.h
|
|
@@ -627,6 +627,10 @@ inline bool Environment::no_global_search_paths() const {
|
|
!options_->global_search_paths;
|
|
}
|
|
|
|
+inline bool Environment::should_start_debug_signal_handler() const {
|
|
+ return (flags_ & EnvironmentFlags::kNoStartDebugSignalHandler) == 0;
|
|
+}
|
|
+
|
|
inline bool Environment::no_browser_globals() const {
|
|
// configure --no-browser-globals
|
|
#ifdef NODE_NO_BROWSER_GLOBALS
|
|
diff --git a/src/env.h b/src/env.h
|
|
index b0f10cfca00f380728903d5e0ea24cf3156ead0f..c914b621f50bcd6bce2617fef9e48737235aa516 100644
|
|
--- a/src/env.h
|
|
+++ b/src/env.h
|
|
@@ -748,6 +748,7 @@ class Environment : public MemoryRetainer {
|
|
inline bool tracks_unmanaged_fds() const;
|
|
inline bool hide_console_windows() const;
|
|
inline bool no_global_search_paths() const;
|
|
+ inline bool should_start_debug_signal_handler() const;
|
|
inline bool no_browser_globals() const;
|
|
inline uint64_t thread_id() const;
|
|
inline worker::Worker* worker_context() const;
|
|
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
|
|
index b1ba86b7b0b2349f771e01143630e45cf0aecc3b..4c9f7f636aeeb19a87150ac5a05e28159503f051 100644
|
|
--- a/src/inspector_agent.cc
|
|
+++ b/src/inspector_agent.cc
|
|
@@ -703,8 +703,10 @@ bool Agent::Start(const std::string& path,
|
|
StartIoThreadAsyncCallback));
|
|
uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
|
|
start_io_thread_async.data = this;
|
|
- // Ignore failure, SIGUSR1 won't work, but that should not block node start.
|
|
- StartDebugSignalHandler();
|
|
+ if (parent_env_->should_start_debug_signal_handler()) {
|
|
+ // Ignore failure, SIGUSR1 won't work, but that should not block node start.
|
|
+ StartDebugSignalHandler();
|
|
+ }
|
|
|
|
parent_env_->AddCleanupHook([](void* data) {
|
|
Environment* env = static_cast<Environment*>(data);
|
|
diff --git a/src/node.h b/src/node.h
|
|
index b50bd5a941d381778d464fdb2770566a3ac34fed..c4cce244359d893acf31e78f935152d4d47b14cd 100644
|
|
--- a/src/node.h
|
|
+++ b/src/node.h
|
|
@@ -575,7 +575,11 @@ enum Flags : uint64_t {
|
|
// This control is needed by embedders who may not want to initialize the V8
|
|
// inspector in situations where one has already been created,
|
|
// e.g. Blink's in Chromium.
|
|
- kNoCreateInspector = 1 << 9
|
|
+ kNoCreateInspector = 1 << 9,
|
|
+ // Controls where or not the InspectorAgent for this Environment should
|
|
+ // call StartDebugSignalHandler. This control is needed by embedders who may
|
|
+ // not want to allow other processes to start the V8 inspector.
|
|
+ kNoStartDebugSignalHandler = 1 << 10
|
|
};
|
|
} // namespace EnvironmentFlags
|
|
|