e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
147 lines
5.4 KiB
Diff
147 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Thu, 14 May 2020 16:52:09 -0700
|
|
Subject: crash: allow disabling compression on linux
|
|
|
|
This makes compression optional on breakpad_linux.
|
|
|
|
Upstream attempted here
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/2198641, but
|
|
was denied.
|
|
|
|
Ultimately we should remove the option to disable compression, and
|
|
subsequently remove this patch.
|
|
|
|
diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
|
|
index a372e9bb12f9cec6235fe529d73b6e0009328038..58f6f559265d0da5e6ca4c711df4b1dbf3d40e38 100644
|
|
--- a/components/crash/core/app/breakpad_linux.cc
|
|
+++ b/components/crash/core/app/breakpad_linux.cc
|
|
@@ -111,6 +111,8 @@ void SetUploadURL(const std::string& url) {
|
|
DCHECK(!g_upload_url);
|
|
g_upload_url = strdup(url.c_str());
|
|
}
|
|
+
|
|
+bool g_compress_uploads = true;
|
|
#endif
|
|
|
|
bool g_is_node = false;
|
|
@@ -1324,56 +1326,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
|
|
|
|
#else // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
- // Compress |dumpfile| with gzip.
|
|
- const pid_t gzip_child = sys_fork();
|
|
- if (gzip_child < 0) {
|
|
- static const char msg[] = "sys_fork() for gzip process failed.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
- }
|
|
- if (!gzip_child) {
|
|
- // gzip process.
|
|
- const char* args[] = {
|
|
- "/bin/gzip",
|
|
- "-f", // Do not prompt to verify before overwriting.
|
|
- dumpfile,
|
|
- nullptr,
|
|
- };
|
|
- execve(args[0], const_cast<char**>(args), environ);
|
|
- static const char msg[] = "Cannot exec gzip.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
- }
|
|
- // Wait for gzip process.
|
|
- int status = 0;
|
|
- if (sys_waitpid(gzip_child, &status, 0) != gzip_child ||
|
|
- !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
|
- static const char msg[] = "sys_waitpid() for gzip process failed.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys_kill(gzip_child, SIGKILL);
|
|
- sys__exit(1);
|
|
- }
|
|
+ if (g_compress_uploads) {
|
|
+ // Compress |dumpfile| with gzip.
|
|
+ const pid_t gzip_child = sys_fork();
|
|
+ if (gzip_child < 0) {
|
|
+ static const char msg[] = "sys_fork() for gzip process failed.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
+ if (!gzip_child) {
|
|
+ // gzip process.
|
|
+ const char* args[] = {
|
|
+ "/bin/gzip",
|
|
+ "-f", // Do not prompt to verify before overwriting.
|
|
+ dumpfile,
|
|
+ nullptr,
|
|
+ };
|
|
+ execve(args[0], const_cast<char**>(args), environ);
|
|
+ static const char msg[] = "Cannot exec gzip.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
+ // Wait for gzip process.
|
|
+ int status = 0;
|
|
+ if (sys_waitpid(gzip_child, &status, 0) != gzip_child ||
|
|
+ !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
|
+ static const char msg[] = "sys_waitpid() for gzip process failed.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys_kill(gzip_child, SIGKILL);
|
|
+ sys__exit(1);
|
|
+ }
|
|
|
|
- static const char kGzipExtension[] = ".gz";
|
|
- const size_t gzip_file_size = my_strlen(dumpfile) + sizeof(kGzipExtension);
|
|
- char* const gzip_file = reinterpret_cast<char*>(allocator->Alloc(
|
|
- gzip_file_size));
|
|
- my_strlcpy(gzip_file, dumpfile, gzip_file_size);
|
|
- my_strlcat(gzip_file, kGzipExtension, gzip_file_size);
|
|
+ static const char kGzipExtension[] = ".gz";
|
|
+ const size_t gzip_file_size = my_strlen(dumpfile) + sizeof(kGzipExtension);
|
|
+ char* const gzip_file =
|
|
+ reinterpret_cast<char*>(allocator->Alloc(gzip_file_size));
|
|
+ my_strlcpy(gzip_file, dumpfile, gzip_file_size);
|
|
+ my_strlcat(gzip_file, kGzipExtension, gzip_file_size);
|
|
|
|
- // Rename |gzip_file| to |dumpfile| (the original file was deleted by gzip).
|
|
- if (rename(gzip_file, dumpfile)) {
|
|
- static const char msg[] = "Failed to rename gzipped file.\n";
|
|
- WriteLog(msg, sizeof(msg) - 1);
|
|
- sys__exit(1);
|
|
+ // Rename |gzip_file| to |dumpfile| (the original file was deleted by gzip).
|
|
+ if (rename(gzip_file, dumpfile)) {
|
|
+ static const char msg[] = "Failed to rename gzipped file.\n";
|
|
+ WriteLog(msg, sizeof(msg) - 1);
|
|
+ sys__exit(1);
|
|
+ }
|
|
}
|
|
|
|
// The --header argument to wget looks like:
|
|
// --header=Content-Encoding: gzip
|
|
// --header=Content-Type: multipart/form-data; boundary=XYZ
|
|
// where the boundary has two fewer leading '-' chars
|
|
- static const char header_content_encoding[] =
|
|
+ static const char header_content_encoding_gzip[] =
|
|
"--header=Content-Encoding: gzip";
|
|
+ static const char header_content_encoding_identity[] =
|
|
+ "--header=Content-Encoding: identity";
|
|
static const char header_msg[] =
|
|
"--header=Content-Type: multipart/form-data; boundary=";
|
|
const size_t header_content_type_size =
|
|
@@ -1400,7 +1406,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
|
|
static const char kWgetBinary[] = "/usr/bin/wget";
|
|
const char* args[] = {
|
|
kWgetBinary,
|
|
- header_content_encoding,
|
|
+ g_compress_uploads ? header_content_encoding_gzip
|
|
+ : header_content_encoding_identity,
|
|
header_content_type,
|
|
post_file,
|
|
g_upload_url,
|
|
@@ -2041,6 +2048,7 @@ void InitCrashReporter(const std::string& process_type) {
|
|
|
|
#if !BUILDFLAG(IS_CHROMEOS)
|
|
SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
|
|
+ g_compress_uploads = GetCrashReporterClient()->GetShouldCompressUploads();
|
|
#endif
|
|
|
|
if (is_browser_process) {
|