Include unverified server-sent cert chain in reports

chrome/browser/ssl/certificate_error_report.cc

 // Copyright 2015 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/ssl/certificate_error_report.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/time/time.h"
@@ skipping 30 matching lines @@
   if (cert_status & net::CERT_STATUS_DATE_INVALID)
     report->add_cert_error(CertLoggerRequest::ERR_CERT_DATE_INVALID);
   if (cert_status & net::CERT_STATUS_VALIDITY_TOO_LONG)
     report->add_cert_error(CertLoggerRequest::ERR_CERT_VALIDITY_TOO_LONG);
   if (cert_status & net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION)
     report->add_cert_error(
         CertLoggerRequest::ERR_CERT_UNABLE_TO_CHECK_REVOCATION);
   if (cert_status & net::CERT_STATUS_NO_REVOCATION_MECHANISM)
     report->add_cert_error(CertLoggerRequest::ERR_CERT_NO_REVOCATION_MECHANISM);
 }
+
+bool CertificateChainToString(scoped_refptr<net::X509Certificate> cert,
+                              std::string* result) {
+  std::vector<std::string> pem_encoded_chain;
+  if (!cert->GetPEMEncodedChain(&pem_encoded_chain))
+    return false;
+
+  for (size_t i = 0; i < pem_encoded_chain.size(); ++i)

[meacer, 2015/06/15 19:57:20]

You can use C++11 style for loop here:

for (const string& pem: pem_encoded_chain)
  result->append(pem);

Or directly use JoinString from string_util.

[estark, 2015/06/15 20:47:37]

Done. (JoinString)

+    result->append(pem_encoded_chain[i]);
+
+  return true;
+}
+
 }  // namespace
 
 CertificateErrorReport::CertificateErrorReport()
     : cert_report_(new CertLoggerRequest()) {
 }
 
 CertificateErrorReport::CertificateErrorReport(const std::string& hostname,
                                                const net::SSLInfo& ssl_info)
     : cert_report_(new CertLoggerRequest()) {
   base::Time now = base::Time::Now();
   cert_report_->set_time_usec(now.ToInternalValue());
   cert_report_->set_hostname(hostname);
 
-  std::vector<std::string> pem_encoded_chain;
-  if (!ssl_info.cert->GetPEMEncodedChain(&pem_encoded_chain)) {
+  if (!CertificateChainToString(ssl_info.cert,
+                                cert_report_->mutable_cert_chain()))
     LOG(ERROR) << "Could not get PEM encoded chain.";

[meacer, 2015/06/15 19:57:20]

Wrap this statement with braces since |if| spans two lines.

[estark, 2015/06/15 20:47:37]

Done.

+
+  if (ssl_info.unverified_cert &&
+      !CertificateChainToString(
+          ssl_info.unverified_cert,
+          cert_report_->mutable_unverified_cert_chain())) {
+    LOG(ERROR) << "Could not get PEM encoded unverified certificate chain.";
   }
 
-  std::string* cert_chain = cert_report_->mutable_cert_chain();
-  for (size_t i = 0; i < pem_encoded_chain.size(); ++i)
-    cert_chain->append(pem_encoded_chain[i]);
-
   cert_report_->add_pin(ssl_info.pinning_failure_log);
 
   AddCertStatusToReportErrors(ssl_info.cert_status, cert_report_.get());
 }
 
 CertificateErrorReport::~CertificateErrorReport() {
 }
 
 bool CertificateErrorReport::InitializeFromString(
     const std::string& serialized_report) {
@@ skipping 26 matching lines @@
       break;
   }
 
   interstitial_info->set_user_proceeded(proceed_decision == USER_PROCEEDED);
   interstitial_info->set_overridable(overridable == INTERSTITIAL_OVERRIDABLE);
 }
 
 const std::string& CertificateErrorReport::hostname() const {
   return cert_report_->hostname();
 }