![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
308 lines
11 KiB
C++
308 lines
11 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
||
// Use of this source code is governed by the MIT license that can be
|
||
// found in the LICENSE file.
|
||
|
||
#include "shell/app/node_main.h"
|
||
|
||
#include <iostream>
|
||
#include <map>
|
||
#include <memory>
|
||
#include <string>
|
||
#include <string_view>
|
||
#include <utility>
|
||
#include <vector>
|
||
|
||
#include "base/base_switches.h"
|
||
#include "base/command_line.h"
|
||
#include "base/containers/fixed_flat_set.h"
|
||
#include "base/environment.h"
|
||
#include "base/feature_list.h"
|
||
#include "base/task/single_thread_task_runner.h"
|
||
#include "base/task/thread_pool/thread_pool_instance.h"
|
||
#include "content/public/common/content_switches.h"
|
||
#include "electron/fuses.h"
|
||
#include "electron/mas.h"
|
||
#include "gin/array_buffer.h"
|
||
#include "gin/public/isolate_holder.h"
|
||
#include "gin/v8_initializer.h"
|
||
#include "shell/app/uv_task_runner.h"
|
||
#include "shell/browser/javascript_environment.h"
|
||
#include "shell/common/api/electron_bindings.h"
|
||
#include "shell/common/electron_command_line.h"
|
||
#include "shell/common/gin_helper/dictionary.h"
|
||
#include "shell/common/node_bindings.h"
|
||
#include "shell/common/node_includes.h"
|
||
#include "shell/common/node_util.h"
|
||
|
||
#if BUILDFLAG(IS_WIN)
|
||
#include "chrome/child/v8_crashpad_support_win.h"
|
||
#endif
|
||
|
||
#if BUILDFLAG(IS_LINUX)
|
||
#include "base/posix/global_descriptors.h"
|
||
#include "base/strings/string_number_conversions.h"
|
||
#include "components/crash/core/app/crash_switches.h" // nogncheck
|
||
#include "content/public/common/content_descriptors.h"
|
||
#endif
|
||
|
||
#if BUILDFLAG(IS_MAC)
|
||
#include "shell/common/mac/codesign_util.h"
|
||
#endif
|
||
|
||
#if !IS_MAS_BUILD()
|
||
#include "components/crash/core/app/crashpad.h" // nogncheck
|
||
#include "shell/app/electron_crash_reporter_client.h"
|
||
#include "shell/common/crash_keys.h"
|
||
#endif
|
||
|
||
namespace {
|
||
|
||
// Preparse Node.js cli options to pass to Node.js
|
||
// See https://nodejs.org/api/cli.html#cli_options
|
||
void ExitIfContainsDisallowedFlags(const std::vector<std::string>& argv) {
|
||
// Options that are unilaterally disallowed.
|
||
static constexpr auto disallowed = base::MakeFixedFlatSet<std::string_view>({
|
||
"--enable-fips",
|
||
"--force-fips",
|
||
"--openssl-config",
|
||
"--use-bundled-ca",
|
||
"--use-openssl-ca",
|
||
});
|
||
|
||
for (const auto& arg : argv) {
|
||
const auto key = std::string_view{arg}.substr(0, arg.find('='));
|
||
if (disallowed.contains(key)) {
|
||
LOG(ERROR) << "The Node.js cli flag " << key
|
||
<< " is not supported in Electron";
|
||
// Node.js returns 9 from ProcessGlobalArgs for any errors encountered
|
||
// when setting up cli flags and env vars. Since we're outlawing these
|
||
// flags (making them errors) exit with the same error code for
|
||
// consistency.
|
||
exit(9);
|
||
}
|
||
}
|
||
}
|
||
|
||
#if BUILDFLAG(IS_MAC)
|
||
// A list of node envs that may be used to inject scripts.
|
||
const char* kHijackableEnvs[] = {"NODE_OPTIONS", "NODE_REPL_EXTERNAL_MODULE"};
|
||
|
||
// Return true if there is any env in kHijackableEnvs.
|
||
bool UnsetHijackableEnvs(base::Environment* env) {
|
||
bool has = false;
|
||
for (const char* name : kHijackableEnvs) {
|
||
if (env->HasVar(name)) {
|
||
env->UnSetVar(name);
|
||
has = true;
|
||
}
|
||
}
|
||
return has;
|
||
}
|
||
#endif
|
||
|
||
#if IS_MAS_BUILD()
|
||
void SetCrashKeyStub(const std::string& key, const std::string& value) {}
|
||
void ClearCrashKeyStub(const std::string& key) {}
|
||
#endif
|
||
|
||
v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
|
||
std::map<std::string, std::string> keys;
|
||
#if !IS_MAS_BUILD()
|
||
electron::crash_keys::GetCrashKeys(&keys);
|
||
#endif
|
||
return gin::ConvertToV8(isolate, keys);
|
||
}
|
||
|
||
} // namespace
|
||
|
||
namespace electron {
|
||
|
||
int NodeMain() {
|
||
DCHECK(base::CommandLine::InitializedForCurrentProcess());
|
||
|
||
auto os_env = base::Environment::Create();
|
||
bool node_options_enabled = electron::fuses::IsNodeOptionsEnabled();
|
||
if (!node_options_enabled) {
|
||
os_env->UnSetVar("NODE_OPTIONS");
|
||
os_env->UnSetVar("NODE_EXTRA_CA_CERTS");
|
||
}
|
||
|
||
#if BUILDFLAG(IS_MAC)
|
||
if (!ProcessSignatureIsSameWithCurrentApp(getppid())) {
|
||
// On macOS, it is forbidden to run sandboxed app with custom arguments
|
||
// from another app, i.e. args are discarded in following call:
|
||
// exec("Sandboxed.app", ["--custom-args-will-be-discarded"])
|
||
// However it is possible to bypass the restriction by abusing the node mode
|
||
// of Electron apps:
|
||
// exec("Electron.app", {env: {ELECTRON_RUN_AS_NODE: "1",
|
||
// NODE_OPTIONS: "--require 'bad.js'"}})
|
||
// To prevent Electron apps from being used to work around macOS security
|
||
// restrictions, when the parent process is not part of the app bundle, all
|
||
// environment variables that may be used to inject scripts are removed.
|
||
if (UnsetHijackableEnvs(os_env.get())) {
|
||
LOG(ERROR) << "Node.js environment variables are disabled because this "
|
||
"process is invoked by other apps.";
|
||
}
|
||
}
|
||
#endif // BUILDFLAG(IS_MAC)
|
||
|
||
#if BUILDFLAG(IS_WIN)
|
||
v8_crashpad_support::SetUp();
|
||
#endif
|
||
|
||
#if BUILDFLAG(IS_LINUX)
|
||
std::string fd_string, pid_string;
|
||
if (os_env->GetVar("CRASHDUMP_SIGNAL_FD", &fd_string) &&
|
||
os_env->GetVar("CRASHPAD_HANDLER_PID", &pid_string)) {
|
||
int fd = -1, pid = -1;
|
||
DCHECK(base::StringToInt(fd_string, &fd));
|
||
DCHECK(base::StringToInt(pid_string, &pid));
|
||
base::GlobalDescriptors::GetInstance()->Set(kCrashDumpSignal, fd);
|
||
// Following API is unsafe in multi-threaded scenario, but at this point
|
||
// we are still single threaded.
|
||
os_env->UnSetVar("CRASHDUMP_SIGNAL_FD");
|
||
os_env->UnSetVar("CRASHPAD_HANDLER_PID");
|
||
}
|
||
#endif
|
||
|
||
int exit_code = 1;
|
||
{
|
||
// Feed gin::PerIsolateData with a task runner.
|
||
uv_loop_t* loop = uv_default_loop();
|
||
auto uv_task_runner = base::MakeRefCounted<UvTaskRunner>(loop);
|
||
base::SingleThreadTaskRunner::CurrentDefaultHandle handle(uv_task_runner);
|
||
|
||
// Initialize feature list.
|
||
auto feature_list = std::make_unique<base::FeatureList>();
|
||
feature_list->InitFromCommandLine("", "");
|
||
base::FeatureList::SetInstance(std::move(feature_list));
|
||
|
||
// Explicitly register electron's builtin bindings.
|
||
NodeBindings::RegisterBuiltinBindings();
|
||
|
||
// Parse Node.js cli flags and strip out disallowed options.
|
||
const std::vector<std::string> args = ElectronCommandLine::AsUtf8();
|
||
ExitIfContainsDisallowedFlags(args);
|
||
|
||
std::shared_ptr<node::InitializationResult> result =
|
||
node::InitializeOncePerProcess(
|
||
args,
|
||
{node::ProcessInitializationFlags::kNoInitializeV8,
|
||
node::ProcessInitializationFlags::kNoInitializeNodeV8Platform});
|
||
|
||
for (const std::string& error : result->errors())
|
||
std::cerr << args[0] << ": " << error << '\n';
|
||
|
||
if (result->early_return() != 0) {
|
||
return result->exit_code();
|
||
}
|
||
|
||
#if BUILDFLAG(IS_LINUX)
|
||
// On Linux, initialize crashpad after Nodejs init phase so that
|
||
// crash and termination signal handlers can be set by the crashpad client.
|
||
if (!pid_string.empty()) {
|
||
auto* command_line = base::CommandLine::ForCurrentProcess();
|
||
command_line->AppendSwitchASCII(
|
||
crash_reporter::switches::kCrashpadHandlerPid, pid_string);
|
||
ElectronCrashReporterClient::Create();
|
||
crash_reporter::InitializeCrashpad(false, "node");
|
||
crash_keys::SetCrashKeysFromCommandLine(
|
||
*base::CommandLine::ForCurrentProcess());
|
||
crash_keys::SetPlatformCrashKey();
|
||
// Ensure the flags and env variable does not propagate to userland.
|
||
command_line->RemoveSwitch(crash_reporter::switches::kCrashpadHandlerPid);
|
||
}
|
||
#elif BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_MAC) && !IS_MAS_BUILD())
|
||
ElectronCrashReporterClient::Create();
|
||
crash_reporter::InitializeCrashpad(false, "node");
|
||
crash_keys::SetCrashKeysFromCommandLine(
|
||
*base::CommandLine::ForCurrentProcess());
|
||
crash_keys::SetPlatformCrashKey();
|
||
#endif
|
||
|
||
gin::V8Initializer::LoadV8Snapshot(
|
||
gin::V8SnapshotFileType::kWithAdditionalContext);
|
||
|
||
// V8 requires a task scheduler.
|
||
base::ThreadPoolInstance::CreateAndStartWithDefaultParams("Electron");
|
||
|
||
// Allow Node.js to track the amount of time the event loop has spent
|
||
// idle in the kernel’s event provider .
|
||
uv_loop_configure(loop, UV_METRICS_IDLE_TIME);
|
||
|
||
// Initialize gin::IsolateHolder.
|
||
bool setup_wasm_streaming =
|
||
node::per_process::cli_options->get_per_isolate_options()
|
||
->get_per_env_options()
|
||
->experimental_fetch;
|
||
JavascriptEnvironment gin_env(loop, setup_wasm_streaming);
|
||
|
||
v8::Isolate* isolate = gin_env.isolate();
|
||
|
||
v8::Isolate::Scope isolate_scope(isolate);
|
||
v8::Locker locker(isolate);
|
||
node::Environment* env = nullptr;
|
||
node::IsolateData* isolate_data = nullptr;
|
||
{
|
||
v8::HandleScope scope(isolate);
|
||
|
||
isolate_data = node::CreateIsolateData(isolate, loop, gin_env.platform());
|
||
CHECK_NE(nullptr, isolate_data);
|
||
|
||
uint64_t env_flags = node::EnvironmentFlags::kDefaultFlags |
|
||
node::EnvironmentFlags::kHideConsoleWindows;
|
||
env = electron::util::CreateEnvironment(
|
||
isolate, isolate_data, isolate->GetCurrentContext(), result->args(),
|
||
result->exec_args(),
|
||
static_cast<node::EnvironmentFlags::Flags>(env_flags));
|
||
CHECK_NE(nullptr, env);
|
||
|
||
node::SetIsolateUpForNode(isolate);
|
||
|
||
gin_helper::Dictionary process(isolate, env->process_object());
|
||
process.SetMethod("crash", &ElectronBindings::Crash);
|
||
|
||
// Setup process.crashReporter in child node processes
|
||
auto reporter = gin_helper::Dictionary::CreateEmpty(isolate);
|
||
reporter.SetMethod("getParameters", &GetParameters);
|
||
#if IS_MAS_BUILD()
|
||
reporter.SetMethod("addExtraParameter", &SetCrashKeyStub);
|
||
reporter.SetMethod("removeExtraParameter", &ClearCrashKeyStub);
|
||
#else
|
||
reporter.SetMethod("addExtraParameter",
|
||
&electron::crash_keys::SetCrashKey);
|
||
reporter.SetMethod("removeExtraParameter",
|
||
&electron::crash_keys::ClearCrashKey);
|
||
#endif
|
||
|
||
process.Set("crashReporter", reporter);
|
||
}
|
||
|
||
v8::HandleScope scope(isolate);
|
||
node::LoadEnvironment(env, node::StartExecutionCallback{}, &OnNodePreload);
|
||
|
||
// Potential reasons we get Nothing here may include: the env
|
||
// is stopping, or the user hooks process.emit('exit').
|
||
exit_code = node::SpinEventLoop(env).FromMaybe(1);
|
||
|
||
node::ResetStdio();
|
||
|
||
node::Stop(env, node::StopFlags::kDoNotTerminateIsolate);
|
||
|
||
node::FreeEnvironment(env);
|
||
node::FreeIsolateData(isolate_data);
|
||
}
|
||
|
||
// According to "src/gin/shell/gin_main.cc":
|
||
//
|
||
// gin::IsolateHolder waits for tasks running in ThreadPool in its
|
||
// destructor and thus must be destroyed before ThreadPool starts skipping
|
||
// CONTINUE_ON_SHUTDOWN tasks.
|
||
base::ThreadPoolInstance::Get()->Shutdown();
|
||
|
||
v8::V8::Dispose();
|
||
|
||
return exit_code;
|
||
}
|
||
|
||
} // namespace electron
|