Support new Safe Browsing list "goog-badresource-shavar" in SafeBrowsingDatabase.

chrome/browser/safe_browsing/safe_browsing_database_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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/chunk.pb.h"
 #include "chrome/browser/safe_browsing/safe_browsing_store_file.h"
 #include "crypto/sha2.h"
 #include "net/base/ip_address_number.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "url/gurl.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace safe_browsing {
 
 namespace {
@@ skipping 238 matching lines @@
     SafeBrowsingStoreFile* download_whitelist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* inclusion_whitelist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* extension_blacklist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* ip_blacklist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* unwanted_software_store =
         new SafeBrowsingStoreFile(task_runner_);
+    SafeBrowsingStoreFile* resource_blacklist_store =
+        new SafeBrowsingStoreFile(task_runner_);
     database_.reset(new SafeBrowsingDatabaseNew(
         task_runner_, browse_store, download_store, csd_whitelist_store,
         download_whitelist_store, inclusion_whitelist_store,
         extension_blacklist_store, ip_blacklist_store,
-        unwanted_software_store));
+        unwanted_software_store, resource_blacklist_store));
     database_->Init(database_filename_);
   }
 
   bool ContainsDownloadUrl(const std::vector<GURL>& urls,
                            std::vector<SBPrefix>* prefix_hits) {
     std::vector<SBPrefix> prefixes;
     SafeBrowsingDatabase::GetDownloadUrlPrefixes(urls, &prefixes);
     return database_->ContainsDownloadUrlPrefixes(prefixes, prefix_hits);
   }
 
+  bool ContainsResourceUrl(const GURL& url,
+                           std::vector<SBPrefix>* prefix_hits) {
+    std::vector<SBFullHash> full_hashes;
+    UrlToFullHashes(url, false, &full_hashes);
+    std::vector<SBPrefix> prefixes(full_hashes.size());
+    for (size_t i = 0; i < full_hashes.size(); ++i)
+      prefixes[i] = full_hashes[i].prefix;
+    return database_->ContainsResourceUrlPrefixes(prefixes, prefix_hits);
+  }
+
   void GetListsInfo(std::vector<SBListChunkRanges>* lists) {
     lists->clear();
     ASSERT_TRUE(database_->UpdateStarted(lists));
     database_->UpdateFinished(true);
   }
 
   // Helper function to do an AddDel or SubDel command.
   void DelChunk(const std::string& list,
                 int chunk_id,
                 bool is_sub_del) {
@@ skipping 125 matching lines @@
                           chunks);
 
   chunks.clear();
   chunks.push_back(AddChunkHashedIpValue(10, "::ffff:192.168.1.0", 120));
   database_->InsertChunks(kIPBlacklist, chunks);
 
   chunks.clear();
   chunks.push_back(AddChunkPrefixValue(11, "www.unwanted.com/software.html"));
   database_->InsertChunks(kUnwantedUrlList, chunks);
 
+  chunks.clear();
+  chunks.push_back(AddChunkPrefixValue(12, "foo.com/script.js"));
+  database_->InsertChunks(kResourceBlacklist, chunks);
+
   database_->UpdateFinished(true);
 
   GetListsInfo(&lists);
-  ASSERT_EQ(9U, lists.size());
+  ASSERT_EQ(10U, lists.size());
   EXPECT_EQ(kMalwareList, lists[0].name);
   EXPECT_EQ("1", lists[0].adds);
   EXPECT_TRUE(lists[0].subs.empty());
   EXPECT_EQ(kPhishingList, lists[1].name);
   EXPECT_EQ("2", lists[1].adds);
   EXPECT_TRUE(lists[1].subs.empty());
   EXPECT_EQ(kBinUrlList, lists[2].name);
   EXPECT_EQ("3", lists[2].adds);
   EXPECT_TRUE(lists[2].subs.empty());
   EXPECT_EQ(kCsdWhiteList, lists[3].name);
   EXPECT_EQ("5", lists[3].adds);
   EXPECT_TRUE(lists[3].subs.empty());
   EXPECT_EQ(kDownloadWhiteList, lists[4].name);
   EXPECT_EQ("6", lists[4].adds);
   EXPECT_TRUE(lists[4].subs.empty());
   EXPECT_EQ(kInclusionWhitelist, lists[5].name);
   EXPECT_EQ("7", lists[5].adds);
   EXPECT_TRUE(lists[5].subs.empty());
   EXPECT_EQ(kExtensionBlacklist, lists[6].name);
   EXPECT_EQ("8", lists[6].adds);
   EXPECT_TRUE(lists[6].subs.empty());
   EXPECT_EQ(kIPBlacklist, lists[7].name);
   EXPECT_EQ("10", lists[7].adds);
   EXPECT_TRUE(lists[7].subs.empty());
   EXPECT_EQ(kUnwantedUrlList, lists[8].name);
   EXPECT_EQ("11", lists[8].adds);
   EXPECT_TRUE(lists[8].subs.empty());
