feat: crashpad handler http-proxy support (#847)

getsentry · May 27, 2023 · ad3c988 · ad3c988
1 parent 6c76f58
commit ad3c988
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Disable PC adjustment in the backend for libunwindstack ([#839](https://github.com/getsentry/sentry-native/pull/839))
 - Crashpad backend allows inspection and enrichment of the crash event in the on_crash/before_send hooks ([#843](https://github.com/getsentry/sentry-native/pull/843))
+- Add http-proxy support to the `crashpad_handler` ([#847](https://github.com/getsentry/sentry-native/pull/847), [crashpad#86](https://github.com/getsentry/crashpad/pull/86))
 
 **Internal**:
 

diff --git a/external/crashpad b/external/crashpad
diff --git a/src/backends/sentry_backend_crashpad.cpp b/src/backends/sentry_backend_crashpad.cpp
@@ -319,15 +319,25 @@ crashpad_backend_startup(
     // `sentry_init` will persist the upload flag.
     data->db = crashpad::CrashReportDatabase::Initialize(database).release();
 
+    bool success;
     crashpad::CrashpadClient client;
     char *minidump_url
         = sentry__dsn_get_minidump_url(options->dsn, options->user_agent);
-    SENTRY_TRACEF("using minidump url \"%s\"", minidump_url);
-    std::string url = minidump_url ? std::string(minidump_url) : std::string();
-    sentry_free(minidump_url);
-    bool success = client.StartHandler(handler, database, database, url,
-        annotations, arguments, /* restartable */ true,
-        /* asynchronous_start */ false, attachments);
+    if (minidump_url) {
+        SENTRY_TRACEF("using minidump URL \"%s\"", minidump_url);
+        success = client.StartHandler(handler, database, database, minidump_url,
+            options->http_proxy ? options->http_proxy : "", annotations,
+            arguments,
+            /* restartable */ true,
+            /* asynchronous_start */ false, attachments);
+        sentry_free(minidump_url);
+    } else {
+        SENTRY_WARN(
+            "failed to construct minidump URL (check DSN or user-agent)");
+        delete data->db;
+        data->db = nullptr;
+        return 1;
+    }
 
 #ifdef CRASHPAD_WER_ENABLED
     sentry_path_t *handler_dir = sentry__path_dir(absolute_handler_path);
+1 −0		.github/CODEOWNERS
+5 −0		client/client_argv_handling.cc
+1 −0		client/client_argv_handling.h
+7 −0		client/crashpad_client.h
+6 −3		client/crashpad_client_linux.cc
+26 −12		client/crashpad_client_mac.cc
+10 −0		client/crashpad_client_win.cc
+1 −1		client/ios_handler/in_process_handler.cc
+7 −3		handler/crash_report_upload_thread.cc
+3 −1		handler/crash_report_upload_thread.h
+9 −0		handler/handler_main.cc
+8 −0		tools/run_with_crashpad.cc
+4 −0		util/net/http_transport.cc
+7 −0		util/net/http_transport.h
+3 −0		util/net/http_transport_libcurl.cc
+126 −35		util/net/http_transport_mac.mm
+37 −11		util/net/http_transport_win.cc