Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: chrome/browser/safe_browsing/client_side_detection_service.cc

Issue 42553002: Mostly integrate new malware IP blacklist with the csd client. When (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix leaks in the unit-tests Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/client_side_detection_service.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 46d01450641e7a0e5a3843b5e48a465714007469..d63e45cbfd931b57fd880f4d48c40c168454bbbe 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -206,35 +206,6 @@ bool ClientSideDetectionService::IsPrivateIPAddress(
return false;
}
-bool ClientSideDetectionService::IsBadIpAddress(
- const std::string& ip_address) const {
- net::IPAddressNumber ip_number;
- if (!net::ParseIPLiteralToNumber(ip_address, &ip_number)) {
- VLOG(2) << "Unable to parse IP address: '" << ip_address << "'";
- return false;
- }
- if (ip_number.size() == net::kIPv4AddressSize) {
- ip_number = net::ConvertIPv4NumberToIPv6Number(ip_number);
- }
- if (ip_number.size() != net::kIPv6AddressSize) {
- VLOG(2) << "Unable to convert IPv4 address to IPv6: '" << ip_address << "'";
- return false; // better safe than sorry.
- }
- for (BadSubnetMap::const_iterator it = bad_subnets_.begin();
- it != bad_subnets_.end(); ++it) {
- const std::string& mask = it->first;
- DCHECK_EQ(mask.size(), ip_number.size());
- std::string subnet(net::kIPv6AddressSize, '.');
- for (size_t i = 0; i < net::kIPv6AddressSize; ++i) {
- subnet[i] = ip_number[i] & mask[i];
- }
- if (it->second.count(crypto::SHA256HashString(subnet)) > 0) {
- return true;
- }
- }
- return false;
-}
-
void ClientSideDetectionService::OnURLFetchComplete(
const net::URLFetcher* source) {
std::string data;

Powered by Google App Engine
This is Rietveld 408576698