diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc index d045eb6a65a0..bc347a30ea26 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc @@ -66,13 +66,19 @@ void PruneCrashReportDatabase(CrashReportDatabase* database, } // static -std::unique_ptr PruneCondition::GetDefault() { +std::unique_ptr PruneCondition::GetDefault( + int max_size_in_mb, + int max_age_in_days) { // DatabaseSizePruneCondition must be the LHS so that it is always evaluated, // due to the short-circuting behavior of BinaryPruneCondition. + if (max_size_in_mb <= 0) + max_size_in_mb = 128; + if (max_age_in_days <= 0) + max_age_in_days = 365; return std::make_unique( BinaryPruneCondition::OR, - new DatabaseSizePruneCondition(1024 * 128), - new AgePruneCondition(365)); + new DatabaseSizePruneCondition(1024 * max_size_in_mb), + new AgePruneCondition(max_age_in_days)); } static const time_t kSecondsInDay = 60 * 60 * 24; diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h index 6dac5f3002b3..34f5ee111d3d 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.h +++ third_party/crashpad/crashpad/client/prune_crash_reports.h @@ -57,7 +57,8 @@ class PruneCondition { //! of 128 MB. //! //! \return A PruneCondition for use with PruneCrashReportDatabase(). - static std::unique_ptr GetDefault(); + static std::unique_ptr GetDefault(int max_size_in_mb, + int max_age_in_days); virtual ~PruneCondition() {} diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc index 20bd2581cd97..16d63af65e2f 100644 --- third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc @@ -85,7 +85,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { struct Settings::Data { static const uint32_t kSettingsMagic = 'CPds'; - static const uint32_t kSettingsVersion = 1; + static const uint32_t kSettingsVersion = 2; enum Options : uint32_t { kUploadsEnabled = 1 << 0, @@ -96,6 +96,9 @@ struct Settings::Data { options(0), padding_0(0), last_upload_attempt_time(0), + next_upload_attempt_time(0), + backoff_step(0), + padding_1(0), client_id() {} uint32_t magic; @@ -103,6 +106,9 @@ struct Settings::Data { uint32_t options; uint32_t padding_0; int64_t last_upload_attempt_time; // time_t + int64_t next_upload_attempt_time; // time_t + uint32_t backoff_step; + uint32_t padding_1; UUID client_id; }; @@ -186,6 +192,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) { return WriteSettings(handle.get(), settings); } +bool Settings::GetNextUploadAttemptTime(time_t* time) { + DCHECK(initialized_.is_valid()); + + Data settings; + if (!OpenAndReadSettings(&settings)) + return false; + + *time = InRangeCast(settings.next_upload_attempt_time, + std::numeric_limits::max()); + return true; +} + +bool Settings::SetNextUploadAttemptTime(time_t time) { + DCHECK(initialized_.is_valid()); + + Data settings; + ScopedLockedFileHandle handle = OpenForWritingAndReadSettings(&settings); + if (!handle.is_valid()) + return false; + + settings.next_upload_attempt_time = InRangeCast(time, 0); + + return WriteSettings(handle.get(), settings); +} + +bool Settings::GetBackoffStep(int* step) { + DCHECK(initialized_.is_valid()); + + Data settings; + if (!OpenAndReadSettings(&settings)) + return false; + + *step = InRangeCast(settings.backoff_step, + std::numeric_limits::max()); + return true; +} + +bool Settings::SetBackoffStep(int step) { + DCHECK(initialized_.is_valid()); + + Data settings; + ScopedLockedFileHandle handle = OpenForWritingAndReadSettings(&settings); + if (!handle.is_valid()) + return false; + + settings.backoff_step = InRangeCast(step, 0); + + return WriteSettings(handle.get(), settings); +} + // static Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( FileHandle file, diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h index a2b0c74636f4..01370fdc20d9 100644 --- third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h @@ -111,6 +111,11 @@ class Settings { //! error logged. bool SetLastUploadAttemptTime(time_t time); + bool GetNextUploadAttemptTime(time_t* time); + bool SetNextUploadAttemptTime(time_t time); + bool GetBackoffStep(int* step); + bool SetBackoffStep(int step); + private: struct Data; diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn index e43619c49713..a6f5b7e1a577 100644 --- third_party/crashpad/crashpad/handler/BUILD.gn +++ third_party/crashpad/crashpad/handler/BUILD.gn @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//cef/libcef/features/features.gni") import("../build/crashpad_buildconfig.gni") static_library("handler") { @@ -75,8 +76,20 @@ static_library("handler") { "../third_party/mini_chromium:base", "../tools:tool_support", "../util", + "//cef/libcef/features", ] + if (enable_cef) { + sources += [ + "//cef/libcef/common/cef_crash_report_upload_thread.cc", + "//cef/libcef/common/cef_crash_report_upload_thread.h", + "//cef/libcef/common/cef_crash_report_utils.cc", + "//cef/libcef/common/cef_crash_report_utils.h", + ] + + configs += [ "//cef/libcef/features:config" ] + } + if (crashpad_is_win) { cflags = [ "/wd4201" ] # nonstandard extension used : nameless struct/union } diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc index 205d860f9139..e077a835a19e 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc @@ -268,6 +268,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( if (minidump_process_snapshot.Initialize(reader)) { parameters = BreakpadHTTPFormParametersFromMinidump(&minidump_process_snapshot); + if (!parameters.empty()) + parameters = FilterParameters(parameters); } if (!reader->SeekSet(start_offset)) { diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h index 2ec1147d2620..8ff9a72e0bd7 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ #define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ +#include #include #include @@ -103,7 +104,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, //! It is expected to only be called from the same thread that called Start(). void Stop() override; - private: + protected: //! \brief The result code from UploadReport(). enum class UploadResult { //! \brief The crash report was uploaded successfully. @@ -131,7 +132,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, //! object was constructed with \a watch_pending_reports, it will also scan //! the crash report database for other pending reports, and process those as //! well. - void ProcessPendingReports(); + virtual void ProcessPendingReports(); //! \brief Processes a single pending report from the database. //! @@ -145,7 +146,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, //! remain in the “pending” state. If the upload fails and no more retries are //! desired, or report upload is disabled, it will be marked as “completed” in //! the database without ever having been uploaded. - void ProcessPendingReport(const CrashReportDatabase::Report& report); + virtual void ProcessPendingReport(const CrashReportDatabase::Report& report); //! \brief Attempts to upload a crash report. //! @@ -162,6 +163,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate, UploadResult UploadReport(const CrashReportDatabase::UploadReport* report, std::string* response_body); + using ParameterMap = std::map; + virtual ParameterMap FilterParameters(const ParameterMap& parameters) { + return parameters; + } + // WorkerThread::Delegate: //! \brief Calls ProcessPendingReports() in response to ReportPending() having //! been called on any thread, as well as periodically on a timer. diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc index b3e0a68a1c0a..087a4e4c6b9c 100644 --- third_party/crashpad/crashpad/handler/handler_main.cc +++ third_party/crashpad/crashpad/handler/handler_main.cc @@ -36,8 +36,10 @@ #include "base/scoped_generic.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" +#include "cef/libcef/features/features.h" #include "client/crash_report_database.h" #include "client/crashpad_client.h" #include "client/crashpad_info.h" @@ -93,6 +95,10 @@ #include "handler/linux/exception_handler_server.h" #endif // OS_MACOSX +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/common/cef_crash_report_upload_thread.h" +#endif + namespace crashpad { namespace { @@ -179,6 +185,9 @@ struct Options { bool periodic_tasks; bool rate_limit; bool upload_gzip; + int max_uploads; + int max_database_size; + int max_database_age; }; // Splits |key_value| on '=' and inserts the resulting key and value into |map|. @@ -541,6 +550,9 @@ int HandlerMain(int argc, kOptionSanitizationInformation, #endif kOptionURL, + kOptionMaxUploads, + kOptionMaxDatabaseSize, + kOptionMaxDatabaseAge, // Standard options. kOptionHelp = -2, @@ -602,6 +614,9 @@ int HandlerMain(int argc, {"url", required_argument, nullptr, kOptionURL}, {"help", no_argument, nullptr, kOptionHelp}, {"version", no_argument, nullptr, kOptionVersion}, + {"max-uploads", required_argument, nullptr, kOptionMaxUploads}, + {"max-db-size", required_argument, nullptr, kOptionMaxDatabaseSize}, + {"max-db-age", required_argument, nullptr, kOptionMaxDatabaseAge}, {nullptr, 0, nullptr, 0}, }; @@ -737,6 +752,27 @@ int HandlerMain(int argc, options.url = optarg; break; } + case kOptionMaxUploads: { + if (base::StringToInt(optarg, &options.max_uploads)) { + if (options.max_uploads < 0) + options.max_uploads = 0; + } + break; + } + case kOptionMaxDatabaseSize: { + if (base::StringToInt(optarg, &options.max_database_size)) { + if (options.max_database_size < 0) + options.max_database_size = 0; + } + break; + } + case kOptionMaxDatabaseAge: { + if (base::StringToInt(optarg, &options.max_database_age)) { + if (options.max_database_age < 0) + options.max_database_age = 0; + } + break; + } case kOptionHelp: { Usage(me); MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly); @@ -851,8 +887,14 @@ int HandlerMain(int argc, upload_thread_options.upload_gzip = options.upload_gzip; upload_thread_options.watch_pending_reports = options.periodic_tasks; +#if BUILDFLAG(ENABLE_CEF) + upload_thread.Reset(new CefCrashReportUploadThread( + database.get(), options.url, upload_thread_options, + options.max_uploads)); +#else upload_thread.Reset(new CrashReportUploadThread( database.get(), options.url, upload_thread_options)); +#endif upload_thread.Get()->Start(); } @@ -880,7 +922,8 @@ int HandlerMain(int argc, ScopedStoppable prune_thread; if (options.periodic_tasks) { prune_thread.Reset(new PruneCrashReportThread( - database.get(), PruneCondition::GetDefault())); + database.get(), PruneCondition::GetDefault(options.max_database_size, + options.max_database_age))); prune_thread.Get()->Start(); }