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>
282 lines
9.5 KiB
C++
282 lines
9.5 KiB
C++
// Copyright (c) 2013 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_crash_reporter.h"
|
|
|
|
#include <limits>
|
|
#include <map>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/functional/bind.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/trace_event/trace_event.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "components/upload_list/crash_upload_list.h"
|
|
#include "components/upload_list/text_log_upload_list.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "gin/arguments.h"
|
|
#include "gin/data_object_builder.h"
|
|
#include "shell/common/electron_paths.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_converters/time_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
|
|
#if !IS_MAS_BUILD()
|
|
#include "components/crash/core/app/crashpad.h" // nogncheck
|
|
#include "components/crash/core/browser/crash_upload_list_crashpad.h" // nogncheck
|
|
#include "components/crash/core/common/crash_key.h"
|
|
#include "shell/app/electron_crash_reporter_client.h"
|
|
#include "shell/common/crash_keys.h"
|
|
#include "third_party/crashpad/crashpad/client/crashpad_info.h" // nogncheck
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
#include "base/containers/span.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/guid.h"
|
|
#include "components/crash/core/common/crash_keys.h"
|
|
#include "components/upload_list/combining_upload_list.h"
|
|
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
|
#include "v8/include/v8.h"
|
|
#endif
|
|
|
|
namespace {
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
std::map<std::string, std::string>& GetGlobalCrashKeysMutable() {
|
|
static base::NoDestructor<std::map<std::string, std::string>>
|
|
global_crash_keys;
|
|
return *global_crash_keys;
|
|
}
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
|
|
bool g_crash_reporter_initialized = false;
|
|
|
|
} // namespace
|
|
|
|
namespace electron::api::crash_reporter {
|
|
|
|
#if IS_MAS_BUILD()
|
|
namespace {
|
|
|
|
void NoOp() {}
|
|
|
|
} // namespace
|
|
#endif
|
|
|
|
bool IsCrashReporterEnabled() {
|
|
return g_crash_reporter_initialized;
|
|
}
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
const std::map<std::string, std::string>& GetGlobalCrashKeys() {
|
|
return GetGlobalCrashKeysMutable();
|
|
}
|
|
|
|
bool GetClientIdPath(base::FilePath* path) {
|
|
if (base::PathService::Get(electron::DIR_CRASH_DUMPS, path)) {
|
|
*path = path->Append("client_id");
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
std::string ReadClientId() {
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
std::string client_id;
|
|
// "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".length == 36
|
|
base::FilePath client_id_path;
|
|
if (GetClientIdPath(&client_id_path) &&
|
|
(!base::ReadFileToStringWithMaxSize(client_id_path, &client_id, 36) ||
|
|
client_id.size() != 36))
|
|
return std::string();
|
|
return client_id;
|
|
}
|
|
|
|
void WriteClientId(const std::string& client_id) {
|
|
DCHECK_EQ(client_id.size(), 36u);
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
base::FilePath client_id_path;
|
|
if (GetClientIdPath(&client_id_path))
|
|
base::WriteFile(client_id_path, client_id);
|
|
}
|
|
|
|
std::string GetClientId() {
|
|
static base::NoDestructor<std::string> client_id;
|
|
if (!client_id->empty())
|
|
return *client_id;
|
|
*client_id = ReadClientId();
|
|
if (client_id->empty()) {
|
|
*client_id = base::GenerateGUID();
|
|
WriteClientId(*client_id);
|
|
}
|
|
return *client_id;
|
|
}
|
|
#endif
|
|
|
|
void Start(const std::string& submit_url,
|
|
bool upload_to_server,
|
|
bool ignore_system_crash_handler,
|
|
bool rate_limit,
|
|
bool compress,
|
|
const std::map<std::string, std::string>& global_extra,
|
|
const std::map<std::string, std::string>& extra,
|
|
bool is_node_process) {
|
|
TRACE_EVENT0("electron", "crash_reporter::Start");
|
|
#if !IS_MAS_BUILD()
|
|
if (g_crash_reporter_initialized)
|
|
return;
|
|
g_crash_reporter_initialized = true;
|
|
ElectronCrashReporterClient::Create();
|
|
ElectronCrashReporterClient::Get()->SetUploadUrl(submit_url);
|
|
ElectronCrashReporterClient::Get()->SetCollectStatsConsent(upload_to_server);
|
|
ElectronCrashReporterClient::Get()->SetShouldRateLimit(rate_limit);
|
|
ElectronCrashReporterClient::Get()->SetShouldCompressUploads(compress);
|
|
ElectronCrashReporterClient::Get()->SetGlobalAnnotations(global_extra);
|
|
auto* command_line = base::CommandLine::ForCurrentProcess();
|
|
std::string process_type =
|
|
is_node_process
|
|
? "node"
|
|
: command_line->GetSwitchValueASCII(::switches::kProcessType);
|
|
#if BUILDFLAG(IS_LINUX)
|
|
for (const auto& pair : extra)
|
|
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
|
{
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
::crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
|
|
}
|
|
if (ignore_system_crash_handler) {
|
|
crashpad::CrashpadInfo::GetCrashpadInfo()
|
|
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
|
}
|
|
#elif BUILDFLAG(IS_MAC)
|
|
for (const auto& pair : extra)
|
|
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
|
::crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
|
|
if (ignore_system_crash_handler) {
|
|
crashpad::CrashpadInfo::GetCrashpadInfo()
|
|
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
|
}
|
|
#elif BUILDFLAG(IS_WIN)
|
|
for (const auto& pair : extra)
|
|
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
|
base::FilePath user_data_dir;
|
|
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
|
|
::crash_reporter::InitializeCrashpadWithEmbeddedHandler(
|
|
process_type.empty(), process_type,
|
|
base::WideToUTF8(user_data_dir.value()), base::FilePath());
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
} // namespace electron::api::crash_reporter
|
|
|
|
namespace {
|
|
|
|
#if IS_MAS_BUILD()
|
|
void GetUploadedReports(
|
|
v8::Isolate* isolate,
|
|
base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
|
|
std::move(callback).Run(v8::Array::New(isolate));
|
|
}
|
|
#else
|
|
scoped_refptr<UploadList> CreateCrashUploadList() {
|
|
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
|
return base::MakeRefCounted<CrashUploadListCrashpad>();
|
|
#else
|
|
base::FilePath crash_dir_path;
|
|
base::PathService::Get(electron::DIR_CRASH_DUMPS, &crash_dir_path);
|
|
base::FilePath upload_log_path =
|
|
crash_dir_path.AppendASCII(CrashUploadList::kReporterLogFilename);
|
|
scoped_refptr<UploadList> result =
|
|
base::MakeRefCounted<TextLogUploadList>(upload_log_path);
|
|
// Crashpad keeps the records of C++ crashes (segfaults, etc) in its
|
|
// internal database. The JavaScript error reporter writes JS error upload
|
|
// records to the older text format. Combine the two to present a complete
|
|
// list to the user.
|
|
// TODO(nornagon): what is "The JavaScript error reporter", and do we care
|
|
// about it?
|
|
std::vector<scoped_refptr<UploadList>> uploaders = {
|
|
base::MakeRefCounted<CrashUploadListCrashpad>(), std::move(result)};
|
|
result = base::MakeRefCounted<CombiningUploadList>(std::move(uploaders));
|
|
return result;
|
|
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
|
}
|
|
|
|
v8::Local<v8::Value> GetUploadedReports(v8::Isolate* isolate) {
|
|
auto list = CreateCrashUploadList();
|
|
// TODO(nornagon): switch to using Load() instead of LoadSync() once the
|
|
// synchronous version of getUploadedReports is deprecated so we can remove
|
|
// our patch.
|
|
{
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
list->LoadSync();
|
|
}
|
|
std::vector<UploadList::UploadInfo> uploads;
|
|
constexpr size_t kMaxUploadReportsToList = std::numeric_limits<size_t>::max();
|
|
list->GetUploads(kMaxUploadReportsToList, &uploads);
|
|
std::vector<v8::Local<v8::Object>> result;
|
|
for (const auto& upload : uploads) {
|
|
result.push_back(gin::DataObjectBuilder(isolate)
|
|
.Set("date", upload.upload_time)
|
|
.Set("id", upload.upload_id)
|
|
.Build());
|
|
}
|
|
v8::Local<v8::Value> v8_result = gin::ConvertToV8(isolate, result);
|
|
return v8_result;
|
|
}
|
|
#endif
|
|
|
|
void SetUploadToServer(bool upload) {
|
|
#if !IS_MAS_BUILD()
|
|
ElectronCrashReporterClient::Get()->SetCollectStatsConsent(upload);
|
|
#endif
|
|
}
|
|
|
|
bool GetUploadToServer() {
|
|
#if IS_MAS_BUILD()
|
|
return false;
|
|
#else
|
|
return ElectronCrashReporterClient::Get()->GetCollectStatsConsent();
|
|
#endif
|
|
}
|
|
|
|
v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
|
|
std::map<std::string, std::string> keys;
|
|
#if !IS_MAS_BUILD()
|
|
electron::crash_keys::GetCrashKeys(&keys);
|
|
#endif
|
|
return gin::ConvertToV8(isolate, keys);
|
|
}
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
gin_helper::Dictionary dict(context->GetIsolate(), exports);
|
|
dict.SetMethod("start", &electron::api::crash_reporter::Start);
|
|
#if IS_MAS_BUILD()
|
|
dict.SetMethod("addExtraParameter", &electron::api::crash_reporter::NoOp);
|
|
dict.SetMethod("removeExtraParameter", &electron::api::crash_reporter::NoOp);
|
|
#else
|
|
dict.SetMethod("addExtraParameter", &electron::crash_keys::SetCrashKey);
|
|
dict.SetMethod("removeExtraParameter", &electron::crash_keys::ClearCrashKey);
|
|
#endif
|
|
dict.SetMethod("getParameters", &GetParameters);
|
|
dict.SetMethod("getUploadedReports", &GetUploadedReports);
|
|
dict.SetMethod("setUploadToServer", &SetUploadToServer);
|
|
dict.SetMethod("getUploadToServer", &GetUploadToServer);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_crash_reporter, Initialize)
|