Certificate Transparency: Logging SCTs to the NetLog.

net/cert/multi_log_ct_verifier.cc

Index: net/cert/multi_log_ct_verifier.cc
diff --git a/net/cert/multi_log_ct_verifier.cc b/net/cert/multi_log_ct_verifier.cc
index e88c21946bbe4404864f4f31fbfeb9e80c3a28ae..1727f7a72dc1cabed03196e973d436a8d44160d1 100644
--- a/net/cert/multi_log_ct_verifier.cc
+++ b/net/cert/multi_log_ct_verifier.cc
@@ -4,10 +4,14 @@
 
 #include "net/cert/multi_log_ct_verifier.h"
 
+#include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_log.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_objects_extractor.h"
 #include "net/cert/ct_serialization.h"
+#include "net/cert/ct_signed_certificate_timestamp_log_param.h"
 #include "net/cert/ct_verify_result.h"
 #include "net/cert/x509_certificate.h"
 
@@ -30,7 +34,8 @@ int MultiLogCTVerifier::Verify(
     X509Certificate* cert,
     const std::string& sct_list_from_ocsp,
     const std::string& sct_list_from_tls_extension,
-    ct::CTVerifyResult* result)  {
+    ct::CTVerifyResult* result,
+    const BoundNetLog& net_log)  {
   DCHECK(cert);
   DCHECK(result);
 
@@ -59,6 +64,16 @@ int MultiLogCTVerifier::Verify(
             result);
   }
 
+  // Log to Net Log here, after extracting embedded SCTs but before
+  // possibly failing on X.509 entry creation.
+  NetLog::ParametersCallback net_log_callback =
+    base::Bind(&NetLogRawSignedCertificateTimestampCallback,

[eroman, 2013/11/27 20:39:55]

[optional] I suggest inlining this into the AddEvent() call.

[Eran M. (Google), 2013/11/27 22:08:50]

With bound callbacks I find it slightly clearer to define the callback first
(makes errors less harrowing as well). Seems to be the convention in this file,
also.

+        &embedded_scts, &sct_list_from_ocsp, &sct_list_from_tls_extension);
+
+  net_log.AddEvent(
+      NetLog::TYPE_SSL_SIGNED_CERTIFICATE_TIMESTAMPS_RECEIVED,
+      net_log_callback);
+
   ct::LogEntry x509_entry;
   if (!ct::GetX509LogEntry(cert->os_cert_handle(), &x509_entry))
     return has_verified_scts ? OK : ERR_CT_LOG_ENTRY_CREATION_FAILED;