Mostly integrate new malware IP blacklist with the csd client. When

chrome/browser/safe_browsing/client_side_detection_service_unittest.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 <map>
 #include <queue>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 554 matching lines @@
 
   mask = std::string(16, '\xFF');
   EXPECT_TRUE(bad_subnets.count(mask));
   EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, '.')));
 
   mask = std::string(12, '\xFF') + "\xF0" + std::string(3, '\x00');
   EXPECT_TRUE(bad_subnets.count(mask));
   EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, '.')));
 }
 
-TEST_F(ClientSideDetectionServiceTest, IsBadIpAddress) {
-  ClientSideModel model;
-  // IPv6 exact match for: 2620:0:1000:3103:21a:a0ff:fe10:786e.
-  ClientSideModel::IPSubnet* subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\x26\x20\x00\x00\x10\x00\x31\x03\x02\x1a\xa0\xff\xfe\x10\x78\x6e", 16)));
-  subnet->set_size(128);
-
-  // IPv6 prefix match for: fe80::21a:a0ff:fe10:786e/64.
-  subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)));
-  subnet->set_size(64);
-
-  // IPv4 exact match for ::ffff:192.0.2.128.
-  subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xc0\x00\x02\x80", 16)));
-  subnet->set_size(128);
-
-  // IPv4 prefix match (/8) for ::ffff:192.1.1.0.
-  subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xc0\x01\x01\x00", 16)));
-  subnet->set_size(120);
-
-  // IPv4 prefix match (/9) for ::ffff:192.1.122.0.
-  subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xc0\x01\x7a\x00", 16)));
-  subnet->set_size(119);
-
-  // IPv4 prefix match (/15) for ::ffff:192.1.128.0.
-  subnet = model.add_bad_subnet();
-  subnet->set_prefix(crypto::SHA256HashString(std::string(
-      "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xc0\x01\x80\x00", 16)));
-  subnet->set_size(113);
-
-  csd_service_.reset(ClientSideDetectionService::Create(NULL));
-  ClientSideDetectionService::SetBadSubnets(
-      model, &(csd_service_->bad_subnets_));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("blabla"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress(std::string()));
-
-  EXPECT_TRUE(csd_service_->IsBadIpAddress(
-      "2620:0:1000:3103:21a:a0ff:fe10:786e"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress(
-      "2620:0:1000:3103:21a:a0ff:fe10:786f"));
-
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("fe80::21a:a0ff:fe10:786e"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("fe80::31a:a0ff:fe10:786e"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("fe80::21a:a0ff:fe10:786f"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("fe81::21a:a0ff:fe10:786e"));
-
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.0.2.128"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("::ffff:192.0.2.128"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("192.0.2.129"));
-
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.1.0"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.1.255"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.1.10"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("::ffff:192.1.1.2"));
-
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("192.1.121.255"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.122.0"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("::ffff:192.1.122.1"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.122.255"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.123.0"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.123.255"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("192.1.124.0"));
-
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("192.1.127.255"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.128.0"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("::ffff:192.1.128.1"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.128.255"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.255.0"));
-  EXPECT_TRUE(csd_service_->IsBadIpAddress("192.1.255.255"));
-  EXPECT_FALSE(csd_service_->IsBadIpAddress("192.2.0.0"));

[mattm, 2013/10/25 06:28:12]

did all of this get put somewhere in the new impl?

[noé, 2013/10/28 23:39:26]

I did and made them even better :-).

-}
-
 TEST_F(ClientSideDetectionServiceTest, ModelHasValidHashIds) {
   ClientSideModel model;
   EXPECT_TRUE(ClientSideDetectionService::ModelHasValidHashIds(model));
   model.add_hashes("bla");
   EXPECT_TRUE(ClientSideDetectionService::ModelHasValidHashIds(model));
   model.add_page_term(0);
   EXPECT_TRUE(ClientSideDetectionService::ModelHasValidHashIds(model));
 
   model.add_page_term(-1);
   EXPECT_FALSE(ClientSideDetectionService::ModelHasValidHashIds(model));
@@ skipping 84 matching lines @@
   EXPECT_CALL(*service, ScheduleFetchModel(_))
       .WillOnce(Invoke(service, &MockClientSideDetectionService::Schedule));
   EXPECT_CALL(*service, EndFetchModel(
       ClientSideDetectionService::MODEL_NOT_CHANGED))
       .WillOnce(Invoke(service, &MockClientSideDetectionService::Disable));
   csd_service_->SetEnabledAndRefreshState(true);
   EXPECT_FALSE(SendClientReportPhishingRequest(GURL("http://a.com/"), 0.4f));
   Mock::VerifyAndClearExpectations(service);
 }
 }  // namespace safe_browsing