Add effective-expiration-date to Expect-CT reports

chrome/browser/ssl/chrome_expect_ct_reporter.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/ssl/chrome_expect_ct_reporter.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 132 matching lines @@
 ChromeExpectCTReporter::ChromeExpectCTReporter(
     net::URLRequestContext* request_context)
     : report_sender_(
           new net::ReportSender(request_context, kTrafficAnnotation)) {}
 
 ChromeExpectCTReporter::~ChromeExpectCTReporter() {}
 
 void ChromeExpectCTReporter::OnExpectCTFailed(
     const net::HostPortPair& host_port_pair,
     const GURL& report_uri,
+    base::Time expiration,
     const net::X509Certificate* validated_certificate_chain,
     const net::X509Certificate* served_certificate_chain,
     const net::SignedCertificateTimestampAndStatusList&
         signed_certificate_timestamps) {
   if (report_uri.is_empty())
     return;
 
   if (!base::FeatureList::IsEnabled(features::kExpectCTReporting))
     return;
 
-  // TODO(estark): De-duplicate reports so that the same report isn't
-  // sent too often in some period of time.
-
   base::DictionaryValue report;
   report.SetString("hostname", host_port_pair.host());
   report.SetInteger("port", host_port_pair.port());
   report.SetString("date-time", TimeToISO8601(base::Time::Now()));
+  report.SetString("effective-expiration-date", TimeToISO8601(expiration));
   report.Set("served-certificate-chain",
              GetPEMEncodedChainAsList(served_certificate_chain));
   report.Set("validated-certificate-chain",
              GetPEMEncodedChainAsList(validated_certificate_chain));
 
   std::unique_ptr<base::ListValue> unknown_scts(new base::ListValue());
   std::unique_ptr<base::ListValue> invalid_scts(new base::ListValue());
   std::unique_ptr<base::ListValue> valid_scts(new base::ListValue());
 
   for (const auto& sct_and_status : signed_certificate_timestamps) {
@@ skipping 22 matching lines @@
     LOG(ERROR) << "Failed to serialize Expect CT report";
     return;
   }
 
   UMA_HISTOGRAM_BOOLEAN("SSL.ExpectCTReportSendingAttempt", true);
 
   report_sender_->Send(report_uri, "application/json; charset=utf-8",
                        serialized_report, base::Callback<void()>(),
                        base::Bind(RecordUMAOnFailure));
 }