0dad99561b
* chore: bump chromium in DEPS to 123.0.6273.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6274.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6276.0 * chore: update patches * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * chore: bump chromium in DEPS to 123.0.6278.0 * chore: bump chromium in DEPS to 123.0.6280.0 * chore: update patches * chore: use net::CanonicalCookie::SecureAttribute() renamed from IsSecure() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5245913 * refactor: handle multiple requested device ids Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5132210 * refactor: trigger View layouts async with View::InvalidateLayout() Upstream has introduced a PassKey to restrict who can call Layout() directly. I've opted for calling `InvalidateLayout()` which is the approach that upstream recommends. If for some reason this approach doesn't work for us, we could use `DeprecatedLayoutImmediately()` as a stopgap. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5239586 Xref: https://chromium.googlesource.com/chromium/src/+/main/ui/views/view.h#809 Xref: https://chromium.googlesource.com/chromium/src/+/main/docs/ui/learn/bestpractices/layout.md?pli=1#don_t-invoke-layout_directly * chore: bump chromium in DEPS to 123.0.6282.0 * chore: bump chromium in DEPS to 123.0.6284.0 * chore: update patches * refactor: remove use of blink::MainThreadIsolate() pt 1/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 2/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 3/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * chore: update enum name to ui::AXMode::kPDFPrinting Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5270301 * chore: rebuild filenames.libcxx.gni * chore: sync with upstream rename of PortProvider.TaskForHandle() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5259103 * chore: bump chromium in DEPS to 123.0.6286.0 * chore: bump chromium in DEPS to 123.0.6288.0 * WebPreferences: Initialize in declaration. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5277099 * chore: update webview_fullscreen.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5053508 Simple update to fix patch shear * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5254861 Simple update to fix patch shear * chore: add IWC::Delegate::RecordResize() stub to fix FTBFS https://chromium-review.googlesource.com/c/chromium/src/+/5268963 * chore: add FormControlType::kButtonPopover to the FormControlType converter Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5230929 * chore: e patches all * chore: node script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 123.0.6290.0 * chore: bump chromium in DEPS to 123.0.6291.0 * chore: bump chromium in DEPS to 123.0.6292.0 * chore: bump chromium in DEPS to 123.0.6294.0 * chore: update fix_aspect_ratio_with_max_size.patch Xref: fix_aspect_ratio_with_max_size.patch note: simple absl::optional -> std::optional conversion * chore: update feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5272337 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; just adjusting line patch offsets Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5258688 * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5281322 * chore: update fix_select_The_first_menu_item_when_opened_via_keyboard.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5279376 note: simple absl::optional -> std::optional conversion * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5268792 * chore: script/export_all_patches.py * chore: bump chromium in DEPS to 123.0.6296.0 * chore: update patches * fixup! chore: update feat_allow_code_cache_in_custom_schemes.patch * fix: restore MessagePort close event * spec: fix CORB testing Refs https://chromium-review.googlesource.com/c/chromium/src/+/5231506 * fix: use sync layout when content view changes * fixup! chore: update feat_configure_launch_options_for_service_process.patch * Add remote-cocoa support for context menus. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5259806 * Rename //net/base/mac directory to //net/base/apple (1/n) Refs https://chromium-review.googlesource.com/c/chromium/src/+/5211389 * fixup! Add remote-cocoa support for context menus. * [Clipboard] Don't add meta charset tag for async write() method on Mac. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5187335 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
237 lines
8.3 KiB
C++
237 lines
8.3 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/platform/scheduler/web_agent_group_scheduler.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;
|
|
|
|
blink::WebLocalFrame* frame = render_frame->GetWebFrame();
|
|
v8::Isolate* isolate = frame->GetAgentGroupScheduler()->Isolate();
|
|
v8::HandleScope handle_scope{isolate};
|
|
|
|
v8::Local<v8::Context> context = GetContext(frame, isolate);
|
|
gin_helper::MicrotasksScope microtasks_scope(
|
|
isolate, context->GetMicrotaskQueue(),
|
|
v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
InvokeEmitProcessEvent(context, event_name);
|
|
}
|
|
|
|
} // namespace electron
|