Encrypt certificate reports before uploading to HTTP URLs

chrome/browser/safe_browsing/ping_manager.cc

Index: chrome/browser/safe_browsing/ping_manager.cc
diff --git a/chrome/browser/safe_browsing/ping_manager.cc b/chrome/browser/safe_browsing/ping_manager.cc
index f8335d748a4872d359d424c926c2ac5cc383921a..3fe6129707f022664f4db538a680a7581fb7e83f 100644
--- a/chrome/browser/safe_browsing/ping_manager.cc
+++ b/chrome/browser/safe_browsing/ping_manager.cc
@@ -24,8 +24,12 @@ using chrome_browser_net::CertificateErrorReporter;
 using content::BrowserThread;
 
 namespace {
-// URL to upload invalid certificate chain reports
-const char kExtendedReportingUploadUrl[] =
+// URLs to upload invalid certificate chain reports. The HTTP URL is
+// preferred since a client seeing an invalid cert might not be able to
+// make an HTTPS connection to report it.
+// TODO(estark): insert the production HTTP URL when it's ready
+const char kExtendedReportingUploadUrlInsecure[] = "";
+const char kExtendedReportingUploadUrlSecure[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/chrome-certs";
 }  // namespace
 
@@ -44,16 +48,21 @@ SafeBrowsingPingManager::SafeBrowsingPingManager(
     const SafeBrowsingProtocolConfig& config)
     : client_name_(config.client_name),
       request_context_getter_(request_context_getter),
-      url_prefix_(config.url_prefix),
-      certificate_error_reporter_(
-          request_context_getter
-              ? new CertificateErrorReporter(
-                    request_context_getter->GetURLRequestContext(),
-                    GURL(kExtendedReportingUploadUrl),
-                    CertificateErrorReporter::SEND_COOKIES)
-              : nullptr) {
+      url_prefix_(config.url_prefix) {
   DCHECK(!url_prefix_.empty());
 
+  if (request_context_getter) {
+    certificate_error_reporter_.reset(new CertificateErrorReporter(
+        request_context_getter->GetURLRequestContext(),
+        (CertificateErrorReporter::IsHttpUploadUrlSupported() &&
+         strlen(kExtendedReportingUploadUrlInsecure) > 0)
+            ? GURL(kExtendedReportingUploadUrlInsecure)
+            : GURL(kExtendedReportingUploadUrlSecure),

[mattm, 2015/04/23 22:59:14]

This condition feels a little large/unwieldy to do inline. I guess it would
probably be more readable split into a separate statement.

[estark, 2015/04/23 23:53:47]

Done.

+        CertificateErrorReporter::SEND_COOKIES));
+  } else {
+    certificate_error_reporter_ = nullptr;

[mattm, 2015/04/23 22:59:14]

unnecessary

[estark, 2015/04/23 23:53:47]

Done.

+  }
+
   version_ = SafeBrowsingProtocolManagerHelper::Version();
 }