Merge pull request #86 from supervacuus/feat/handler_http_proxy_support

feat: handler http-proxy support
getsentry · May 27, 2023 · 3cdef1c · 3cdef1c
2 parents 3b82866 + 7041349
commit 3cdef1c
Show file tree

Hide file tree

Showing 16 changed files with 260 additions and 66 deletions.
diff --git a/client/client_argv_handling.cc b/client/client_argv_handling.cc
@@ -32,6 +32,7 @@ std::vector<std::string> BuildHandlerArgvStrings(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments) {
@@ -54,6 +55,10 @@ std::vector<std::string> BuildHandlerArgvStrings(
     argv_strings.push_back(FormatArgumentString("url", url));
   }
 
+  if (!http_proxy.empty()) {
+    argv_strings.push_back(FormatArgumentString("http-proxy", http_proxy));
+  }
+
   for (const auto& kv : annotations) {
     argv_strings.push_back(
         FormatArgumentString("annotation", kv.first + '=' + kv.second));

diff --git a/client/client_argv_handling.h b/client/client_argv_handling.h
@@ -34,6 +34,7 @@ std::vector<std::string> BuildHandlerArgvStrings(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments = {});

diff --git a/client/crashpad_client.h b/client/crashpad_client.h
@@ -124,6 +124,7 @@ class CrashpadClient {
                     const base::FilePath& database,
                     const base::FilePath& metrics_dir,
                     const std::string& url,
+                    const std::string& http_proxy,
                     const std::map<std::string, std::string>& annotations,
                     const std::vector<std::string>& arguments,
                     bool restartable,
@@ -363,6 +364,8 @@ class CrashpadClient {
   //!     path as its `--metrics-dir` argument.
   //! \param[in] url The URL of an upload server. The handler will be started
   //!     with this URL as its `--url` argument.
+  //! \param[in] http_proxy The URL of an HTTP proxy. The handler will be started
+  //!     with this URL as its `--http-proxy` argument.
   //! \param[in] annotations Process annotations to set in each crash report.
   //!     The handler will be started with an `--annotation` argument for each
   //!     element in this map.
@@ -377,6 +380,7 @@ class CrashpadClient {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments = {});
@@ -394,6 +398,8 @@ class CrashpadClient {
   //!     path as its `--metrics-dir` argument.
   //! \param[in] url The URL of an upload server. The handler will be started
   //!     with this URL as its `--url` argument.
+  //! \param[in] http_proxy The URL of an HTTP proxy. The handler will be started
+  //!     with this URL as its `--http-proxy` argument.
   //! \param[in] annotations Process annotations to set in each crash report.
   //!     The handler will be started with an `--annotation` argument for each
   //!     element in this map.
@@ -410,6 +416,7 @@ class CrashpadClient {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       int socket);

diff --git a/client/crashpad_client_linux.cc b/client/crashpad_client_linux.cc
@@ -443,6 +443,7 @@ bool CrashpadClient::StartHandler(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -457,7 +458,7 @@ bool CrashpadClient::StartHandler(
   }
 
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments, attachments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments, attachments);
 
   argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
   argv.push_back("--shared-client-connection");
@@ -676,11 +677,12 @@ bool CrashpadClient::StartHandlerAtCrash(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments) {
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments, attachments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments, attachments);
 
   auto signal_handler = LaunchAtCrashHandler::Get();
   return signal_handler->Initialize(&argv, nullptr, &unhandled_signals_);
@@ -692,11 +694,12 @@ bool CrashpadClient::StartHandlerForClient(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     int socket) {
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments);
 
   argv.push_back(FormatArgumentInt("initial-client-fd", socket));
 

diff --git a/client/crashpad_client_mac.cc b/client/crashpad_client_mac.cc
@@ -92,8 +92,7 @@ bool SetCrashExceptionPorts(exception_handler_t exception_handler) {
 class ScopedPthreadAttrDestroy {
  public:
   explicit ScopedPthreadAttrDestroy(pthread_attr_t* pthread_attr)
-      : pthread_attr_(pthread_attr) {
-  }
+      : pthread_attr_(pthread_attr) {}
 
   ScopedPthreadAttrDestroy(const ScopedPthreadAttrDestroy&) = delete;
   ScopedPthreadAttrDestroy& operator=(const ScopedPthreadAttrDestroy&) = delete;
@@ -127,6 +126,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments,
@@ -167,6 +167,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                      database,
                      metrics_dir,
                      url,
+                     http_proxy,
                      annotations,
                      arguments,
                      attachments,
@@ -177,8 +178,14 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
     }
 
     if (handler_restarter &&
-        handler_restarter->StartRestartThread(
-            handler, database, metrics_dir, url, annotations, arguments, attachments)) {
+        handler_restarter->StartRestartThread(handler,
+                                              database,
+                                              metrics_dir,
+                                              url,
+                                              http_proxy,
+                                              annotations,
+                                              arguments,
+                                              attachments)) {
       // The thread owns the object now.
       std::ignore = handler_restarter.release();
     }
@@ -211,6 +218,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                 database_,
                 metrics_dir_,
                 url_,
+                http_proxy_,
                 annotations_,
                 arguments_,
                 attachments_,
@@ -232,8 +240,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
         arguments_(),
         attachments_(),
         notify_port_(NewMachPort(MACH_PORT_RIGHT_RECEIVE)),
-        last_start_time_(0) {
-  }
+        last_start_time_(0) {}
 
   //! \brief Starts a Crashpad handler.
   //!
@@ -258,6 +265,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const base::FilePath& database,
                           const base::FilePath& metrics_dir,
                           const std::string& url,
+                          const std::string& http_proxy,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments,
                           const std::vector<base::FilePath>& attachments,
@@ -337,6 +345,9 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
     if (!url.empty()) {
       argv.push_back(FormatArgumentString("url", url));
     }
+    if (!http_proxy.empty()) {
+      argv.push_back(FormatArgumentString("http-proxy", http_proxy));
+    }
     for (const auto& kv : annotations) {
       argv.push_back(
           FormatArgumentString("annotation", kv.first + '=' + kv.second));
@@ -380,13 +391,15 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const base::FilePath& database,
                           const base::FilePath& metrics_dir,
                           const std::string& url,
+                          const std::string& http_proxy,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments,
                           const std::vector<base::FilePath>& attachments) {
     handler_ = handler;
     database_ = database;
     metrics_dir_ = metrics_dir;
     url_ = url;
+    http_proxy_ = http_proxy;
     annotations_ = annotations;
     arguments_ = arguments;
     attachments_ = attachments;
@@ -440,6 +453,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
   base::FilePath database_;
   base::FilePath metrics_dir_;
   std::string url_;
+  std::string http_proxy_;
   std::map<std::string, std::string> annotations_;
   std::vector<std::string> arguments_;
   std::vector<base::FilePath> attachments_;
@@ -449,17 +463,16 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
 
 }  // namespace
 
-CrashpadClient::CrashpadClient() : exception_port_(MACH_PORT_NULL) {
-}
+CrashpadClient::CrashpadClient() : exception_port_(MACH_PORT_NULL) {}
 
-CrashpadClient::~CrashpadClient() {
-}
+CrashpadClient::~CrashpadClient() {}
 
 bool CrashpadClient::StartHandler(
     const base::FilePath& handler,
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -473,6 +486,7 @@ bool CrashpadClient::StartHandler(
       database,
       metrics_dir,
       url,
+      http_proxy,
       annotations,
       arguments,
       attachments,
@@ -538,8 +552,8 @@ base::mac::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
 
 // static
 void CrashpadClient::UseSystemDefaultHandler() {
-  base::mac::ScopedMachSendRight
-      system_crash_reporter_handler(SystemCrashReporterHandler());
+  base::mac::ScopedMachSendRight system_crash_reporter_handler(
+      SystemCrashReporterHandler());
 
   // Proceed even if SystemCrashReporterHandler() failed, setting MACH_PORT_NULL
   // to clear the current exception ports.

diff --git a/client/crashpad_client_win.cc b/client/crashpad_client_win.cc
@@ -331,6 +331,7 @@ struct BackgroundHandlerStartThreadData {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments,
@@ -340,6 +341,7 @@ struct BackgroundHandlerStartThreadData {
         database(database),
         metrics_dir(metrics_dir),
         url(url),
+        http_proxy(http_proxy),
         annotations(annotations),
         arguments(arguments),
         attachments(attachments),
@@ -350,6 +352,7 @@ struct BackgroundHandlerStartThreadData {
   base::FilePath database;
   base::FilePath metrics_dir;
   std::string url;
+  std::string http_proxy;
   std::map<std::string, std::string> annotations;
   std::vector<std::string> arguments;
   std::vector<base::FilePath> attachments;
@@ -405,6 +408,11 @@ bool StartHandlerProcess(
         FormatArgumentString("url", base::UTF8ToWide(data->url)),
         &command_line);
   }
+  if (!data->http_proxy.empty()) {
+    AppendCommandLineArgument(
+        FormatArgumentString("http-proxy", base::UTF8ToWide(data->http_proxy)),
+        &command_line);
+  }
   for (const auto& kv : data->annotations) {
     AppendCommandLineArgument(
         FormatArgumentString("annotation",
@@ -629,6 +637,7 @@ bool CrashpadClient::StartHandler(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -661,6 +670,7 @@ bool CrashpadClient::StartHandler(
                                                    database,
                                                    metrics_dir,
                                                    url,
+                                                   http_proxy,
                                                    annotations,
                                                    arguments,
                                                    attachments,

diff --git a/client/ios_handler/in_process_handler.cc b/client/ios_handler/in_process_handler.cc
@@ -92,7 +92,7 @@ bool InProcessHandler::Initialize(
     upload_thread_options.identify_client_via_url = true;
 
     upload_thread_.reset(new CrashReportUploadThread(
-        database_.get(), url, upload_thread_options, callback));
+        database_.get(), url, "", upload_thread_options, callback));
   }
 
   if (!CreateDirectory(database))

diff --git a/handler/crash_report_upload_thread.cc b/handler/crash_report_upload_thread.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/logging.h"
@@ -88,12 +89,14 @@ class ScopedFunctionInvoker final {
 
 CrashReportUploadThread::CrashReportUploadThread(
     CrashReportDatabase* database,
-    const std::string& url,
+    std::string url,
+    std::string http_proxy,
     const Options& options,
     ProcessPendingReportsObservationCallback callback)
     : options_(options),
-      callback_(callback),
-      url_(url),
+      callback_(std::move(callback)),
+      url_(std::move(url)),
+      http_proxy_(std::move(http_proxy)),
       // When watching for pending reports, check every 15 minutes, even in the
       // absence of a signal from the handler thread. This allows for failed
       // uploads to be retried periodically, and for pending reports written by
@@ -365,6 +368,7 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
     }
   }
   http_transport->SetURL(url);
+  http_transport->SetHTTPProxy(http_proxy_);
 
   if (!http_transport->ExecuteSynchronously(response_body)) {
     return UploadResult::kRetry;

diff --git a/handler/crash_report_upload_thread.h b/handler/crash_report_upload_thread.h
@@ -85,7 +85,8 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //!     processing and attempting to upload on-disk crash reports.
   //!     If this callback is empty, it is not invoked.
   CrashReportUploadThread(CrashReportDatabase* database,
-                          const std::string& url,
+                          std::string url,
+                          std::string http_proxy,
                           const Options& options,
                           ProcessPendingReportsObservationCallback callback);
 
@@ -226,6 +227,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   const Options options_;
   const ProcessPendingReportsObservationCallback callback_;
   const std::string url_;
+  const std::string http_proxy_;
   WorkerThread thread_;
   ThreadSafeVector<UUID> known_pending_report_uuids_;
 #if BUILDFLAG(IS_IOS)