Safebrowsing: Honor the metadata from malware fullhash results in SB API 3.0.

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/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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 62 matching lines @@
           FROM_HERE,
           base::Bind(&SafeBrowsingUIManager::UpdateWhitelist, this, resource));
     }
   }
 }
 
 void SafeBrowsingUIManager::DisplayBlockingPage(
     const UnsafeResource& resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  if (!resource.threat_metadata.empty() &&
+      resource.threat_type == SB_THREAT_TYPE_URL_MALWARE) {
+    safe_browsing::MalwarePatternType proto;
+    // Malware sites tagged as "landing site" should only show a warning for a
+    // main-frame or sub-frame resource. (See "Types of Malware sites" under
+    // https://developers.google.com/safe-browsing/developers_guide_v3#UserWarnings)
+    if (proto.ParseFromString(resource.threat_metadata) &&
+        proto.pattern_type() == safe_browsing::MalwarePatternType::LANDING &&
+        resource.is_subresource && !resource.is_subframe) {
+      if (!resource.callback.is_null()) {
+        BrowserThread::PostTask(
+            BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
+      }
+      return;
+    }
+  }
+
   // Indicate to interested observers that the resource in question matched the
   // SB filters. If the resource is already whitelisted, OnSafeBrowsingHit
   // won't be called.
   if (resource.threat_type != SB_THREAT_TYPE_SAFE) {
     FOR_EACH_OBSERVER(Observer, observer_list_, OnSafeBrowsingMatch(resource));
   }
 
   // Check if the user has already ignored our warning for this render_view
   // and domain.
   if (IsWhitelisted(resource)) {
@@ skipping 157 matching lines @@
           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;
 }