d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
296 lines
9 KiB
C++
296 lines
9 KiB
C++
// Copyright (c) 2020 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/message_port.h"
|
|
|
|
#include <string>
|
|
#include <unordered_set>
|
|
#include <utility>
|
|
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "gin/arguments.h"
|
|
#include "gin/data_object_builder.h"
|
|
#include "gin/handle.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/error_thrower.h"
|
|
#include "shell/common/gin_helper/event_emitter_caller.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/v8_value_serializer.h"
|
|
#include "third_party/blink/public/common/messaging/transferable_message.h"
|
|
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
|
|
#include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h"
|
|
|
|
namespace electron {
|
|
|
|
gin::WrapperInfo MessagePort::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
MessagePort::MessagePort() = default;
|
|
MessagePort::~MessagePort() {
|
|
if (!IsNeutered()) {
|
|
// Disentangle before teardown. The MessagePortDescriptor will blow up if it
|
|
// hasn't had its underlying handle returned to it before teardown.
|
|
Disentangle();
|
|
}
|
|
}
|
|
|
|
// static
|
|
gin::Handle<MessagePort> MessagePort::Create(v8::Isolate* isolate) {
|
|
return gin::CreateHandle(isolate, new MessagePort());
|
|
}
|
|
|
|
void MessagePort::PostMessage(gin::Arguments* args) {
|
|
if (!IsEntangled())
|
|
return;
|
|
DCHECK(!IsNeutered());
|
|
|
|
blink::TransferableMessage transferable_message;
|
|
|
|
v8::Local<v8::Value> message_value;
|
|
if (!args->GetNext(&message_value)) {
|
|
args->ThrowTypeError("Expected at least one argument to postMessage");
|
|
return;
|
|
}
|
|
|
|
electron::SerializeV8Value(args->isolate(), message_value,
|
|
&transferable_message);
|
|
|
|
v8::Local<v8::Value> transferables;
|
|
std::vector<gin::Handle<MessagePort>> wrapped_ports;
|
|
if (args->GetNext(&transferables)) {
|
|
if (!gin::ConvertFromV8(args->isolate(), transferables, &wrapped_ports)) {
|
|
args->ThrowError();
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Make sure we aren't connected to any of the passed-in ports.
|
|
for (unsigned i = 0; i < wrapped_ports.size(); ++i) {
|
|
if (wrapped_ports[i].get() == this) {
|
|
gin_helper::ErrorThrower(args->isolate())
|
|
.ThrowError("Port at index " + base::NumberToString(i) +
|
|
" contains the source port.");
|
|
return;
|
|
}
|
|
}
|
|
|
|
bool threw_exception = false;
|
|
transferable_message.ports = MessagePort::DisentanglePorts(
|
|
args->isolate(), wrapped_ports, &threw_exception);
|
|
if (threw_exception)
|
|
return;
|
|
|
|
mojo::Message mojo_message = blink::mojom::TransferableMessage::WrapAsMessage(
|
|
std::move(transferable_message));
|
|
connector_->Accept(&mojo_message);
|
|
}
|
|
|
|
void MessagePort::Start() {
|
|
if (!IsEntangled())
|
|
return;
|
|
|
|
if (started_)
|
|
return;
|
|
|
|
started_ = true;
|
|
if (HasPendingActivity())
|
|
Pin();
|
|
connector_->ResumeIncomingMethodCallProcessing();
|
|
}
|
|
|
|
void MessagePort::Close() {
|
|
if (closed_)
|
|
return;
|
|
if (!IsNeutered()) {
|
|
Disentangle().ReleaseHandle();
|
|
blink::MessagePortDescriptorPair pipe;
|
|
Entangle(pipe.TakePort0());
|
|
}
|
|
closed_ = true;
|
|
if (!HasPendingActivity())
|
|
Unpin();
|
|
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
v8::Local<v8::Object> self;
|
|
if (GetWrapper(isolate).ToLocal(&self))
|
|
gin_helper::EmitEvent(isolate, self, "close");
|
|
}
|
|
|
|
void MessagePort::Entangle(blink::MessagePortDescriptor port) {
|
|
DCHECK(port.IsValid());
|
|
DCHECK(!connector_);
|
|
port_ = std::move(port);
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
connector_ = std::make_unique<mojo::Connector>(
|
|
port_.TakeHandleToEntangleWithEmbedder(),
|
|
mojo::Connector::SINGLE_THREADED_SEND,
|
|
base::SingleThreadTaskRunner::GetCurrentDefault());
|
|
connector_->PauseIncomingMethodCallProcessing();
|
|
connector_->set_incoming_receiver(this);
|
|
connector_->set_connection_error_handler(
|
|
base::BindOnce(&MessagePort::Close, weak_factory_.GetWeakPtr()));
|
|
if (HasPendingActivity())
|
|
Pin();
|
|
}
|
|
|
|
void MessagePort::Entangle(blink::MessagePortChannel channel) {
|
|
Entangle(channel.ReleaseHandle());
|
|
}
|
|
|
|
blink::MessagePortChannel MessagePort::Disentangle() {
|
|
DCHECK(!IsNeutered());
|
|
port_.GiveDisentangledHandle(connector_->PassMessagePipe());
|
|
connector_ = nullptr;
|
|
if (!HasPendingActivity())
|
|
Unpin();
|
|
return blink::MessagePortChannel(std::move(port_));
|
|
}
|
|
|
|
bool MessagePort::HasPendingActivity() const {
|
|
// The spec says that entangled message ports should always be treated as if
|
|
// they have a strong reference.
|
|
// We'll also stipulate that the queue needs to be open (if the app drops its
|
|
// reference to the port before start()-ing it, then it's not really entangled
|
|
// as it's unreachable).
|
|
return started_ && IsEntangled();
|
|
}
|
|
|
|
// static
|
|
std::vector<gin::Handle<MessagePort>> MessagePort::EntanglePorts(
|
|
v8::Isolate* isolate,
|
|
std::vector<blink::MessagePortChannel> channels) {
|
|
std::vector<gin::Handle<MessagePort>> wrapped_ports;
|
|
for (auto& port : channels) {
|
|
auto wrapped_port = MessagePort::Create(isolate);
|
|
wrapped_port->Entangle(std::move(port));
|
|
wrapped_ports.emplace_back(wrapped_port);
|
|
}
|
|
return wrapped_ports;
|
|
}
|
|
|
|
// static
|
|
std::vector<blink::MessagePortChannel> MessagePort::DisentanglePorts(
|
|
v8::Isolate* isolate,
|
|
const std::vector<gin::Handle<MessagePort>>& ports,
|
|
bool* threw_exception) {
|
|
if (ports.empty())
|
|
return std::vector<blink::MessagePortChannel>();
|
|
|
|
std::unordered_set<MessagePort*> visited;
|
|
|
|
// Walk the incoming array - if there are any duplicate ports, or null ports
|
|
// or cloned ports, throw an error (per section 8.3.3 of the HTML5 spec).
|
|
for (unsigned i = 0; i < ports.size(); ++i) {
|
|
auto* port = ports[i].get();
|
|
if (!port || port->IsNeutered() || visited.find(port) != visited.end()) {
|
|
std::string type;
|
|
if (!port)
|
|
type = "null";
|
|
else if (port->IsNeutered())
|
|
type = "already neutered";
|
|
else
|
|
type = "a duplicate";
|
|
gin_helper::ErrorThrower(isolate).ThrowError(
|
|
"Port at index " + base::NumberToString(i) + " is " + type + ".");
|
|
*threw_exception = true;
|
|
return std::vector<blink::MessagePortChannel>();
|
|
}
|
|
visited.insert(port);
|
|
}
|
|
|
|
// Passed-in ports passed validity checks, so we can disentangle them.
|
|
std::vector<blink::MessagePortChannel> channels;
|
|
channels.reserve(ports.size());
|
|
for (unsigned i = 0; i < ports.size(); ++i)
|
|
channels.push_back(ports[i]->Disentangle());
|
|
return channels;
|
|
}
|
|
|
|
void MessagePort::Pin() {
|
|
if (!pinned_.IsEmpty())
|
|
return;
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
v8::Local<v8::Value> self;
|
|
if (GetWrapper(isolate).ToLocal(&self)) {
|
|
pinned_.Reset(isolate, self);
|
|
}
|
|
}
|
|
|
|
void MessagePort::Unpin() {
|
|
pinned_.Reset();
|
|
}
|
|
|
|
bool MessagePort::Accept(mojo::Message* mojo_message) {
|
|
blink::TransferableMessage message;
|
|
if (!blink::mojom::TransferableMessage::DeserializeFromMessage(
|
|
std::move(*mojo_message), &message)) {
|
|
return false;
|
|
}
|
|
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
|
|
auto ports = EntanglePorts(isolate, std::move(message.ports));
|
|
|
|
v8::Local<v8::Value> message_value = DeserializeV8Value(isolate, message);
|
|
|
|
v8::Local<v8::Object> self;
|
|
if (!GetWrapper(isolate).ToLocal(&self))
|
|
return false;
|
|
|
|
auto event = gin::DataObjectBuilder(isolate)
|
|
.Set("data", message_value)
|
|
.Set("ports", ports)
|
|
.Build();
|
|
gin_helper::EmitEvent(isolate, self, "message", event);
|
|
return true;
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder MessagePort::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin::Wrappable<MessagePort>::GetObjectTemplateBuilder(isolate)
|
|
.SetMethod("postMessage", &MessagePort::PostMessage)
|
|
.SetMethod("start", &MessagePort::Start)
|
|
.SetMethod("close", &MessagePort::Close);
|
|
}
|
|
|
|
const char* MessagePort::GetTypeName() {
|
|
return "MessagePort";
|
|
}
|
|
|
|
} // namespace electron
|
|
|
|
namespace {
|
|
|
|
using electron::MessagePort;
|
|
|
|
v8::Local<v8::Value> CreatePair(v8::Isolate* isolate) {
|
|
auto port1 = MessagePort::Create(isolate);
|
|
auto port2 = MessagePort::Create(isolate);
|
|
blink::MessagePortDescriptorPair pipe;
|
|
port1->Entangle(pipe.TakePort0());
|
|
port2->Entangle(pipe.TakePort1());
|
|
return gin::DataObjectBuilder(isolate)
|
|
.Set("port1", port1)
|
|
.Set("port2", port2)
|
|
.Build();
|
|
}
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
gin_helper::Dictionary dict(isolate, exports);
|
|
dict.SetMethod("createPair", &CreatePair);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_message_port, Initialize)
|