Add interstitial info to certificate reports

chrome/browser/safe_browsing/ui_manager.cc

 // Copyright (c) 2012 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/safe_browsing/ui_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/debug/leak_tracker.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/net/cert_logger.pb.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/metadata.pb.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/url_constants.h"
 #include "components/metrics/metrics_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 182 matching lines @@
     return;
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread, this,
                  malicious_url, page_url, referrer_url, is_subresource,
                  threat_type, post_data));
 }
 
 void SafeBrowsingUIManager::ReportInvalidCertificateChain(
-    const std::string& hostname,
-    const net::SSLInfo& ssl_info,
+    const chrome_browser_net::CertLoggerRequest& report,
     const base::Closure& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTaskAndReply(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &SafeBrowsingUIManager::ReportInvalidCertificateChainOnIOThread, this,
-          hostname, ssl_info),
+          report),
       callback);
 }
 
 void SafeBrowsingUIManager::AddObserver(Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_list_.AddObserver(observer);
 }
 
 void SafeBrowsingUIManager::RemoveObserver(Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 17 matching lines @@
   DVLOG(1) << "ReportSafeBrowsingHit: " << malicious_url << " " << page_url
            << " " << referrer_url << " " << is_subresource << " "
            << threat_type;
   sb_service_->ping_manager()->ReportSafeBrowsingHit(
       malicious_url, page_url,
       referrer_url, is_subresource,
       threat_type, post_data);
 }
 
 void SafeBrowsingUIManager::ReportInvalidCertificateChainOnIOThread(
-    const std::string& hostname,
-    const net::SSLInfo& ssl_info) {
+    const chrome_browser_net::CertLoggerRequest& report) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // The service may delete the ping manager (i.e. when user disabling service,
   // etc). This happens on the IO thread.
   if (!sb_service_ || !sb_service_->ping_manager())
     return;
 
-  sb_service_->ping_manager()->ReportInvalidCertificateChain(hostname,
-                                                             ssl_info);
+  sb_service_->ping_manager()->ReportInvalidCertificateChain(report);
 }
 
 // If the user had opted-in to send MalwareDetails, this gets called
 // when the report is ready.
 void SafeBrowsingUIManager::SendSerializedMalwareDetails(
     const std::string& serialized) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // The service may delete the ping manager (i.e. when user disabling service,
   // etc). This happens on the IO thread.
@@ skipping 41 matching lines @@
          (entry.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL &&
           resource.threat_type == SB_THREAT_TYPE_URL_MALWARE))) {
       return entry.domain ==
           net::registry_controlled_domains::GetDomainAndRegistry(
               resource.url,
               net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
     }
   }
   return false;
 }