
* chore: upgrade to Node.js v20
* src: allow embedders to override NODE_MODULE_VERSION
https://github.com/nodejs/node/pull/49279
* src: fix missing trailing ,
https://github.com/nodejs/node/pull/46909
* src,tools: initialize cppgc
https://github.com/nodejs/node/pull/45704
* tools: allow passing absolute path of config.gypi in js2c
https://github.com/nodejs/node/pull/49162
* tools: port js2c.py to C++
https://github.com/nodejs/node/pull/46997
* doc,lib: disambiguate the old term, NativeModule
https://github.com/nodejs/node/pull/45673
* chore: fixup Node.js BSSL tests
* https://github.com/nodejs/node/pull/49492
* https://github.com/nodejs/node/pull/44498
* deps: upgrade to libuv 1.45.0
https://github.com/nodejs/node/pull/48078
* deps: update V8 to 10.7
https://github.com/nodejs/node/pull/44741
* test: use gcUntil() in test-v8-serialize-leak
https://github.com/nodejs/node/pull/49168
* module: make CJS load from ESM loader
https://github.com/nodejs/node/pull/47999
* src: make BuiltinLoader threadsafe and non-global
https://github.com/nodejs/node/pull/45942
* chore: address changes to CJS/ESM loading
* module: make CJS load from ESM loader (https://github.com/nodejs/node/pull/47999)
* lib: improve esm resolve performance (https://github.com/nodejs/node/pull/46652)
* bootstrap: optimize modules loaded in the built-in snapshot
https://github.com/nodejs/node/pull/45849
* test: mark test-runner-output as flaky
https://github.com/nodejs/node/pull/49854
* lib: lazy-load deps in modules/run_main.js
https://github.com/nodejs/node/pull/45849
* url: use private properties for brand check
https://github.com/nodejs/node/pull/46904
* test: refactor `test-node-output-errors`
https://github.com/nodejs/node/pull/48992
* assert: deprecate callTracker
https://github.com/nodejs/node/pull/47740
* src: cast v8::Object::GetInternalField() return value to v8::Value
https://github.com/nodejs/node/pull/48943
* test: adapt test-v8-stats for V8 update
https://github.com/nodejs/node/pull/45230
* tls: ensure TLS Sockets are closed if the underlying wrap closes
https://github.com/nodejs/node/pull/49327
* test: deflake test-tls-socket-close
https://github.com/nodejs/node/pull/49575
* net: fix crash due to simultaneous close/shutdown on JS Stream Sockets
https://github.com/nodejs/node/pull/49400
* net: use asserts in JS Socket Stream to catch races in future
https://github.com/nodejs/node/pull/49400
* lib: fix BroadcastChannel initialization location
https://github.com/nodejs/node/pull/46864
* src: create BaseObject with node::Realm
https://github.com/nodejs/node/pull/44348
* src: implement DataQueue and non-memory resident Blob
https://github.com/nodejs/node/pull/45258
* sea: add support for V8 bytecode-only caching
https://github.com/nodejs/node/pull/48191
* chore: fixup patch indices
* gyp: put filenames in variables
https://github.com/nodejs/node/pull/46965
* build: modify js2c.py into GN executable
* fix: (WIP) handle string replacement of fs -> original-fs
* [v20.x] backport vm-related memory fixes
https://github.com/nodejs/node/pull/49874
* src: make BuiltinLoader threadsafe and non-global
https://github.com/nodejs/node/pull/45942
* src: avoid copying string in fs_permission
https://github.com/nodejs/node/pull/47746
* look upon my works ye mighty
and dispair
* chore: patch cleanup
* [api] Remove AllCan Read/Write
5006387
* fix: missing include for NODE_EXTERN
* chore: fixup patch indices
* fix: fail properly when js2c fails in Node.js
* build: fix js2c root_gen_dir
* fix: lib/fs.js -> lib/original-fs.js
* build: fix original-fs file xforms
* fixup! module: make CJS load from ESM loader
* build: get rid of CppHeap for now
* build: add patch to prevent extra fs lookup on esm load
* build: greatly simplify js2c modifications
Moves our original-fs modifications back into a super simple python script action, wires up the output of that action into our call to js2c
* chore: update to handle moved internal/modules/helpers file
* test: update @types/node test
* feat: enable preventing cppgc heap creation
* feat: optionally prevent calling V8::EnableWebAssemblyTrapHandler
* fix: no cppgc initialization in the renderer
* gyp: put filenames in variables
https://github.com/nodejs/node/pull/46965
* test: disable single executable tests
* fix: nan tests failing on node headers missing file
* tls,http2: send fatal alert on ALPN mismatch
https://github.com/nodejs/node/pull/44031
* test: disable snapshot tests
* https://github.com/nodejs/node/pull/47887
* https://github.com/nodejs/node/pull/49684
* https://github.com/nodejs/node/pull/44193
* build: use deps/v8 for v8/tools
Node.js hard depends on these in their builtins
* test: fix edge snapshot stack traces
https://github.com/nodejs/node/pull/49659
* build: remove js2c //base dep
* build: use electron_js2c_toolchain to build node_js2c
* fix: don't create SafeSet outside packageResolve
Fixes failure in parallel/test-require-delete-array-iterator:
=== release test-require-delete-array-iterator ===
Path: parallel/test-require-delete-array-iterator
node:internal/per_context/primordials:426
constructor(i) { super(i); } // eslint-disable-line no-useless-constructor
^
TypeError: object is not iterable (cannot read property Symbol(Symbol.iterator))
at new Set (<anonymous>)
at new SafeSet (node:internal/per_context/primordials:426:22)
* fix: failing crashReporter tests on Linux
These were failing because our change from node::InitializeNodeWithArgs to
node::InitializeOncePerProcess meant that we now inadvertently called
PlatformInit, which reset signal handling. This meant that our intentional
crash function ElectronBindings::Crash no longer worked and the renderer process
no longer crashed when process.crash() was called. We don't want to use Node.js'
default signal handling in the renderer process, so we disable it by passing
kNoDefaultSignalHandling to node::InitializeOncePerProcess.
* build: only create cppgc heap on non-32 bit platforms
* chore: clean up util:CompileAndCall
* src: fix compatility with upcoming V8 12.1 APIs
https://github.com/nodejs/node/pull/50709
* fix: use thread_local BuiltinLoader
* chore: fixup v8 patch indices
---------
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
235 lines
8.2 KiB
C++
235 lines
8.2 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/renderer/electron_sandboxed_renderer_client.h"
|
|
|
|
#include <iterator>
|
|
#include <tuple>
|
|
#include <vector>
|
|
|
|
#include "base/base_paths.h"
|
|
#include "base/command_line.h"
|
|
#include "base/containers/contains.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/path_service.h"
|
|
#include "base/process/process_handle.h"
|
|
#include "base/process/process_metrics.h"
|
|
#include "content/public/renderer/render_frame.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "shell/common/api/electron_bindings.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/microtasks_scope.h"
|
|
#include "shell/common/node_bindings.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/node_util.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "shell/renderer/electron_render_frame_observer.h"
|
|
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
|
#include "third_party/blink/public/web/blink.h"
|
|
#include "third_party/blink/public/web/web_document.h"
|
|
#include "third_party/electron_node/src/node_binding.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const char kEmitProcessEventKey[] = "emit-process-event";
|
|
const char kBindingCacheKey[] = "native-binding-cache";
|
|
|
|
v8::Local<v8::Object> GetBindingCache(v8::Isolate* isolate) {
|
|
auto context = isolate->GetCurrentContext();
|
|
gin_helper::Dictionary global(isolate, context->Global());
|
|
v8::Local<v8::Value> cache;
|
|
|
|
if (!global.GetHidden(kBindingCacheKey, &cache)) {
|
|
cache = v8::Object::New(isolate);
|
|
global.SetHidden(kBindingCacheKey, cache);
|
|
}
|
|
|
|
return cache->ToObject(context).ToLocalChecked();
|
|
}
|
|
|
|
// adapted from node.cc
|
|
v8::Local<v8::Value> GetBinding(v8::Isolate* isolate,
|
|
v8::Local<v8::String> key,
|
|
gin_helper::Arguments* margs) {
|
|
v8::Local<v8::Object> exports;
|
|
std::string binding_key = gin::V8ToString(isolate, key);
|
|
gin_helper::Dictionary cache(isolate, GetBindingCache(isolate));
|
|
|
|
if (cache.Get(binding_key.c_str(), &exports)) {
|
|
return exports;
|
|
}
|
|
|
|
auto* mod = node::binding::get_linked_module(binding_key.c_str());
|
|
|
|
if (!mod) {
|
|
char errmsg[1024];
|
|
snprintf(errmsg, sizeof(errmsg), "No such binding: %s",
|
|
binding_key.c_str());
|
|
margs->ThrowError(errmsg);
|
|
return exports;
|
|
}
|
|
|
|
exports = v8::Object::New(isolate);
|
|
DCHECK_EQ(mod->nm_register_func, nullptr);
|
|
DCHECK_NE(mod->nm_context_register_func, nullptr);
|
|
mod->nm_context_register_func(exports, v8::Null(isolate),
|
|
isolate->GetCurrentContext(), mod->nm_priv);
|
|
cache.Set(binding_key.c_str(), exports);
|
|
return exports;
|
|
}
|
|
|
|
v8::Local<v8::Value> CreatePreloadScript(v8::Isolate* isolate,
|
|
v8::Local<v8::String> source) {
|
|
auto context = isolate->GetCurrentContext();
|
|
auto maybe_script = v8::Script::Compile(context, source);
|
|
v8::Local<v8::Script> script;
|
|
if (!maybe_script.ToLocal(&script))
|
|
return v8::Local<v8::Value>();
|
|
return script->Run(context).ToLocalChecked();
|
|
}
|
|
|
|
double Uptime() {
|
|
return (base::Time::Now() - base::Process::Current().CreationTime())
|
|
.InSecondsF();
|
|
}
|
|
|
|
void InvokeEmitProcessEvent(v8::Handle<v8::Context> context,
|
|
const std::string& event_name) {
|
|
auto* isolate = context->GetIsolate();
|
|
// set by sandboxed_renderer/init.js
|
|
auto binding_key = gin::ConvertToV8(isolate, kEmitProcessEventKey)
|
|
->ToString(context)
|
|
.ToLocalChecked();
|
|
auto private_binding_key = v8::Private::ForApi(isolate, binding_key);
|
|
auto global_object = context->Global();
|
|
v8::Local<v8::Value> callback_value;
|
|
if (!global_object->GetPrivate(context, private_binding_key)
|
|
.ToLocal(&callback_value))
|
|
return;
|
|
if (callback_value.IsEmpty() || !callback_value->IsFunction())
|
|
return;
|
|
auto callback = callback_value.As<v8::Function>();
|
|
v8::Local<v8::Value> args[] = {gin::ConvertToV8(isolate, event_name)};
|
|
std::ignore =
|
|
callback->Call(context, callback, std::size(args), std::data(args));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronSandboxedRendererClient::ElectronSandboxedRendererClient() {
|
|
// Explicitly register electron's builtin bindings.
|
|
NodeBindings::RegisterBuiltinBindings();
|
|
metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
|
|
}
|
|
|
|
ElectronSandboxedRendererClient::~ElectronSandboxedRendererClient() = default;
|
|
|
|
void ElectronSandboxedRendererClient::InitializeBindings(
|
|
v8::Local<v8::Object> binding,
|
|
v8::Local<v8::Context> context,
|
|
content::RenderFrame* render_frame) {
|
|
auto* isolate = context->GetIsolate();
|
|
gin_helper::Dictionary b(isolate, binding);
|
|
b.SetMethod("get", GetBinding);
|
|
b.SetMethod("createPreloadScript", CreatePreloadScript);
|
|
|
|
auto process = gin_helper::Dictionary::CreateEmpty(isolate);
|
|
b.Set("process", process);
|
|
|
|
ElectronBindings::BindProcess(isolate, &process, metrics_.get());
|
|
BindProcess(isolate, &process, render_frame);
|
|
|
|
process.SetMethod("uptime", Uptime);
|
|
process.Set("argv", base::CommandLine::ForCurrentProcess()->argv());
|
|
process.SetReadOnly("pid", base::GetCurrentProcId());
|
|
process.SetReadOnly("sandboxed", true);
|
|
process.SetReadOnly("type", "renderer");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::RenderFrameCreated(
|
|
content::RenderFrame* render_frame) {
|
|
new ElectronRenderFrameObserver(render_frame, this);
|
|
RendererClientBase::RenderFrameCreated(render_frame);
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::RunScriptsAtDocumentStart(
|
|
content::RenderFrame* render_frame) {
|
|
RendererClientBase::RunScriptsAtDocumentStart(render_frame);
|
|
EmitProcessEvent(render_frame, "document-start");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::RunScriptsAtDocumentEnd(
|
|
content::RenderFrame* render_frame) {
|
|
RendererClientBase::RunScriptsAtDocumentEnd(render_frame);
|
|
EmitProcessEvent(render_frame, "document-end");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::DidCreateScriptContext(
|
|
v8::Handle<v8::Context> context,
|
|
content::RenderFrame* render_frame) {
|
|
// Only allow preload for the main frame or
|
|
// For devtools we still want to run the preload_bundle script
|
|
// Or when nodeSupport is explicitly enabled in sub frames
|
|
if (!ShouldLoadPreload(context, render_frame))
|
|
return;
|
|
|
|
injected_frames_.insert(render_frame);
|
|
|
|
// Wrap the bundle into a function that receives the binding object as
|
|
// argument.
|
|
auto* isolate = context->GetIsolate();
|
|
auto binding = v8::Object::New(isolate);
|
|
InitializeBindings(binding, context, render_frame);
|
|
|
|
std::vector<v8::Local<v8::String>> sandbox_preload_bundle_params = {
|
|
node::FIXED_ONE_BYTE_STRING(isolate, "binding")};
|
|
|
|
std::vector<v8::Local<v8::Value>> sandbox_preload_bundle_args = {binding};
|
|
|
|
util::CompileAndCall(
|
|
isolate->GetCurrentContext(), "electron/js2c/sandbox_bundle",
|
|
&sandbox_preload_bundle_params, &sandbox_preload_bundle_args);
|
|
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
InvokeEmitProcessEvent(context, "loaded");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::WillReleaseScriptContext(
|
|
v8::Handle<v8::Context> context,
|
|
content::RenderFrame* render_frame) {
|
|
if (injected_frames_.erase(render_frame) == 0)
|
|
return;
|
|
|
|
auto* isolate = context->GetIsolate();
|
|
gin_helper::MicrotasksScope microtasks_scope(
|
|
isolate, context->GetMicrotaskQueue(),
|
|
v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
InvokeEmitProcessEvent(context, "exit");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::EmitProcessEvent(
|
|
content::RenderFrame* render_frame,
|
|
const char* event_name) {
|
|
if (!base::Contains(injected_frames_, render_frame))
|
|
return;
|
|
|
|
auto* isolate = blink::MainThreadIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Local<v8::Context> context =
|
|
GetContext(render_frame->GetWebFrame(), isolate);
|
|
gin_helper::MicrotasksScope microtasks_scope(
|
|
isolate, context->GetMicrotaskQueue(),
|
|
v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
InvokeEmitProcessEvent(context, event_name);
|
|
}
|
|
|
|
} // namespace electron
|