feat: pass added and removed attachments to the backend

Author: jpnurmi

external/crashpad

@@ -661,6 +661,30 @@ crashpad_backend_prune_database(sentry_backend_t *backend)
     crashpad::PruneCrashReportDatabase(data->db, &condition);
 }
 
+#if defined(SENTRY_PLATFORM_WINDOWS) || defined(SENTRY_PLATFORM_LINUX)
+static void
+crashpad_backend_add_attachment(
+    sentry_backend_t *backend, const sentry_path_t *attachment)
+{
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
+    if (!data->client) {
+        return;
+    }
+    data->client->AddAttachment(base::FilePath(attachment->path));
+}
+
+static void
+crashpad_backend_remove_attachment(
+    sentry_backend_t *backend, const sentry_path_t *attachment)
+{
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
+    if (!data->client) {
+        return;
+    }
+    data->client->RemoveAttachment(base::FilePath(attachment->path));
+}
+#endif
+
 sentry_backend_t *
 sentry__backend_new(void)
 {
@@ -688,6 +712,10 @@ sentry__backend_new(void)
     backend->user_consent_changed_func = crashpad_backend_user_consent_changed;
     backend->get_last_crash_func = crashpad_backend_last_crash;
     backend->prune_database_func = crashpad_backend_prune_database;
+#if defined(SENTRY_PLATFORM_WINDOWS) || defined(SENTRY_PLATFORM_LINUX)
+    backend->add_attachment_func = crashpad_backend_add_attachment;
+    backend->remove_attachment_func = crashpad_backend_remove_attachment;
+#endif
     backend->data = data;
     backend->can_capture_after_shutdown = true;
 

src/backends/sentry_backend_crashpad.cpp

@@ -25,6 +25,8 @@ struct sentry_backend_s {
     void (*user_consent_changed_func)(sentry_backend_t *);
     uint64_t (*get_last_crash_func)(sentry_backend_t *);
     void (*prune_database_func)(sentry_backend_t *);
+    void (*add_attachment_func)(sentry_backend_t *, const sentry_path_t *);
+    void (*remove_attachment_func)(sentry_backend_t *, const sentry_path_t *);
     void *data;
     // Whether this backend still runs after shutdown_func was called.
     bool can_capture_after_shutdown;

src/sentry_backend.h

@@ -1418,37 +1418,61 @@ sentry_capture_minidump_n(const char *path, size_t path_len)
 void
 sentry_add_attachment(const char *path)
 {
+    sentry_path_t *attachment = sentry__path_from_str(path);
+    SENTRY_WITH_OPTIONS (options) {
+        if (options->backend && options->backend->add_attachment_func) {
+            options->backend->add_attachment_func(options->backend, attachment);
+        }
+    }
     SENTRY_WITH_SCOPE_MUT (scope) {
         sentry__attachment_add(
-            &scope->attachments, sentry__path_from_str(path), ATTACHMENT, NULL);
+            &scope->attachments, attachment, ATTACHMENT, NULL);
     }
 }
 
 void
 sentry_remove_attachment(const char *path)
 {
+    sentry_path_t *attachment = sentry__path_from_str(path);
+    SENTRY_WITH_OPTIONS (options) {
+        if (options->backend && options->backend->remove_attachment_func) {
+            options->backend->remove_attachment_func(
+                options->backend, attachment);
+        }
+    }
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry__attachment_remove(
-            &scope->attachments, sentry__path_from_str(path));
+        sentry__attachment_remove(&scope->attachments, attachment);
     }
 }
 
 #ifdef SENTRY_PLATFORM_WINDOWS
 void
 sentry_add_attachmentw(const wchar_t *path)
 {
+    sentry_path_t *attachment = sentry__path_from_wstr(path);
+    SENTRY_WITH_OPTIONS (options) {
+        if (options->backend && options->backend->add_attachment_func) {
+            options->backend->add_attachment_func(options->backend, attachment);
+        }
+    }
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry__attachment_add(&scope->attachments,
-            sentry__path_from_wstr(path), ATTACHMENT, NULL);
+        sentry__attachment_add(
+            &scope->attachments, attachment, ATTACHMENT, NULL);
     }
 }
 
 void
 sentry_remove_attachmentw(const wchar_t *path)
 {
+    sentry_path_t *attachment = sentry__path_from_wstr(path);
+    SENTRY_WITH_OPTIONS (options) {
+        if (options->backend && options->backend->remove_attachment_func) {
+            options->backend->remove_attachment_func(
+                options->backend, attachment);
+        }
+    }
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry__attachment_remove(
-            &scope->attachments, sentry__path_from_wstr(path));
+        sentry__attachment_remove(&scope->attachments, attachment);
     }
 }
 #endif