PVer4: Test checksum on startup outside the hotpath of DB load

components/safe_browsing_db/v4_database_unittest.cc

 // Copyright 2016 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 "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/safe_browsing_db/v4_database.h"
 #include "components/safe_browsing_db/v4_store.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/platform_test.h"
 
 namespace safe_browsing {
 
 class FakeV4Store : public V4Store {
  public:
   FakeV4Store(const scoped_refptr<base::SequencedTaskRunner>& task_runner,
               const base::FilePath& store_path,
-              const bool reset_succeeds,
               const bool hash_prefix_matches)
       : V4Store(
             task_runner,
             base::FilePath(store_path.value() + FILE_PATH_LITERAL(".fake"))),
-        hash_prefix_should_match_(hash_prefix_matches),
-        reset_succeeds_(reset_succeeds) {}
-
-  bool Reset() override { return reset_succeeds_; }
+        hash_prefix_should_match_(hash_prefix_matches) {}
 
   HashPrefix GetMatchingHashPrefix(const FullHash& full_hash) override {
     return hash_prefix_should_match_ ? full_hash : HashPrefix();
   }
 
   void set_hash_prefix_matches(bool hash_prefix_matches) {
     hash_prefix_should_match_ = hash_prefix_matches;
   }
 
  private:
   bool hash_prefix_should_match_;
-  bool reset_succeeds_;
 };
 
-// This factory creates a "fake" store. It allows the caller to specify that the
-// first store should fail on Reset() i.e. return false. All subsequent stores
-// always return true. This is used to test the Reset() method in V4Database.
+// This factory creates a "fake" store. It allows the caller to specify whether
+// the store has a hash prefix matching a full hash. This is used to test the
+// |GetStoresMatchingFullHash()| method in |V4Database|.
 class FakeV4StoreFactory : public V4StoreFactory {
  public:
-  FakeV4StoreFactory(bool next_store_reset_fails, bool hash_prefix_matches)
-      : hash_prefix_should_match_(hash_prefix_matches),
-        next_store_reset_fails_(next_store_reset_fails) {}
+  FakeV4StoreFactory(bool hash_prefix_matches)
+      : hash_prefix_should_match_(hash_prefix_matches) {}
 
   V4Store* CreateV4Store(
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       const base::FilePath& store_path) override {
-    bool reset_succeeds = !next_store_reset_fails_;
-    next_store_reset_fails_ = false;
-    return new FakeV4Store(task_runner, store_path, reset_succeeds,
-                           hash_prefix_should_match_);
+    return new FakeV4Store(task_runner, store_path, hash_prefix_should_match_);
   }
 
  private:
   bool hash_prefix_should_match_;
-  bool next_store_reset_fails_;
 };
 
 class V4DatabaseTest : public PlatformTest {
  public:
   V4DatabaseTest()
       : task_runner_(new base::TestSimpleTaskRunner),
         linux_malware_id_(LINUX_PLATFORM, URL, MALWARE_THREAT),
         win_malware_id_(WINDOWS_PLATFORM, URL, MALWARE_THREAT) {}
 
   void SetUp() override {
@@ skipping 14 matching lines @@
         base::Unretained(this));
 
     SetupInfoMapAndExpectedState();
   }
 
   void TearDown() override {
     V4Database::RegisterStoreFactoryForTest(nullptr);
     PlatformTest::TearDown();
   }
 
-  void RegisterFactory(bool fails_first_reset,
-                       bool hash_prefix_matches = true) {
-    factory_.reset(
-        new FakeV4StoreFactory(fails_first_reset, hash_prefix_matches));
+  void RegisterFactory(bool hash_prefix_matches = true) {
+    factory_.reset(new FakeV4StoreFactory(hash_prefix_matches));
     V4Database::RegisterStoreFactoryForTest(factory_.get());
   }
 
   void SetupInfoMapAndExpectedState() {
     list_infos_.emplace_back(true, "win_url_malware", win_malware_id_,
                              SB_THREAT_TYPE_URL_MALWARE);
     expected_identifiers_.push_back(win_malware_id_);
     expected_store_paths_.push_back(
         database_dirname_.AppendASCII("win_url_malware.fake"));
 
@@ skipping 16 matching lines @@
     ASSERT_EQ(expected_store_paths_.size(), v4_database->store_map_->size());
     ASSERT_EQ(expected_identifiers_.size(), v4_database->store_map_->size());
     for (size_t i = 0; i < expected_identifiers_.size(); i++) {
       const auto& expected_identifier = expected_identifiers_[i];
       const auto& store = (*v4_database->store_map_)[expected_identifier];
       ASSERT_TRUE(store);
       const auto& expected_store_path = expected_store_paths_[i];
       EXPECT_EQ(expected_store_path, store->store_path());
     }
 
-    EXPECT_EQ(expected_resets_successfully_, v4_database->ResetDatabase());
-
     EXPECT_FALSE(created_and_called_back_);
     created_and_called_back_ = true;
 
     v4_database_ = std::move(v4_database);
   }
 
+  void DatabaseReadyForUpdates() {}

[Nathan Parker, 2016/10/07 23:24:28]

This isn't used. Should it be?

[vakh (use Gerrit instead), 2016/10/10 17:42:33]

Nope, not needed now. Removed.

+
   std::unique_ptr<ParsedServerResponse> CreateFakeServerResponse(
       StoreStateMap store_state_map,
       bool use_valid_response_type) {
     std::unique_ptr<ParsedServerResponse> parsed_server_response(
         new ParsedServerResponse);
     for (const auto& store_state_iter : store_state_map) {
       ListIdentifier identifier = store_state_iter.first;
       ListUpdateResponse* lur = new ListUpdateResponse;
       lur->set_platform_type(identifier.platform_type());
       lur->set_threat_entry_type(identifier.threat_entry_type());
@@ skipping 40 matching lines @@
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   std::unique_ptr<V4Database> v4_database_;
   base::FilePath database_dirname_;
   base::ScopedTempDir temp_dir_;
   content::TestBrowserThreadBundle thread_bundle_;
   bool created_but_not_called_back_;
   bool created_and_called_back_;
   ListInfos list_infos_;
   std::vector<ListIdentifier> expected_identifiers_;
   std::vector<base::FilePath> expected_store_paths_;
-  bool expected_resets_successfully_;
   std::unique_ptr<FakeV4StoreFactory> factory_;
   DatabaseUpdatedCallback callback_db_updated_;
   NewDatabaseReadyCallback callback_db_ready_;
   StoreStateMap expected_store_state_map_;
   base::hash_map<ListIdentifier, V4Store*> old_stores_map_;
   const ListIdentifier linux_malware_id_, win_malware_id_;
 };
 
 // Test to set up the database with fake stores.
 TEST_F(V4DatabaseTest, TestSetupDatabaseWithFakeStores) {
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_);
+  RegisterFactory();
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
-  created_but_not_called_back_ = true;
-  task_runner_->RunPendingTasks();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(true, created_and_called_back_);
-}
-
-// Test to set up the database with fake stores that fail to reset.
-TEST_F(V4DatabaseTest, TestSetupDatabaseWithFakeStoresFailsReset) {
-  expected_resets_successfully_ = false;
-  RegisterFactory(!expected_resets_successfully_);
-
-  V4Database::Create(task_runner_, database_dirname_, list_infos_,
-                     callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 }
 
 // Test to check database updates as expected.
 TEST_F(V4DatabaseTest, TestApplyUpdateWithNewStates) {
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_);
+  RegisterFactory();
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   // The database has now been created. Time to try to update it.
   EXPECT_TRUE(v4_database_);
   const StoreMap* db_stores = v4_database_->store_map_.get();
   EXPECT_EQ(expected_store_paths_.size(), db_stores->size());
   for (const auto& store_iter : *db_stores) {
     V4Store* store = store_iter.second.get();
     expected_store_state_map_[store_iter.first] = store->state() + "_fake";
     old_stores_map_[store_iter.first] = store;
   }
 
   v4_database_->ApplyUpdate(
       CreateFakeServerResponse(expected_store_state_map_, true),
       callback_db_updated_);
 
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   VerifyExpectedStoresState(true);
 }
 
 // Test to ensure no state updates leads to no store updates.
 TEST_F(V4DatabaseTest, TestApplyUpdateWithNoNewState) {
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_);
+  RegisterFactory();
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   // The database has now been created. Time to try to update it.
   EXPECT_TRUE(v4_database_);
   const StoreMap* db_stores = v4_database_->store_map_.get();
   EXPECT_EQ(expected_store_paths_.size(), db_stores->size());
   for (const auto& store_iter : *db_stores) {
     V4Store* store = store_iter.second.get();
     expected_store_state_map_[store_iter.first] = store->state();
     old_stores_map_[store_iter.first] = store;
   }
 
   v4_database_->ApplyUpdate(
       CreateFakeServerResponse(expected_store_state_map_, true),
       callback_db_updated_);
 
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   VerifyExpectedStoresState(false);
 }
 
 // Test to ensure no updates leads to no store updates.
 TEST_F(V4DatabaseTest, TestApplyUpdateWithEmptyUpdate) {
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_);
+  RegisterFactory();
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   // The database has now been created. Time to try to update it.
   EXPECT_TRUE(v4_database_);
   const StoreMap* db_stores = v4_database_->store_map_.get();
@@ skipping 10 matching lines @@
                             callback_db_updated_);
 
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   VerifyExpectedStoresState(false);
 }
 
 // Test to ensure invalid update leads to no store changes.
 TEST_F(V4DatabaseTest, TestApplyUpdateWithInvalidUpdate) {
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_);
+  RegisterFactory();
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   // The database has now been created. Time to try to update it.
   EXPECT_TRUE(v4_database_);
   const StoreMap* db_stores = v4_database_->store_map_.get();
   EXPECT_EQ(expected_store_paths_.size(), db_stores->size());
   for (const auto& store_iter : *db_stores) {
     V4Store* store = store_iter.second.get();
     expected_store_state_map_[store_iter.first] = store->state();
     old_stores_map_[store_iter.first] = store;
   }
 
   v4_database_->ApplyUpdate(
       CreateFakeServerResponse(expected_store_state_map_, false),
       callback_db_updated_);
   task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 
   VerifyExpectedStoresState(false);
 }
 
 // Test to ensure the case that all stores match a given full hash.
 TEST_F(V4DatabaseTest, TestAllStoresMatchFullHash) {
   bool hash_prefix_matches = true;
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
+  RegisterFactory(hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   StoresToCheck stores_to_check({linux_malware_id_, win_malware_id_});
   StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash("anything", stores_to_check,
                                           &store_and_hash_prefixes);
   EXPECT_EQ(2u, store_and_hash_prefixes.size());
   StoresToCheck stores_found;
   for (const auto& it : store_and_hash_prefixes) {
     stores_found.insert(it.list_id);
   }
   EXPECT_EQ(stores_to_check, stores_found);
 }
 
 // Test to ensure the case that no stores match a given full hash.
 TEST_F(V4DatabaseTest, TestNoStoreMatchesFullHash) {
   bool hash_prefix_matches = false;
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
+  RegisterFactory(hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash(
       "anything", StoresToCheck({linux_malware_id_, win_malware_id_}),
       &store_and_hash_prefixes);
   EXPECT_TRUE(store_and_hash_prefixes.empty());
 }
 
 // Test to ensure the case that some stores match a given full hash.
 TEST_F(V4DatabaseTest, TestSomeStoresMatchFullHash) {
   // Setup stores to not match the full hash.
   bool hash_prefix_matches = false;
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
+  RegisterFactory(hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   // Set the store corresponding to linux_malware_id_ to match the full hash.
   FakeV4Store* store = static_cast<FakeV4Store*>(
       v4_database_->store_map_->at(win_malware_id_).get());
   store->set_hash_prefix_matches(true);
 
   StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash(
       "anything", StoresToCheck({linux_malware_id_, win_malware_id_}),
       &store_and_hash_prefixes);
   EXPECT_EQ(1u, store_and_hash_prefixes.size());
   EXPECT_EQ(store_and_hash_prefixes.begin()->list_id, win_malware_id_);
   EXPECT_FALSE(store_and_hash_prefixes.begin()->hash_prefix.empty());
 }
 
 // Test to ensure the case that only some stores are reported to match a given
 // full hash because of StoresToCheck.
 TEST_F(V4DatabaseTest, TestSomeStoresMatchFullHashBecauseOfStoresToMatch) {
   // Setup all stores to match the full hash.
   bool hash_prefix_matches = true;
-  expected_resets_successfully_ = true;
-  RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
+  RegisterFactory(hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, list_infos_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   // Don't add win_malware_id_ to the StoresToCheck.
   StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash(
       "anything", StoresToCheck({linux_malware_id_}), &store_and_hash_prefixes);
   EXPECT_EQ(1u, store_and_hash_prefixes.size());
   EXPECT_EQ(store_and_hash_prefixes.begin()->list_id, linux_malware_id_);
   EXPECT_FALSE(store_and_hash_prefixes.begin()->hash_prefix.empty());
 }
 
 }  // namespace safe_browsing