Refactor ChromeFraudulentCertReporter for code reuse by SSL reporting

chrome/browser/net/chrome_fraudulent_certificate_reporter.cc

Index: chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
index d5584938a7fe8e07f83636351ca752d4a03eda1a..0e0058b0b0fd52b69eeccb38d936ccc5021bc5bd 100644
--- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
+++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
@@ -4,19 +4,8 @@
 
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 
-#include <set>
-
-#include "base/base64.h"
-#include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
-#include "base/stl_util.h"
-#include "base/time/time.h"
-#include "chrome/browser/net/cert_logger.pb.h"
-#include "net/base/elements_upload_data_stream.h"
-#include "net/base/load_flags.h"
-#include "net/base/request_priority.h"
-#include "net/base/upload_bytes_element_reader.h"
-#include "net/cert/x509_certificate.h"
+#include "chrome/browser/net/certificate_error_reporter.h"
 #include "net/ssl/ssl_info.h"
 #include "net/url_request/url_request_context.h"
 
@@ -24,111 +13,32 @@ namespace chrome_browser_net {
 
 // TODO(palmer): Switch to HTTPS when the error handling delegate is more
 // sophisticated. Ultimately we plan to attempt the report on many transports.
-static const char kFraudulentCertificateUploadEndpoint[] =
+const char kFraudulentCertificateUploadEndpoint[] =
     "http://clients3.google.com/log_cert_error";
 
 ChromeFraudulentCertificateReporter::ChromeFraudulentCertificateReporter(
     net::URLRequestContext* request_context)
-    : request_context_(request_context),
-      upload_url_(kFraudulentCertificateUploadEndpoint) {
-}
-
-ChromeFraudulentCertificateReporter::~ChromeFraudulentCertificateReporter() {
-  STLDeleteElements(&inflight_requests_);
-}
-
-static std::string BuildReport(const std::string& hostname,
-                               const net::SSLInfo& ssl_info) {
-  CertLoggerRequest request;
-  base::Time now = base::Time::Now();
-  request.set_time_usec(now.ToInternalValue());
-  request.set_hostname(hostname);
-
-  std::vector<std::string> pem_encoded_chain;
-  if (!ssl_info.cert->GetPEMEncodedChain(&pem_encoded_chain)) {
-    LOG(ERROR) << "Could not get PEM encoded chain.";
-  }
-  std::string* cert_chain = request.mutable_cert_chain();
-  for (size_t i = 0; i < pem_encoded_chain.size(); ++i)
-    *cert_chain += pem_encoded_chain[i];
-
-  request.add_pin(ssl_info.pinning_failure_log);
-
-  std::string out;
-  request.SerializeToString(&out);
-  return out;
+    : certificate_reporter_(new CertificateErrorReporter(
+          request_context,
+          GURL(kFraudulentCertificateUploadEndpoint))) {

[Ryan Sleevi, 2015/03/06 21:32:47]

You should explicitly include GURL's header

[estark, 2015/03/07 00:38:50]

Done.

 }
 
-scoped_ptr<net::URLRequest>
-ChromeFraudulentCertificateReporter::CreateURLRequest(
-    net::URLRequestContext* context) {
-  scoped_ptr<net::URLRequest> request =
-      context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this, NULL);
-  request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                        net::LOAD_DO_NOT_SAVE_COOKIES);
-  return request.Pass();
+ChromeFraudulentCertificateReporter::ChromeFraudulentCertificateReporter(
+    scoped_ptr<CertificateErrorReporter> certificate_reporter)
+    : certificate_reporter_(certificate_reporter.Pass()) {
 }
 
 void ChromeFraudulentCertificateReporter::SendReport(
     const std::string& hostname,
     const net::SSLInfo& ssl_info) {
-  // We do silent/automatic reporting ONLY for Google properties. For other
-  // domains (when we start supporting that), we will ask for user permission.
-  if (!net::TransportSecurityState::IsGooglePinnedProperty(hostname)) {
+  // Do silent/automatic reporting ONLY for Google properties. For other
+  // domains (when that is supported), Chrome will ask for user permission.
+  if (!net::TransportSecurityState::IsGooglePinnedProperty(hostname))
     return;
-  }
-
-  std::string report = BuildReport(hostname, ssl_info);
 
-  scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_);
-  url_request->set_method("POST");
-
-  scoped_ptr<net::UploadElementReader> reader(
-      net::UploadOwnedBytesElementReader::CreateWithString(report));
-  url_request->set_upload(
-      net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
-
-  net::HttpRequestHeaders headers;
-  headers.SetHeader(net::HttpRequestHeaders::kContentType,
-                    "x-application/chrome-fraudulent-cert-report");
-  url_request->SetExtraRequestHeaders(headers);
-
-  net::URLRequest* raw_url_request = url_request.get();
-  inflight_requests_.insert(url_request.release());
-  raw_url_request->Start();
-}
-
-void ChromeFraudulentCertificateReporter::RequestComplete(
-    net::URLRequest* request) {
-  std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request);
-  DCHECK(i != inflight_requests_.end());
-  scoped_ptr<net::URLRequest> url_request(*i);
-  inflight_requests_.erase(i);
+  certificate_reporter_->SendReport(
+      CertificateErrorReporter::REPORT_TYPE_PINNING_VIOLATION, hostname,
+      ssl_info);
 }
 
-// TODO(palmer): Currently, the upload is fire-and-forget but soon we will
-// try to recover by retrying, and trying different endpoints, and
-// appealing to the user.
-void ChromeFraudulentCertificateReporter::OnResponseStarted(
-    net::URLRequest* request) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ChromeFraudulentCertificateReporter::OnResponseStarted"));
-
-  const net::URLRequestStatus& status(request->status());
-  if (!status.is_success()) {
-    LOG(WARNING) << "Certificate upload failed"
-                 << " status:" << status.status()
-                 << " error:" << status.error();
-  } else if (request->GetResponseCode() != 200) {
-    LOG(WARNING) << "Certificate upload HTTP status: "
-                 << request->GetResponseCode();
-  }
-  RequestComplete(request);
-}
-
-void ChromeFraudulentCertificateReporter::OnReadCompleted(
-    net::URLRequest* request, int bytes_read) {}
-
 }  // namespace chrome_browser_net