Certificate Transparency: Add UMA for whitelist status

net/cert/cert_policy_enforcer.cc

 // Copyright 2014 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 "net/cert/cert_policy_enforcer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/build_time.h"
@@ skipping 108 matching lines @@
     case CT_ENOUGH_SCTS:
       return "ENOUGH_SCTS";
       break;
     case CT_COMPLIANCE_MAX:
       break;
   }
 
   return "unknown";
 }
 
-void LogCTComplianceStatusToUMA(CTComplianceStatus status) {
+void LogCTComplianceStatusToUMA(CTComplianceStatus status,
+                                bool is_whitelist_valid) {
   UMA_HISTOGRAM_ENUMERATION("Net.SSL_EVCertificateCTCompliance", status,
                             CT_COMPLIANCE_MAX);
+  if (status == CT_NOT_COMPLIANT)
+    UMA_HISTOGRAM_BOOLEAN("Net.SSL_EVWhitelistValidityForNonCompliantCert",
+                          is_whitelist_valid);
 }
 
 struct ComplianceDetails {
   ComplianceDetails()
       : ct_presence_required(false),
         build_timely(false),
         status(CT_NOT_COMPLIANT) {}
 
   // Whether enforcement of the policy was required or not.
   bool ct_presence_required;
@@ skipping 95 matching lines @@
 
   net_log.AddEvent(NetLog::TYPE_EV_CERT_CT_COMPLIANCE_CHECKED,
                    net_log_callback);
 
   if (!details.ct_presence_required)
     return true;
 
   if (!details.build_timely)
     return false;
 
-  LogCTComplianceStatusToUMA(details.status);
+  LogCTComplianceStatusToUMA(details.status,
+                             ev_whitelist ? ev_whitelist->IsValid() : false);

[jwd, 2015/03/09 15:26:41]

I'm concerned about combining the two false conditions here. Are you sure you
wouldn't rather track all three states (has valid, has invalid, doesn't have)
separately?

[Ryan Sleevi, 2015/03/09 21:44:43]

+1

[Eran Messeri, 2015/03/10 21:16:35]

Done - tracking all three states.

 
   if (details.status == CT_IN_WHITELIST || details.status == CT_ENOUGH_SCTS)
     return true;
 
   return false;
 }
 
 }  // namespace net