Store and return urls instead of hosts for the malware IP matching.

chrome/browser/safe_browsing/browser_feature_extractor.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/browser_feature_extractor.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "content/public/common/page_transition_types.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace safe_browsing {
 
+const int BrowserFeatureExtractor::kMaxMalwareIPPerRequest = 5;
+
 BrowseInfo::BrowseInfo() : http_status_code(0) {}
 
 BrowseInfo::~BrowseInfo() {}
 
 static void AddFeature(const std::string& feature_name,
                        double feature_value,
                        ClientPhishingRequest* request) {
   DCHECK(request);
   ClientPhishingRequest::Feature* feature =
       request->add_non_model_feature_map();
@@ skipping 179 matching lines @@
                  weak_factory_.GetWeakPtr(), request, callback));
 }
 
 void BrowserFeatureExtractor::ExtractMalwareFeatures(
     const BrowseInfo* info,
     ClientMalwareRequest* request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   DCHECK(info);
   DCHECK_EQ(0U, request->url().find("http:"));
-  // get the IPs and hosts that match the malware blacklisted IP list.
+  // get the IPs and urls that match the malware blacklisted IP list.
   if (service_) {
-    for (IPHostMap::const_iterator it = info->ips.begin();
+    int matched_badip = 0;

[mattm, 2013/07/31 01:21:41]

matched_bad_ips

[kewang, 2013/07/31 20:40:32]

Done.

+    for (IPUrlMap::const_iterator it = info->ips.begin();
          it != info->ips.end(); ++it) {
       if (service_->IsBadIpAddress(it->first)) {
         AddMalwareFeature(features::kBadIpFetch + it->first,
                           it->second, 1.0, request);
+        ++matched_badip;
+        // Limit the number of matched bad IPs in one request to control
+        // the request's size
+        if (matched_badip >= kMaxMalwareIPPerRequest) {
+          return;
+        }
       }
     }
   }
 }
 
 void BrowserFeatureExtractor::ExtractBrowseInfoFeatures(
     const BrowseInfo& info,
     ClientPhishingRequest* request) {
   if (service_) {
-    for (IPHostMap::const_iterator it = info.ips.begin();
+    for (IPUrlMap::const_iterator it = info.ips.begin();
          it != info.ips.end(); ++it) {
       if (service_->IsBadIpAddress(it->first)) {
         AddFeature(features::kBadIpFetch + it->first, 1.0, request);
       }
     }
   }
   if (info.unsafe_resource.get()) {
     // A SafeBrowsing interstitial was shown for the current URL.
     AddFeature(features::kSafeBrowsingMaliciousUrl +
                info.unsafe_resource->url.spec(),
@@ skipping 216 matching lines @@
                                                     Profile::EXPLICIT_ACCESS);
     if (*history) {
       return true;
     }
   }
   VLOG(2) << "Unable to query history.  No history service available.";
   return false;
 }
 
 }  // namespace safe_browsing