Add retry information to certificate reports.

chrome/browser/safe_browsing/certificate_reporting_service.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
 
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/time/clock.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "components/certificate_reporting/error_report.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 // URL to upload invalid certificate chain reports. An HTTP URL is used because
 // a client seeing an invalid cert might not be able to make an HTTPS connection
 // to report it.
 const char kExtendedReportingUploadUrl[] =
@@ skipping 79 matching lines @@
 
 void CertificateReportingService::Reporter::SendPending() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (!retries_enabled_) {
     return;
   }
   const base::Time now = clock_->Now();
   // Copy pending reports and clear the retry list.
   std::vector<Report> items = retry_list_->items();
   retry_list_->Clear();
-  for (const Report& report : items) {
+  for (Report& report : items) {
     if (report.creation_time < now - report_ttl_) {
       // Report too old, ignore.
       continue;
     }
+    if (!report.is_retried) {
+      // If this is the first retry, deserialize the report, set its retry bit
+      // and serialize again.
+      certificate_reporting::ErrorReport error_report;
+      if (!error_report.InitializeFromString(report.serialized_report)) {
+        LOG(ERROR) << "Cannot deserialize report";

[estark, 2017/01/13 23:26:22]

Is this possible? maybe should just be
DCHECK(error_report.InitialieFromString(...))?

[meacer, 2017/01/17 22:24:27]

cert_report_helper seemed to imply it was possible, but perhaps that's not true
once it's already serialized. Converted to CHECKs (since DCHECKs would be
compiled out).

+        continue;
+      }
+      error_report.SetIsRetryUpload(true);
+      if (!error_report.Serialize(&report.serialized_report)) {
+        LOG(ERROR) << "Cannot serialize report";
+        continue;
+      }
+    }
+    report.is_retried = true;
     SendInternal(report);
   }
 }
 
 size_t
 CertificateReportingService::Reporter::inflight_report_count_for_testing()
     const {
   return inflight_reports_.size();
 }
 
@@ skipping 183 matching lines @@
 }
 
 void CertificateReportingService::OnPreferenceChanged() {
   safe_browsing::SafeBrowsingService* safe_browsing_service_ =
       g_browser_process->safe_browsing_service();
   const bool enabled = safe_browsing_service_ &&
                        safe_browsing_service_->enabled_by_prefs() &&
                        safe_browsing::IsExtendedReportingEnabled(pref_service_);
   SetEnabled(enabled);
 }