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>
186 lines
5.7 KiB
C++
186 lines
5.7 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_data_pipe_holder.h"
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "mojo/public/cpp/system/data_pipe.h"
|
|
#include "mojo/public/cpp/system/simple_watcher.h"
|
|
#include "net/base/net_errors.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "shell/common/key_weak_map.h"
|
|
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace electron::api {
|
|
|
|
namespace {
|
|
|
|
// Incremental ID.
|
|
int g_next_id = 0;
|
|
|
|
// Map that manages all the DataPipeHolder objects.
|
|
KeyWeakMap<std::string>& AllDataPipeHolders() {
|
|
static base::NoDestructor<KeyWeakMap<std::string>> weak_map;
|
|
return *weak_map.get();
|
|
}
|
|
|
|
// Utility class to read from data pipe.
|
|
class DataPipeReader {
|
|
public:
|
|
DataPipeReader(gin_helper::Promise<v8::Local<v8::Value>> promise,
|
|
mojo::Remote<network::mojom::DataPipeGetter> data_pipe_getter)
|
|
: promise_(std::move(promise)),
|
|
data_pipe_getter_(std::move(data_pipe_getter)),
|
|
handle_watcher_(FROM_HERE,
|
|
mojo::SimpleWatcher::ArmingPolicy::MANUAL,
|
|
base::SequencedTaskRunner::GetCurrentDefault()) {
|
|
// Get a new data pipe and start.
|
|
mojo::ScopedDataPipeProducerHandle producer_handle;
|
|
CHECK_EQ(mojo::CreateDataPipe(nullptr, producer_handle, data_pipe_),
|
|
MOJO_RESULT_OK);
|
|
data_pipe_getter_->Read(std::move(producer_handle),
|
|
base::BindOnce(&DataPipeReader::ReadCallback,
|
|
weak_factory_.GetWeakPtr()));
|
|
handle_watcher_.Watch(data_pipe_.get(), MOJO_HANDLE_SIGNAL_READABLE,
|
|
base::BindRepeating(&DataPipeReader::OnHandleReadable,
|
|
weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
~DataPipeReader() = default;
|
|
|
|
// disable copy
|
|
DataPipeReader(const DataPipeReader&) = delete;
|
|
DataPipeReader& operator=(const DataPipeReader&) = delete;
|
|
|
|
private:
|
|
// Callback invoked by DataPipeGetter::Read.
|
|
void ReadCallback(int32_t status, uint64_t size) {
|
|
if (status != net::OK) {
|
|
OnFailure();
|
|
return;
|
|
}
|
|
buffer_.resize(size);
|
|
head_ = &buffer_.front();
|
|
remaining_size_ = size;
|
|
handle_watcher_.ArmOrNotify();
|
|
}
|
|
|
|
// Called by |handle_watcher_| when data is available or the pipe was closed,
|
|
// and there's a pending Read() call.
|
|
void OnHandleReadable(MojoResult result) {
|
|
if (result != MOJO_RESULT_OK) {
|
|
OnFailure();
|
|
return;
|
|
}
|
|
|
|
// Read.
|
|
uint32_t length = remaining_size_;
|
|
result = data_pipe_->ReadData(head_, &length, MOJO_READ_DATA_FLAG_NONE);
|
|
if (result == MOJO_RESULT_OK) { // success
|
|
remaining_size_ -= length;
|
|
head_ += length;
|
|
if (remaining_size_ == 0) {
|
|
OnSuccess();
|
|
} else {
|
|
handle_watcher_.ArmOrNotify();
|
|
}
|
|
} else if (result == MOJO_RESULT_SHOULD_WAIT) { // IO pending
|
|
handle_watcher_.ArmOrNotify();
|
|
} else { // error
|
|
OnFailure();
|
|
}
|
|
}
|
|
|
|
void OnFailure() {
|
|
promise_.RejectWithErrorMessage("Could not get blob data");
|
|
delete this;
|
|
}
|
|
|
|
void OnSuccess() {
|
|
// Copy the buffer to JS.
|
|
// TODO(nornagon): make this zero-copy by allocating the array buffer
|
|
// inside the sandbox
|
|
v8::HandleScope handle_scope(promise_.isolate());
|
|
v8::Local<v8::Value> buffer =
|
|
node::Buffer::Copy(promise_.isolate(), &buffer_.front(), buffer_.size())
|
|
.ToLocalChecked();
|
|
promise_.Resolve(buffer);
|
|
|
|
// Destroy data pipe.
|
|
handle_watcher_.Cancel();
|
|
delete this;
|
|
}
|
|
|
|
gin_helper::Promise<v8::Local<v8::Value>> promise_;
|
|
|
|
mojo::Remote<network::mojom::DataPipeGetter> data_pipe_getter_;
|
|
mojo::ScopedDataPipeConsumerHandle data_pipe_;
|
|
mojo::SimpleWatcher handle_watcher_;
|
|
|
|
// Stores read data.
|
|
std::vector<char> buffer_;
|
|
|
|
// The head of buffer.
|
|
char* head_ = nullptr;
|
|
|
|
// Remaining data to read.
|
|
uint64_t remaining_size_ = 0;
|
|
|
|
base::WeakPtrFactory<DataPipeReader> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace
|
|
|
|
gin::WrapperInfo DataPipeHolder::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
DataPipeHolder::DataPipeHolder(const network::DataElement& element)
|
|
: id_(base::NumberToString(++g_next_id)) {
|
|
data_pipe_.Bind(
|
|
element.As<network::DataElementDataPipe>().CloneDataPipeGetter());
|
|
}
|
|
|
|
DataPipeHolder::~DataPipeHolder() = default;
|
|
|
|
v8::Local<v8::Promise> DataPipeHolder::ReadAll(v8::Isolate* isolate) {
|
|
gin_helper::Promise<v8::Local<v8::Value>> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
if (!data_pipe_) {
|
|
promise.RejectWithErrorMessage("Could not get blob data");
|
|
return handle;
|
|
}
|
|
|
|
new DataPipeReader(std::move(promise), std::move(data_pipe_));
|
|
return handle;
|
|
}
|
|
|
|
// static
|
|
gin::Handle<DataPipeHolder> DataPipeHolder::Create(
|
|
v8::Isolate* isolate,
|
|
const network::DataElement& element) {
|
|
auto handle = gin::CreateHandle(isolate, new DataPipeHolder(element));
|
|
AllDataPipeHolders().Set(isolate, handle->id(),
|
|
handle->GetWrapper(isolate).ToLocalChecked());
|
|
return handle;
|
|
}
|
|
|
|
// static
|
|
gin::Handle<DataPipeHolder> DataPipeHolder::From(v8::Isolate* isolate,
|
|
const std::string& id) {
|
|
v8::MaybeLocal<v8::Object> object = AllDataPipeHolders().Get(isolate, id);
|
|
if (!object.IsEmpty()) {
|
|
gin::Handle<DataPipeHolder> handle;
|
|
if (gin::ConvertFromV8(isolate, object.ToLocalChecked(), &handle))
|
|
return handle;
|
|
}
|
|
return gin::Handle<DataPipeHolder>();
|
|
}
|
|
|
|
} // namespace electron::api
|