28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
172 lines
5.3 KiB
C++
172 lines
5.3 KiB
C++
// 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 "electron/buildflags/buildflags.h"
|
|
#include "electron/fuses.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/electron_constants.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "third_party/crashpad/crashpad/client/annotation.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace crash_keys {
|
|
|
|
namespace {
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
// Breakpad has a flawed system of calculating the number of chunks
|
|
// we add 127 bytes to force an extra chunk
|
|
constexpr size_t kMaxCrashKeyValueSize = 20479;
|
|
#else
|
|
constexpr size_t kMaxCrashKeyValueSize = 20320;
|
|
#endif
|
|
|
|
static_assert(kMaxCrashKeyValueSize < crashpad::Annotation::kValueMaxSize,
|
|
"max crash key value length above what crashpad supports");
|
|
|
|
using ExtraCrashKeys =
|
|
std::deque<crash_reporter::CrashKeyString<kMaxCrashKeyValueSize>>;
|
|
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 BUILDFLAG(IS_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.
|
|
if (key.size() >= kMaxCrashKeyNameLength) {
|
|
node::Environment* env =
|
|
node::Environment::GetCurrent(JavascriptEnvironment::GetIsolate());
|
|
EmitWarning(env,
|
|
"The crash key name, \"" + key + "\", is longer than " +
|
|
std::to_string(kMaxCrashKeyNameLength) +
|
|
" bytes, ignoring it.",
|
|
"electron");
|
|
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)
|
|
if (!electron::fuses::IsRunAsNodeEnabled())
|
|
return false;
|
|
|
|
return base::Environment::Create()->HasVar(electron::kRunAsNode);
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
} // namespace
|
|
|
|
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
|
|
#if BUILDFLAG(IS_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 BUILDFLAG(IS_WIN)
|
|
platform_key.Set("win32");
|
|
#elif BUILDFLAG(IS_MAC)
|
|
platform_key.Set("darwin");
|
|
#elif BUILDFLAG(IS_LINUX)
|
|
platform_key.Set("linux");
|
|
#else
|
|
platform_key.Set("unknown");
|
|
#endif
|
|
}
|
|
|
|
} // namespace crash_keys
|
|
|
|
} // namespace electron
|