28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
259 lines
9.2 KiB
C++
259 lines
9.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 <tuple>
|
|
#include <vector>
|
|
|
|
#include "base/base_paths.h"
|
|
#include "base/command_line.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 kLifecycleKey[] = "lifecycle";
|
|
const char kModuleCacheKey[] = "native-module-cache";
|
|
|
|
bool IsDevTools(content::RenderFrame* render_frame) {
|
|
return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
|
|
"devtools");
|
|
}
|
|
|
|
bool IsDevToolsExtension(content::RenderFrame* render_frame) {
|
|
return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
|
|
"chrome-extension");
|
|
}
|
|
|
|
v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
|
|
auto context = isolate->GetCurrentContext();
|
|
gin_helper::Dictionary global(isolate, context->Global());
|
|
v8::Local<v8::Value> cache;
|
|
|
|
if (!global.GetHidden(kModuleCacheKey, &cache)) {
|
|
cache = v8::Object::New(isolate);
|
|
global.SetHidden(kModuleCacheKey, 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 module_key = gin::V8ToString(isolate, key);
|
|
gin_helper::Dictionary cache(isolate, GetModuleCache(isolate));
|
|
|
|
if (cache.Get(module_key.c_str(), &exports)) {
|
|
return exports;
|
|
}
|
|
|
|
auto* mod = node::binding::get_linked_module(module_key.c_str());
|
|
|
|
if (!mod) {
|
|
char errmsg[1024];
|
|
snprintf(errmsg, sizeof(errmsg), "No such module: %s", module_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(module_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 InvokeHiddenCallback(v8::Handle<v8::Context> context,
|
|
const std::string& hidden_key,
|
|
const std::string& callback_name) {
|
|
auto* isolate = context->GetIsolate();
|
|
auto binding_key =
|
|
gin::ConvertToV8(isolate, hidden_key)->ToString(context).ToLocalChecked();
|
|
auto private_binding_key = v8::Private::ForApi(isolate, binding_key);
|
|
auto global_object = context->Global();
|
|
v8::Local<v8::Value> value;
|
|
if (!global_object->GetPrivate(context, private_binding_key).ToLocal(&value))
|
|
return;
|
|
if (value.IsEmpty() || !value->IsObject())
|
|
return;
|
|
auto binding = value->ToObject(context).ToLocalChecked();
|
|
auto callback_key = gin::ConvertToV8(isolate, callback_name)
|
|
->ToString(context)
|
|
.ToLocalChecked();
|
|
auto callback_value = binding->Get(context, callback_key).ToLocalChecked();
|
|
DCHECK(callback_value->IsFunction()); // set by sandboxed_renderer/init.js
|
|
auto callback = callback_value.As<v8::Function>();
|
|
std::ignore = callback->Call(context, binding, 0, nullptr);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronSandboxedRendererClient::ElectronSandboxedRendererClient() {
|
|
// Explicitly register electron's builtin modules.
|
|
NodeBindings::RegisterBuiltinModules();
|
|
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);
|
|
|
|
gin_helper::Dictionary process = gin::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);
|
|
if (injected_frames_.find(render_frame) == injected_frames_.end())
|
|
return;
|
|
|
|
auto* isolate = blink::MainThreadIsolate();
|
|
gin_helper::MicrotasksScope microtasks_scope(
|
|
isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
v8::Local<v8::Context> context =
|
|
GetContext(render_frame->GetWebFrame(), isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
InvokeHiddenCallback(context, kLifecycleKey, "onDocumentStart");
|
|
}
|
|
|
|
void ElectronSandboxedRendererClient::RunScriptsAtDocumentEnd(
|
|
content::RenderFrame* render_frame) {
|
|
RendererClientBase::RunScriptsAtDocumentEnd(render_frame);
|
|
if (injected_frames_.find(render_frame) == injected_frames_.end())
|
|
return;
|
|
|
|
auto* isolate = blink::MainThreadIsolate();
|
|
gin_helper::MicrotasksScope microtasks_scope(
|
|
isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
v8::Local<v8::Context> context =
|
|
GetContext(render_frame->GetWebFrame(), isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
InvokeHiddenCallback(context, kLifecycleKey, "onDocumentEnd");
|
|
}
|
|
|
|
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
|
|
bool is_main_frame = render_frame->IsMainFrame();
|
|
bool is_devtools =
|
|
IsDevTools(render_frame) || IsDevToolsExtension(render_frame);
|
|
|
|
bool allow_node_in_sub_frames =
|
|
render_frame->GetBlinkPreferences().node_integration_in_sub_frames;
|
|
|
|
bool should_load_preload =
|
|
(is_main_frame || is_devtools || allow_node_in_sub_frames) &&
|
|
!IsWebViewFrame(context, render_frame);
|
|
if (!should_load_preload)
|
|
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, nullptr);
|
|
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
InvokeHiddenCallback(context, kLifecycleKey, "onLoaded");
|
|
}
|
|
|
|
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, v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
InvokeHiddenCallback(context, kLifecycleKey, "onExit");
|
|
}
|
|
|
|
} // namespace electron
|