Send client ID in crash report

crash_sender

 #!/bin/sh
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -e
 
 # Product ID in crash report
 CHROMEOS_PRODUCT=ChromeOS
 
+# File whose existence implies crash reports may be sent, and whose
+# contents includes our machine's anonymized guid.
+CONSENT_ID="/home/chronos/Consent To Send Stats"
+
 # Send up to 8 crashes per day.
 MAX_CRASH_RATE=8
 
-# Minidump uploading tool (provided by Google Breakpad).
-MINIDUMP_UPLOADER=/usr/bin/minidump_upload
-
 # URL to send non-official build crashes to.
 MINIDUMP_UPLOAD_STAGING_URL="http://clients2.google.com/cr/staging_report"
 
 # URL to send official build crashes to.
 MINIDUMP_UPLOAD_PROD_URL="http://clients2.google.com/cr/report"
 
 # File whose existence mocks crash sending.  If empty we pretend the
 # crash sending was successful, otherwise unsuccessful.
 MOCK_CRASH_SENDING="/tmp/mock-crash-sending"
 
 # File whose existence causes crash sending to be delayed (for testing).
 PAUSE_CRASH_SENDING="/tmp/pause-crash-sending"
 
 # File whose existence implies we're running and not to start again.
 RUN_FILE="/var/run/crash_sender.pid"
 
 # Maximum time to sleep between sends.
-SECONDS_SEND_SPREAD=600
+SECONDS_SEND_SPREAD=${SECONDS_SEND_SPREAD:-600}
 
 # The syslog tag for all logging we emit.
 TAG="$(basename $0)[$$]"
 
 # Directory to store timestamp files indicating the uploads in the past 24
 # hours.
 TIMESTAMPS_DIR="/var/lib/crash_sender"
 
 lecho() {
   logger -t "${TAG}" "$@"
 }
 
-remove_run_file() {
+log_done() {
+  lecho "Done"
+}
+
+cleanup_tmp_dir() {
+  rm -rf "${TMP_DIR}"
+  log_done
+}
+
+cleanup_run_file_and_tmp_dir() {
   rm -f "${RUN_FILE}"
+  cleanup_tmp_dir
 }
 
 check_not_already_running() {
   if [ ! -f "${RUN_FILE}" ]; then
     return
   fi
   local last_pid=$(cat "${RUN_FILE}")
   if [ ! -f "/proc/${last_pid}/cmdline" ]; then
-    trap remove_run_file EXIT
+    trap cleanup_run_file_and_tmp_dir EXIT INT
     echo $$ > "${RUN_FILE}"
     return
   fi
   # This could just be an unrelated process, but it's ok to be conservative.
   lecho "Already running.  Exiting now."
   exit 1
 }
 
 get_version() {
   grep ^CHROMEOS_RELEASE_VERSION /etc/lsb-release | cut -d = -f 2-
 }
 
 is_official() {
   grep ^CHROMEOS_RELEASE_DESCRIPTION /etc/lsb-release | cut -d = -f 2- | \
       grep Official
 }
 
 # Generate a uniform random number in 0..max-1.
 generate_uniform_random() {
   local max=$1
   local random="$(od -An -N4 -tu /dev/urandom)"
   echo $((random % max))
 }
 
 is_feedback_disabled() {
-  # See crosbug.com/3303.
-  return 1
+  [ -r "${CONSENT_ID}" ] && return 1
+  return 0
 }
 
 is_on_3g() {
   # See crosbug.com/3304.
   return 1
 }
 
 # Check if sending a crash now does not exceed the maximum 24hr rate and
 # commit to doing so, if not.
 check_rate() {
@@ skipping 41 matching lines @@
       lecho "Mocking unsuccessful send"
       return 1
     fi
   fi
 
   if ! sleep ${sleep_time}; then
     lecho "Sleep failed"
     return 1
   fi
 
-  "${MINIDUMP_UPLOADER}" -p "${CHROMEOS_PRODUCT}" \
-          -v "${chromeos_version}" "${minidump_path}" "${url}"
-  return $?
+  local report_id="${TMP_DIR}/report_id"
+  local curl_stderr="${TMP_DIR}/curl_stderr"
+
+  set +e
+  curl "${url}" \
+    -F "prod=${CHROMEOS_PRODUCT}" \
+    -F "ver=${chromeos_version}" \
+    -F "upload_file_minidump=@${minidump_path}" \
+    -F "guid=<${CONSENT_ID}" -o "${report_id}" 2>"${curl_stderr}"
+  local curl_result=$?
+  set -e
+
+  if [ ${curl_result} -eq 0 ]; then
+    lecho "Crash report receipt ID $(cat ${report_id})"
+  else
+    lecho "Crash sending failed with: $(cat ${curl_stderr})"
+  fi
+  
+  rm -f "${report_id}" "${output_file}"
+
+  return ${curl_result}
 }
 
 # Send all crashes from the given directory.  The directory is currently
-# expected to just contain a bunch of minidumps - but this will change
-# over time to be a directory of directories where the minidump and core
-# file are in the directory as well as other metadata about the context
-# of the crash (executable name for instance).
+# expected to just contain a bunch of minidumps.
 send_crashes() {
   local dir="$1"
   lecho "Considering crashes in ${dir}"
   # Cycle through minidumps, most recent first.  That way if we're about
   # to exceed the daily rate, we send the most recent minidumps.
   if [ ! -d "${dir}" ]; then
     return
   fi
   for file in $(ls -1t "${dir}"); do
     local minidump_path="${dir}/${file}"
@@ skipping 13 matching lines @@
       lecho "Successfully sent crash ${minidump_path} and removing"
       rm "${minidump_path}"
     else
       lecho "Problem sending ${minidump_path}, not removing"
     fi
   done
 }
 
 main() {
   lecho "Starting"
+  trap log_done EXIT INT
+  
   if [ -e "${PAUSE_CRASH_SENDING}" ]; then
     lecho "Exiting early due to ${PAUSE_CRASH_SENDING}"
     exit 1
   fi
 
   check_not_already_running
 
+  TMP_DIR="$(mktemp -d /tmp/crash_sender.XXXX)"
+  trap cleanup_tmp_dir EXIT INT
+
   # Send system-wide crashes
   send_crashes "/var/spool/crash"
 
   # Send user-specific crashes
   send_crashes "/home/chronos/user/crash"
-
-  lecho "Done"
 }
 
 main