mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
249 lines
8.2 KiB
C++
249 lines
8.2 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/gin_helper/handle.h"
|
|
#include "v8/include/cppgc/allocation.h"
|
|
#include "v8/include/v8-cppgc.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 {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},
|
|
gin::kElectronNetLog};
|
|
|
|
NetLog::NetLog(ElectronBrowserContext* const 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 {};
|
|
}
|
|
|
|
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::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 {};
|
|
}
|
|
}
|
|
}
|
|
|
|
if (net_log_exporter_) {
|
|
args->ThrowTypeError("There is already a net log running");
|
|
return {};
|
|
}
|
|
|
|
pending_start_promise_ =
|
|
std::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::DictValue 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::DictValue 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()));
|
|
pending_start_promise_.reset();
|
|
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);
|
|
pending_start_promise_.reset();
|
|
}
|
|
|
|
void NetLog::OnConnectionError() {
|
|
net_log_exporter_.reset();
|
|
if (pending_start_promise_) {
|
|
std::move(*pending_start_promise_)
|
|
.RejectWithErrorMessage("Failed to start net log exporter");
|
|
pending_start_promise_.reset();
|
|
}
|
|
}
|
|
|
|
bool NetLog::IsCurrentlyLogging() const {
|
|
return !!net_log_exporter_;
|
|
}
|
|
|
|
v8::Local<v8::Promise> NetLog::StopLogging(v8::Isolate* const isolate) {
|
|
gin_helper::Promise<void> promise{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::DictValue(),
|
|
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 gin::WrapperInfo* NetLog::wrapper_info() const {
|
|
return &kWrapperInfo;
|
|
}
|
|
|
|
const char* NetLog::GetHumanReadableName() const {
|
|
return "Electron / NetLog";
|
|
}
|
|
|
|
// static
|
|
NetLog* NetLog::Create(v8::Isolate* isolate,
|
|
ElectronBrowserContext* browser_context) {
|
|
return cppgc::MakeGarbageCollected<NetLog>(
|
|
isolate->GetCppHeap()->GetAllocationHandle(), browser_context);
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|