fix: crashReporter incompatible with sandbox on Linux (#23265)
This commit is contained in:
Jeremy Apthorp
GitHub
parent
fc434f136b
commit
06bf0d08dc
77 changed files with 2235 additions and 2404 deletions
216
shell/browser/api/electron_api_crash_reporter.cc
Normal file
216
shell/browser/api/electron_api_crash_reporter.cc
Normal file
|
|
@ -0,0 +1,216 @@
|
|||
// 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/bind.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/no_destructor.h"
|
||||
#include "base/path_service.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/threading/thread_restrictions.h"
|
||||
#include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#include "components/crash/core/common/crash_key.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 "services/service_manager/embedder/switches.h"
|
||||
#include "shell/app/electron_crash_reporter_client.h"
|
||||
#include "shell/common/crash_keys.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 "third_party/crashpad/crashpad/client/crashpad_info.h"
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#include "components/crash/core/app/breakpad_linux.h"
|
||||
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
||||
#include "v8/include/v8.h"
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
|
||||
#if defined(OS_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 // defined(OS_LINUX)
|
||||
|
||||
bool g_crash_reporter_initialized = false;
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace electron {
|
||||
|
||||
namespace api {
|
||||
|
||||
namespace crash_reporter {
|
||||
|
||||
bool IsCrashReporterEnabled() {
|
||||
return g_crash_reporter_initialized;
|
||||
}
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
const std::map<std::string, std::string>& GetGlobalCrashKeys() {
|
||||
return GetGlobalCrashKeysMutable();
|
||||
}
|
||||
#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) {
|
||||
#if !defined(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 defined(OS_LINUX)
|
||||
auto& global_crash_keys = GetGlobalCrashKeysMutable();
|
||||
for (const auto& pair : global_extra) {
|
||||
global_crash_keys[pair.first] = pair.second;
|
||||
}
|
||||
for (const auto& pair : extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
for (const auto& pair : global_extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
breakpad::InitCrashReporter(process_type);
|
||||
#elif defined(OS_MACOSX)
|
||||
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 defined(OS_WIN)
|
||||
for (const auto& pair : extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
base::FilePath user_data_dir;
|
||||
base::PathService::Get(DIR_USER_DATA, &user_data_dir);
|
||||
::crash_reporter::InitializeCrashpadWithEmbeddedHandler(
|
||||
process_type.empty(), process_type,
|
||||
base::UTF16ToUTF8(user_data_dir.value()), base::FilePath());
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace crash_reporter
|
||||
|
||||
} // namespace api
|
||||
|
||||
} // namespace electron
|
||||
|
||||
namespace {
|
||||
|
||||
#if defined(MAS_BUILD)
|
||||
void GetUploadedReports(
|
||||
base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
|
||||
std::move(callback).Run(v8::Array::New(v8::Isolate::GetCurrent()));
|
||||
}
|
||||
#else
|
||||
scoped_refptr<UploadList> CreateCrashUploadList() {
|
||||
#if defined(OS_MACOSX) || defined(OS_WIN)
|
||||
return new 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);
|
||||
return new TextLogUploadList(upload_log_path);
|
||||
#endif // defined(OS_MACOSX) || defined(OS_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.
|
||||
{
|
||||
base::ThreadRestrictions::ScopedAllowIO allow_io;
|
||||
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 !defined(MAS_BUILD)
|
||||
ElectronCrashReporterClient::Get()->SetCollectStatsConsent(upload);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool GetUploadToServer() {
|
||||
#if defined(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 !defined(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);
|
||||
dict.SetMethod("addExtraParameter", &electron::crash_keys::SetCrashKey);
|
||||
dict.SetMethod("removeExtraParameter", &electron::crash_keys::ClearCrashKey);
|
||||
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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue