diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 22:40:39 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 22:40:39 +0000 |
| commit | 6f3b6aabf5cc7c7a7967688ed245af2c5a1ba279 (patch) | |
| tree | d1a774cde0cd93c0825638584b8af3025eed63a7 | |
| parent | d79a5b62f07114e450202742132b5947a86aacdd (diff) | |
| download | chromium_src-6f3b6aabf5cc7c7a7967688ed245af2c5a1ba279.zip chromium_src-6f3b6aabf5cc7c7a7967688ed245af2c5a1ba279.tar.gz chromium_src-6f3b6aabf5cc7c7a7967688ed245af2c5a1ba279.tar.bz2 | |
Merge 82547 - safebrowsing: Set threat_list for BINARY_MALWARE_HASH ping.BUG=80098TEST=official debug build shouldn't hit DCHECK. pingback content verified with tcpdump.Review URL: http://codereview.chromium.org/6889001
TBR=mattm@chromium.org
Review URL: http://codereview.chromium.org/6880127
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@82566 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/protocol_manager_unittest.cc | 20 |
2 files changed, 24 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index 342b9d6..127bf5c 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -763,7 +763,8 @@ GURL SafeBrowsingProtocolManager::SafeBrowsingHitUrl( SafeBrowsingService::UrlCheckResult threat_type) const { DCHECK(threat_type == SafeBrowsingService::URL_MALWARE || threat_type == SafeBrowsingService::URL_PHISHING || - threat_type == SafeBrowsingService::BINARY_MALWARE_URL); + threat_type == SafeBrowsingService::BINARY_MALWARE_URL || + threat_type == SafeBrowsingService::BINARY_MALWARE_HASH); // The malware and phishing hits go over HTTP. std::string url = ComposeUrl(http_url_prefix_, "report", client_name_, version_, additional_query_); @@ -778,6 +779,9 @@ GURL SafeBrowsingProtocolManager::SafeBrowsingHitUrl( case SafeBrowsingService::BINARY_MALWARE_URL: threat_list = "binurlhit"; break; + case SafeBrowsingService::BINARY_MALWARE_HASH: + threat_list = "binhashhit"; + break; default: NOTREACHED(); } diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc index fc119ff..69bff62 100644 --- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc +++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -218,6 +218,24 @@ TEST_F(SafeBrowsingProtocolManagerTest, TestSafeBrowsingHitUrl) { pm.SafeBrowsingHitUrl( malicious_url, page_url, referrer_url, false, SafeBrowsingService::URL_PHISHING).spec()); + + EXPECT_EQ("http://info.prefix.com/foo/report?client=unittest&appver=1.0&" + "pver=2.2&additional_query&evts=binurlhit&" + "evtd=http%3A%2F%2Fmalicious.url.com%2F&" + "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer." + "url.com%2F&evtb=0", + pm.SafeBrowsingHitUrl( + malicious_url, page_url, referrer_url, + false, SafeBrowsingService::BINARY_MALWARE_URL).spec()); + + EXPECT_EQ("http://info.prefix.com/foo/report?client=unittest&appver=1.0&" + "pver=2.2&additional_query&evts=binhashhit&" + "evtd=http%3A%2F%2Fmalicious.url.com%2F&" + "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer." + "url.com%2F&evtb=0", + pm.SafeBrowsingHitUrl( + malicious_url, page_url, referrer_url, + false, SafeBrowsingService::BINARY_MALWARE_HASH).spec()); } TEST_F(SafeBrowsingProtocolManagerTest, TestMalwareDetailsUrl) { |