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>
238 lines
7.9 KiB
C++
238 lines
7.9 KiB
C++
// Copyright (c) 2018 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_net_log.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/functional/bind.h"
|
|
#include "base/task/thread_pool.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "components/net_log/chrome_net_log.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "electron/electron_version.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "net/log/net_log_capture_mode.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/net/system_network_context_manager.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<net::NetLogCaptureMode> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
net::NetLogCaptureMode* out) {
|
|
std::string type;
|
|
if (!ConvertFromV8(isolate, val, &type))
|
|
return false;
|
|
if (type == "default")
|
|
*out = net::NetLogCaptureMode::kDefault;
|
|
else if (type == "includeSensitive")
|
|
*out = net::NetLogCaptureMode::kIncludeSensitive;
|
|
else if (type == "everything")
|
|
*out = net::NetLogCaptureMode::kEverything;
|
|
else
|
|
return false;
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
scoped_refptr<base::SequencedTaskRunner> CreateFileTaskRunner() {
|
|
// The tasks posted to this sequenced task runner do synchronous File I/O for
|
|
// checking paths and setting permissions on files.
|
|
//
|
|
// These operations can be skipped on shutdown since FileNetLogObserver's API
|
|
// doesn't require things to have completed until notified of completion.
|
|
return base::ThreadPool::CreateSequencedTaskRunner(
|
|
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
|
|
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
|
|
}
|
|
|
|
base::File OpenFileForWriting(base::FilePath path) {
|
|
return base::File(path,
|
|
base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
|
|
}
|
|
|
|
void ResolvePromiseWithNetError(gin_helper::Promise<void> promise,
|
|
int32_t error) {
|
|
if (error == net::OK) {
|
|
promise.Resolve();
|
|
} else {
|
|
promise.RejectWithErrorMessage(net::ErrorToString(error));
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo NetLog::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
NetLog::NetLog(v8::Isolate* isolate, ElectronBrowserContext* browser_context)
|
|
: browser_context_(browser_context) {
|
|
file_task_runner_ = CreateFileTaskRunner();
|
|
}
|
|
|
|
NetLog::~NetLog() = default;
|
|
|
|
v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
|
|
gin::Arguments* args) {
|
|
if (log_path.empty()) {
|
|
args->ThrowTypeError("The first parameter must be a valid string");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
|
|
net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::kDefault;
|
|
uint64_t max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
|
|
|
|
gin_helper::Dictionary dict;
|
|
if (args->GetNext(&dict)) {
|
|
v8::Local<v8::Value> capture_mode_v8;
|
|
if (dict.Get("captureMode", &capture_mode_v8)) {
|
|
if (!gin::ConvertFromV8(args->isolate(), capture_mode_v8,
|
|
&capture_mode)) {
|
|
args->ThrowTypeError("Invalid value for captureMode");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
}
|
|
v8::Local<v8::Value> max_file_size_v8;
|
|
if (dict.Get("maxFileSize", &max_file_size_v8)) {
|
|
if (!gin::ConvertFromV8(args->isolate(), max_file_size_v8,
|
|
&max_file_size)) {
|
|
args->ThrowTypeError("Invalid value for maxFileSize");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
}
|
|
}
|
|
|
|
if (net_log_exporter_) {
|
|
args->ThrowTypeError("There is already a net log running");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
|
|
pending_start_promise_ =
|
|
absl::make_optional<gin_helper::Promise<void>>(args->isolate());
|
|
v8::Local<v8::Promise> handle = pending_start_promise_->GetHandle();
|
|
|
|
auto command_line_string =
|
|
base::CommandLine::ForCurrentProcess()->GetCommandLineString();
|
|
auto channel_string = std::string("Electron " ELECTRON_VERSION);
|
|
base::Value::Dict custom_constants = net_log::GetPlatformConstantsForNetLog(
|
|
command_line_string, channel_string);
|
|
|
|
auto* network_context =
|
|
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
|
|
|
|
network_context->CreateNetLogExporter(
|
|
net_log_exporter_.BindNewPipeAndPassReceiver());
|
|
net_log_exporter_.set_disconnect_handler(
|
|
base::BindOnce(&NetLog::OnConnectionError, base::Unretained(this)));
|
|
|
|
file_task_runner_->PostTaskAndReplyWithResult(
|
|
FROM_HERE, base::BindOnce(OpenFileForWriting, log_path),
|
|
base::BindOnce(&NetLog::StartNetLogAfterCreateFile,
|
|
weak_ptr_factory_.GetWeakPtr(), capture_mode,
|
|
max_file_size, std::move(custom_constants)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
|
|
uint64_t max_file_size,
|
|
base::Value::Dict custom_constants,
|
|
base::File output_file) {
|
|
if (!net_log_exporter_) {
|
|
// Theoretically the mojo pipe could have been closed by the time we get
|
|
// here via the connection error handler. If so, the promise has already
|
|
// been resolved.
|
|
return;
|
|
}
|
|
DCHECK(pending_start_promise_);
|
|
if (!output_file.IsValid()) {
|
|
std::move(*pending_start_promise_)
|
|
.RejectWithErrorMessage(
|
|
base::File::ErrorToString(output_file.error_details()));
|
|
net_log_exporter_.reset();
|
|
return;
|
|
}
|
|
net_log_exporter_->Start(
|
|
std::move(output_file), std::move(custom_constants), capture_mode,
|
|
max_file_size,
|
|
base::BindOnce(&NetLog::NetLogStarted, base::Unretained(this)));
|
|
}
|
|
|
|
void NetLog::NetLogStarted(int32_t error) {
|
|
DCHECK(pending_start_promise_);
|
|
ResolvePromiseWithNetError(std::move(*pending_start_promise_), error);
|
|
}
|
|
|
|
void NetLog::OnConnectionError() {
|
|
net_log_exporter_.reset();
|
|
if (pending_start_promise_) {
|
|
std::move(*pending_start_promise_)
|
|
.RejectWithErrorMessage("Failed to start net log exporter");
|
|
}
|
|
}
|
|
|
|
bool NetLog::IsCurrentlyLogging() const {
|
|
return !!net_log_exporter_;
|
|
}
|
|
|
|
v8::Local<v8::Promise> NetLog::StopLogging(gin::Arguments* args) {
|
|
gin_helper::Promise<void> promise(args->isolate());
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (net_log_exporter_) {
|
|
// Move the net_log_exporter_ into the callback to ensure that the mojo
|
|
// pointer lives long enough to resolve the promise. Moving it into the
|
|
// callback will cause the instance variable to become empty.
|
|
net_log_exporter_->Stop(
|
|
base::Value::Dict(),
|
|
base::BindOnce(
|
|
[](mojo::Remote<network::mojom::NetLogExporter>,
|
|
gin_helper::Promise<void> promise, int32_t error) {
|
|
ResolvePromiseWithNetError(std::move(promise), error);
|
|
},
|
|
std::move(net_log_exporter_), std::move(promise)));
|
|
} else {
|
|
promise.RejectWithErrorMessage("No net log in progress");
|
|
}
|
|
|
|
return handle;
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder NetLog::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin::Wrappable<NetLog>::GetObjectTemplateBuilder(isolate)
|
|
.SetProperty("currentlyLogging", &NetLog::IsCurrentlyLogging)
|
|
.SetMethod("startLogging", &NetLog::StartLogging)
|
|
.SetMethod("stopLogging", &NetLog::StopLogging);
|
|
}
|
|
|
|
const char* NetLog::GetTypeName() {
|
|
return "NetLog";
|
|
}
|
|
|
|
// static
|
|
gin::Handle<NetLog> NetLog::Create(v8::Isolate* isolate,
|
|
ElectronBrowserContext* browser_context) {
|
|
return gin::CreateHandle(isolate, new NetLog(isolate, browser_context));
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|