[merge into M66]Fix crash in safe_browsing::IsURLWhitelistedByPolicy

[email protected]

(cherry picked from commit d80964d)

Bug: 818559
Change-Id: I81db22fded6d75fe74098177fc8eecd4f0ffcbec
Reviewed-on: https://chromium-review.googlesource.com/948069
Commit-Queue: Jialiu Lin <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Varun Khaneja <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#541076}
Reviewed-on: https://chromium-review.googlesource.com/954609
Reviewed-by: Jialiu Lin <[email protected]>
Cr-Commit-Position: refs/branch-heads/3359@{#85}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}

Author: Jialiu Lin

components/safe_browsing/common/BUILD.gn

@@ -52,6 +52,7 @@ source_set("unit_tests") {
     "//base:base",
     "//base/test:test_support",
     "//components/prefs:test_support",
+    "//content/test:test_support",
     "//testing/gtest",
     "//url:url",
   ]

components/safe_browsing/common/DEPS

@@ -1,6 +1,7 @@
 include_rules = [
   "+components/pref_registry",
   "+components/prefs",
+  "+content/public/test",
   "+crypto/sha2.h",
   "+ipc",
   "+url"

components/safe_browsing/common/safe_browsing_prefs.cc

@@ -526,6 +526,8 @@ void CanonicalizeDomainList(
 bool IsURLWhitelistedByPolicy(const GURL& url,
                               StringListPrefMember* pref_member) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+  if (!pref_member)
+    return false;
   std::vector<std::string> sb_whitelist_domains = pref_member->GetValue();
   return std::find_if(sb_whitelist_domains.begin(), sb_whitelist_domains.end(),
                       [&url](const std::string& domain) {

components/safe_browsing/common/safe_browsing_prefs_unittest.cc

@@ -12,6 +12,7 @@
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/safe_browsing/common/safe_browsing_prefs.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -35,6 +36,8 @@ class SafeBrowsingPrefsTest : public ::testing::Test {
     prefs_.registry()->RegisterListPref(prefs::kPasswordProtectionLoginURLs);
     prefs_.registry()->RegisterBooleanPref(
         prefs::kSafeBrowsingExtendedReportingOptInAllowed, true);
+    prefs_.registry()->RegisterListPref(prefs::kSafeBrowsingWhitelistDomains);
+
     ResetExperiments(/*can_show_scout=*/false);
   }
 
@@ -112,6 +115,7 @@ class SafeBrowsingPrefsTest : public ::testing::Test {
 
  private:
   std::unique_ptr<base::test::ScopedFeatureList> feature_list_;
+  content::TestBrowserThreadBundle thread_bundle_;
 };
 
 // This test ensures that we correctly select between SBER and Scout as the
@@ -422,4 +426,23 @@ TEST_F(SafeBrowsingPrefsTest, IsExtendedReportingPolicyManaged) {
   EXPECT_TRUE(IsExtendedReportingOptInAllowed(prefs_));
 }
 
+TEST_F(SafeBrowsingPrefsTest, VerifyIsURLWhitelistedByPolicy) {
+  GURL target_url("https://www.foo.com");
+  // When PrefMember is null, URL is not whitelisted.
+  EXPECT_FALSE(IsURLWhitelistedByPolicy(target_url, nullptr));
+
+  EXPECT_FALSE(prefs_.HasPrefPath(prefs::kSafeBrowsingWhitelistDomains));
+  base::ListValue whitelisted_domains;
+  whitelisted_domains.AppendString("foo.com");
+  prefs_.Set(prefs::kSafeBrowsingWhitelistDomains, whitelisted_domains);
+  StringListPrefMember string_list_pref;
+  string_list_pref.Init(prefs::kSafeBrowsingWhitelistDomains, &prefs_);
+  EXPECT_TRUE(IsURLWhitelistedByPolicy(target_url, prefs_));
+  EXPECT_TRUE(IsURLWhitelistedByPolicy(target_url, &string_list_pref));
+
+  GURL not_whitelisted_url("https://www.bar.com");
+  EXPECT_FALSE(IsURLWhitelistedByPolicy(not_whitelisted_url, prefs_));
+  EXPECT_FALSE(
+      IsURLWhitelistedByPolicy(not_whitelisted_url, &string_list_pref));
+}
 }  // namespace safe_browsing