+  EXPECT_EQ(kResourceBlacklist, lists[9].name);
+  EXPECT_EQ("12", lists[9].adds);
+  EXPECT_TRUE(lists[9].subs.empty());
 
   database_.reset();
 }
 
 // Checks database reading and writing for browse and unwanted PrefixSets.
 TEST_F(SafeBrowsingDatabaseTest, BrowseAndUnwantedDatabasesAndPrefixSets) {
 
   struct TestCase {
     using TestListContainsBadUrl = bool (SafeBrowsingDatabase::*)(
         const GURL& url,
@@ skipping 662 matching lines @@
 // TODO(shess): Disabled until ScopedLogMessageIgnorer resolved.
 // http://crbug.com/56448
 TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
   // Re-create the database in a captive message loop so that we can
   // influence task-posting.  Database specifically needs to the
   // file-backed.
   database_.reset();
   base::MessageLoop loop;
   SafeBrowsingStoreFile* store = new SafeBrowsingStoreFile(task_runner_);
   database_.reset(new SafeBrowsingDatabaseNew(
-      task_runner_, store, NULL, NULL, NULL, NULL, NULL, NULL, NULL));
+      task_runner_, store, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL));
   database_->Init(database_filename_);
 
   // This will cause an empty database to be created.
   std::vector<SBListChunkRanges> lists;
   ASSERT_TRUE(database_->UpdateStarted(&lists));
   database_->UpdateFinished(true);
 
   // Create a sub chunk to insert.
   std::vector<scoped_ptr<SBChunkData>> chunks;
   chunks.push_back(SubChunkPrefixValue(7,
@@ skipping 120 matching lines @@
   urls.clear();
   urls.push_back(GURL(std::string("http://") + kEvil1Url1));
   urls.push_back(GURL(std::string("https://") + kEvil1Url2));
   EXPECT_TRUE(ContainsDownloadUrl(urls, &prefix_hits));
   ASSERT_EQ(2U, prefix_hits.size());
   EXPECT_EQ(SBPrefixForString(kEvil1Url1), prefix_hits[0]);
   EXPECT_EQ(SBPrefixForString(kEvil1Url2), prefix_hits[1]);
   database_.reset();
 }
 
+TEST_F(SafeBrowsingDatabaseTest, ContainsResourceUrlPrefixes) {
+  const char* kBadUrl1 = "bad1.com/";
+  const char* kBadUrl2 = "bad2.com/script.js";
+  const SBPrefix kBadPrefix1 = SBPrefixForString(kBadUrl1);
+  const SBPrefix kBadPrefix2 = SBPrefixForString(kBadUrl2);
+
+  // Populate database
+  std::vector<scoped_ptr<SBChunkData>> chunks;
+  chunks.push_back(AddChunkPrefix2Value(1, kBadUrl1, kBadUrl2));
+
+  std::vector<SBListChunkRanges> lists;
+  ASSERT_TRUE(database_->UpdateStarted(&lists));
+  database_->InsertChunks(kResourceBlacklist, chunks);
+  database_->UpdateFinished(true);
+
+  struct {
+    std::string url;
+    bool found_in_db;
+    std::vector<SBPrefix> prefix_hits;
+  } test_cases[] = {
+    {std::string("http://") + kBadUrl1, true, {kBadPrefix1}},
+    {std::string("https://") + kBadUrl2, true, {kBadPrefix2}},
+    {std::string("ftp://") + kBadUrl1, true, {kBadPrefix1}},
+    {std::string("http://") + kBadUrl1 + "a/b/?arg=value", true, {kBadPrefix1}},
+    {std::string("http://") + kBadUrl1 + "script.js", true, {kBadPrefix1}},
+    {std::string("http://www.domain.") + kBadUrl2, true, {kBadPrefix2}},
+    {"http://www.good.org/script.js", false, std::vector<SBPrefix>()},
+  };
+
+  std::vector<SBPrefix> prefix_hits;
+  for (const auto& test_case : test_cases) {
+    EXPECT_EQ(test_case.found_in_db,
+              ContainsResourceUrl(GURL(test_case.url), &prefix_hits));
+    EXPECT_THAT(prefix_hits, testing::ElementsAreArray(test_case.prefix_hits));
+  }
+
+  database_.reset();
+}
+
 // Checks that the whitelists are handled properly.
 TEST_F(SafeBrowsingDatabaseTest, Whitelists) {
   struct TestCase {
     using TestListContainsWhitelistedUrl =
         bool (SafeBrowsingDatabase::*)(const GURL& url);
     using TestListContainsWhitelistedString =
         bool (SafeBrowsingDatabase::*)(const std::string& str);
 
     // Returns true if strings should be tested in this test case (i.e.
     // |test_list_contains_whitelisted_string| is not null).
@@ skipping 14 matching lines @@
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedUrl,
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedString},
       {kInclusionWhitelist,
        &SafeBrowsingDatabase::ContainsInclusionWhitelistedUrl,
        nullptr},
   };
 
   // If the whitelist is disabled everything should match the whitelist.
   database_.reset(new SafeBrowsingDatabaseNew(
       task_runner_, new SafeBrowsingStoreFile(task_runner_), NULL, NULL, NULL,
-      NULL, NULL, NULL, NULL));
+      NULL, NULL, NULL, NULL, NULL));
   database_->Init(database_filename_);
   for (const auto& test_case : kTestCases) {
     SCOPED_TRACE(std::string("Tested list at fault => ") +
                  test_case.test_list_name);
 
     EXPECT_TRUE(
         (database_.get()->*test_case.test_list_contains_whitelisted_url)(
             GURL(std::string("http://www.phishing.com/"))));
     if (test_case.TestStrings()) {
       EXPECT_TRUE(
@@ skipping 935 matching lines @@
   ASSERT_EQ(1U, prefix_hits.size());
   EXPECT_EQ(SBPrefixForString(kExampleCollision), prefix_hits[0]);
   EXPECT_TRUE(cache_hits.empty());
 
   // This prefix collides, but no full hash match.
   EXPECT_FALSE(database_->ContainsBrowseUrl(
       GURL(std::string("http://") + kExampleFine), &prefix_hits, &cache_hits));
 }
 
 }  // namespace safe_browsing