fix: crashReporter incompatible with sandbox on Linux (#23265)
This commit is contained in:
parent
fc434f136b
commit
06bf0d08dc
77 changed files with 2235 additions and 2404 deletions
144
shell/common/crash_keys.cc
Normal file
144
shell/common/crash_keys.cc
Normal file
|
@ -0,0 +1,144 @@
|
|||
// Copyright (c) 2020 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "shell/common/crash_keys.h"
|
||||
|
||||
#include <deque>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "base/command_line.h"
|
||||
#include "base/environment.h"
|
||||
#include "base/no_destructor.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "components/crash/core/common/crash_key.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
#include "shell/common/electron_constants.h"
|
||||
#include "shell/common/options_switches.h"
|
||||
#include "third_party/crashpad/crashpad/client/annotation.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
namespace crash_keys {
|
||||
|
||||
namespace {
|
||||
|
||||
using ExtraCrashKeys = std::deque<crash_reporter::CrashKeyString<127>>;
|
||||
ExtraCrashKeys& GetExtraCrashKeys() {
|
||||
static base::NoDestructor<ExtraCrashKeys> extra_keys;
|
||||
return *extra_keys;
|
||||
}
|
||||
|
||||
std::deque<std::string>& GetExtraCrashKeyNames() {
|
||||
static base::NoDestructor<std::deque<std::string>> crash_key_names;
|
||||
return *crash_key_names;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
constexpr uint32_t kMaxCrashKeyNameLength = 40;
|
||||
#if defined(OS_LINUX)
|
||||
static_assert(kMaxCrashKeyNameLength <=
|
||||
crash_reporter::internal::kCrashKeyStorageKeySize,
|
||||
"max crash key name length above what breakpad supports");
|
||||
#else
|
||||
static_assert(kMaxCrashKeyNameLength <= crashpad::Annotation::kNameMaxLength,
|
||||
"max crash key name length above what crashpad supports");
|
||||
#endif
|
||||
|
||||
void SetCrashKey(const std::string& key, const std::string& value) {
|
||||
// Chrome DCHECK()s if we try to set an annotation with a name longer than
|
||||
// the max.
|
||||
// TODO(nornagon): warn the developer (via console.warn) when this happens.
|
||||
if (key.size() >= kMaxCrashKeyNameLength)
|
||||
return;
|
||||
auto& crash_key_names = GetExtraCrashKeyNames();
|
||||
|
||||
auto iter = std::find(crash_key_names.begin(), crash_key_names.end(), key);
|
||||
if (iter == crash_key_names.end()) {
|
||||
crash_key_names.emplace_back(key);
|
||||
GetExtraCrashKeys().emplace_back(crash_key_names.back().c_str());
|
||||
iter = crash_key_names.end() - 1;
|
||||
}
|
||||
GetExtraCrashKeys()[iter - crash_key_names.begin()].Set(value);
|
||||
}
|
||||
|
||||
void ClearCrashKey(const std::string& key) {
|
||||
const auto& crash_key_names = GetExtraCrashKeyNames();
|
||||
|
||||
auto iter = std::find(crash_key_names.begin(), crash_key_names.end(), key);
|
||||
if (iter != crash_key_names.end()) {
|
||||
GetExtraCrashKeys()[iter - crash_key_names.begin()].Clear();
|
||||
}
|
||||
}
|
||||
|
||||
void GetCrashKeys(std::map<std::string, std::string>* keys) {
|
||||
const auto& crash_key_names = GetExtraCrashKeyNames();
|
||||
const auto& crash_keys = GetExtraCrashKeys();
|
||||
int i = 0;
|
||||
for (const auto& key : crash_key_names) {
|
||||
const auto& value = crash_keys[i++];
|
||||
if (value.is_set()) {
|
||||
keys->emplace(key, value.value());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
bool IsRunningAsNode() {
|
||||
#if BUILDFLAG(ENABLE_RUN_AS_NODE)
|
||||
return base::Environment::Create()->HasVar(electron::kRunAsNode);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
} // namespace
|
||||
|
||||
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
|
||||
#if defined(OS_LINUX)
|
||||
if (command_line.HasSwitch(switches::kGlobalCrashKeys)) {
|
||||
std::vector<std::pair<std::string, std::string>> global_crash_keys;
|
||||
base::SplitStringIntoKeyValuePairs(
|
||||
command_line.GetSwitchValueASCII(switches::kGlobalCrashKeys), '=', ',',
|
||||
&global_crash_keys);
|
||||
for (const auto& pair : global_crash_keys) {
|
||||
SetCrashKey(pair.first, pair.second);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// NB. this is redundant with the 'ptype' key that //components/crash
|
||||
// reports; it's present for backwards compatibility.
|
||||
static crash_reporter::CrashKeyString<16> process_type_key("process_type");
|
||||
if (IsRunningAsNode()) {
|
||||
process_type_key.Set("node");
|
||||
} else {
|
||||
std::string process_type =
|
||||
command_line.GetSwitchValueASCII(::switches::kProcessType);
|
||||
if (process_type.empty()) {
|
||||
process_type_key.Set("browser");
|
||||
} else {
|
||||
process_type_key.Set(process_type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SetPlatformCrashKey() {
|
||||
// TODO(nornagon): this is redundant with the 'plat' key that
|
||||
// //components/crash already includes. Remove it.
|
||||
static crash_reporter::CrashKeyString<8> platform_key("platform");
|
||||
#if defined(OS_WIN)
|
||||
platform_key.Set("win32");
|
||||
#elif defined(OS_MACOSX)
|
||||
platform_key.Set("darwin");
|
||||
#elif defined(OS_LINUX)
|
||||
platform_key.Set("linux");
|
||||
#else
|
||||
platform_key.Set("unknown");
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace crash_keys
|
||||
|
||||
} // namespace electron
|
Loading…
Add table
Add a link
Reference in a new issue