commit 334b1ae26b93078d77d6fc225bfa37514fb6e5b0
author Mike Frysinger <vapier@chromium.org> Thu Aug 14 07:41:22 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Aug 15 18:00:18 2014 +0000
tree 5eea4639ed037782adb616dd93836d4ff3872e9e
parent efec0b3625f447995d2ed79b946d2929039313c9

crash-reporter: crash_sender: strip dashes from clientids

Since Chrome has started preserving the dashes, we have to strip them
ourselves when uploading reports.

BUG=chromium:398217
BUG=391338
TEST=`cbuildbot x86-generic-full` passes

Change-Id: I795fb7fd6feae3c4f97829a849f0271c61e84490
Reviewed-on: https://chromium-review.googlesource.com/212229
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

crash_reporter/crash_sender

diff --git a/crash_reporter/crash_sender b/crash_reporter/crash_sender
index 8c15ad7..f084828 100755
--- a/crash_reporter/crash_sender
+++ b/crash_reporter/crash_sender
@@ -274,6 +274,7 @@
   local product="$(get_key_value "${meta_path}" "upload_var_prod")"
   local version="$(get_key_value "${meta_path}" "upload_var_ver")"
   local upload_prefix="$(get_key_value "${meta_path}" "upload_prefix")"
+  local guid
 
   set -- \
     -F "write_payload_size=${write_payload_size}" \
@@ -363,6 +364,10 @@
     boot_mode="dev"
   fi
 
+  # Need to strip dashes ourselves as Chrome preserves it in the file
+  # nowadays.  This is also what the Chrome breakpad client does.
+  guid=$(tr -d '-' < "${CONSENT_ID}")
+
   local error_type="$(get_key_value "${meta_path}" "error_type")"
   [ "${error_type}" = "undefined" ] && error_type=
 
@@ -421,7 +426,7 @@
     ${image_type:+-F "image_type=${image_type}"} \
     ${boot_mode:+-F "boot_mode=${boot_mode}"} \
     ${error_type:+-F "error_type=${error_type}"} \
-    -F "guid=<${CONSENT_ID}" \
+    -F "guid=${guid}" \
     -o "${report_id}" \
     "$@" \
     2>"${curl_stderr}"