Add the SocEng as a type for checking in CheckUrlForSubresourceFilter.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 22 matching lines @@
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/local_database_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/safe_browsing/v4_test_utils.h"
 #include "chrome/browser/subresource_filter/test_ruleset_publisher.h"

[engedy, 2017/04/26 13:47:09]

nit: No longer needed.

[melandory, 2017/04/26 15:02:20]

Done.

 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/browser/startup_task_runner_service.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/common/safebrowsing_switches.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/metadata.pb.h"
 #include "components/safe_browsing_db/test_database_manager.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/safe_browsing_db/v4_database.h"
 #include "components/safe_browsing_db/v4_feature_list.h"
 #include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
 #include "components/safe_browsing_db/v4_protocol_manager_util.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features_test_support.h"

[engedy, 2017/04/26 13:47:09]

nit: This and below no longer needed.

[melandory, 2017/04/26 15:02:20]

Done.

 #include "components/subresource_filter/core/common/test_ruleset_creator.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "crypto/sha2.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
@@ skipping 457 matching lines @@
     SafeBrowsingDatabase::RegisterFactory(nullptr);
     SafeBrowsingProtocolManager::RegisterFactory(nullptr);
     SafeBrowsingService::RegisterFactory(nullptr);
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // Makes sure the auto update is not triggered during the test.
     // This test will fill up the database using testing prefixes
     // and urls.
     command_line->AppendSwitch(safe_browsing::switches::kSbDisableAutoUpdate);
     command_line->AppendSwitchASCII(

[engedy, 2017/04/26 13:47:09]

nit: Probably no longer needed and can be removed with the features.h header.

[melandory, 2017/04/26 15:02:20]

Done.

         ::switches::kEnableFeatures,
         subresource_filter::kSafeBrowsingSubresourceFilter.name);
 #if defined(OS_CHROMEOS)
     command_line->AppendSwitch(
         chromeos::switches::kIgnoreUserProfileMappingForTests);
 #endif
   }
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
@@ skipping 32 matching lines @@
     pm->AddGetFullHashResponse(full_hash);
   }
 
   bool ShowingInterstitialPage() {
     WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     InterstitialPage* interstitial_page = contents->GetInterstitialPage();
     return interstitial_page != nullptr;
   }
 
   bool WasSubresourceFilterProbeScriptLoaded() {

[engedy, 2017/04/26 13:47:09]

nit: No longer needed.

[melandory, 2017/04/26 15:02:20]

Done.

     bool script_resource_was_loaded = false;
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
         web_contents->GetMainFrame(),
         "domAutomationController.send(!!document.scriptExecuted)",
         &script_resource_was_loaded));
     return script_resource_was_loaded;
   }
 
@@ skipping 290 matching lines @@
   ui_test_utils::NavigateToURL(&params);
 
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
-IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SubresourceFilterEndToEndTest) {
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeActivationList,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-
-  subresource_filter::testing::TestRulesetCreator ruleset_creator;
-  subresource_filter::testing::TestRulesetPair test_ruleset_pair;
-  ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
-      "included_script.js", &test_ruleset_pair);
-  subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
-  ASSERT_NO_FATAL_FAILURE(
-      test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
-
-  GURL phishing_url = embedded_test_server()->GetURL(
-      "/subresource_filter/frame_with_included_script.html");
-  SBFullHashResult malware_full_hash;
-  GenUrlFullHashResultWithMetadata(phishing_url, PHISH,
-                                   ThreatPatternType::SOCIAL_ENGINEERING_ADS,
-                                   &malware_full_hash);
-  SetupResponseForUrl(phishing_url, malware_full_hash);
-
-  WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Navigation to a phishing page should trigger an interstitial. If the user
-  // clicks through it, the page load should proceed, but with subresource
-  // filtering activated. This is verified by probing whether `included_script`
-  // that is disallowed above indeed fails to load.
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)));
-  ui_test_utils::NavigateToURL(browser(), phishing_url);
-  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&observer_));
-  ASSERT_TRUE(got_hit_report());
-  content::WaitForInterstitialAttach(web_contents);
-  ASSERT_TRUE(ShowingInterstitialPage());
-
-  content::WindowedNotificationObserver load_stop_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &web_contents->GetController()));
-  InterstitialPage* interstitial_page = web_contents->GetInterstitialPage();
-  ASSERT_TRUE(interstitial_page);
-  interstitial_page->Proceed();
-  load_stop_observer.Wait();
-  ASSERT_FALSE(ShowingInterstitialPage());
-  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
-
-  // Navigate to a page that loads the same script, but is not a phishing page.
-  // The load should be allowed.
-  GURL safe_url = embedded_test_server()->GetURL(
-      "/subresource_filter/frame_with_allowed_script.html");
-  ui_test_utils::NavigateToURL(browser(), safe_url);
-  EXPECT_FALSE(ShowingInterstitialPage());
-  EXPECT_TRUE(WasSubresourceFilterProbeScriptLoaded());
-
-  // Navigate to the phishing page again -- should be no interstitial shown, but
-  // subresource filtering should still be activated.
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)))
-      .Times(0);
-  ui_test_utils::NavigateToURL(browser(), phishing_url);
-  EXPECT_FALSE(ShowingInterstitialPage());
-  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
-}
-
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
                        SubResourceHitWithMainFrameReferrer) {
   GURL first_url = embedded_test_server()->GetURL(kEmptyPage);
   GURL second_url = embedded_test_server()->GetURL(kMalwarePage);
   GURL bad_url = embedded_test_server()->GetURL(kMalwareImg);
 
   SBFullHashResult malware_full_hash;
   GenUrlFullHashResult(bad_url, MALWARE, &malware_full_hash);
   SetupResponseForUrl(bad_url, malware_full_hash);
 
@@ skipping 987 matching lines @@
 
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
 IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
-                       SubresourceFilterEndToEndTest) {
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeActivationList,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-
-  subresource_filter::testing::TestRulesetCreator ruleset_creator;
-  subresource_filter::testing::TestRulesetPair test_ruleset_pair;
-  ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
-      "included_script.js", &test_ruleset_pair);
-  subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
-  ASSERT_NO_FATAL_FAILURE(
-      test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
-
-  GURL phishing_url = embedded_test_server()->GetURL(
-      "/subresource_filter/frame_with_included_script.html");
-  MarkUrlForPhishingUnexpired(phishing_url,
-                              ThreatPatternType::SOCIAL_ENGINEERING_ADS);
-
-  WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Navigation to a phishing page should trigger an interstitial. If the user
-  // clicks through it, the page load should proceed, but with subresource
-  // filtering activated. This is verified by probing whether `included_script`
-  // that is disallowed above indeed fails to load.
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)));
-  ui_test_utils::NavigateToURL(browser(), phishing_url);
-  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&observer_));
-  ASSERT_TRUE(got_hit_report());
-  content::WaitForInterstitialAttach(web_contents);
-  ASSERT_TRUE(ShowingInterstitialPage());
-
-  content::WindowedNotificationObserver load_stop_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &web_contents->GetController()));
-  InterstitialPage* interstitial_page = web_contents->GetInterstitialPage();
-  ASSERT_TRUE(interstitial_page);
-  interstitial_page->Proceed();
-  load_stop_observer.Wait();
-  ASSERT_FALSE(ShowingInterstitialPage());
-  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
-
-  // Navigate to a page that loads the same script, but is not a phishing page.
-  // The load should be allowed.
-  GURL safe_url = embedded_test_server()->GetURL(
-      "/subresource_filter/frame_with_allowed_script.html");
-  ui_test_utils::NavigateToURL(browser(), safe_url);
-  EXPECT_FALSE(ShowingInterstitialPage());
-  EXPECT_TRUE(WasSubresourceFilterProbeScriptLoaded());
-
-  // Navigate to the phishing page again -- should be no interstitial shown, but
-  // subresource filtering should still be activated.
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)))
-      .Times(0);
-  ui_test_utils::NavigateToURL(browser(), phishing_url);
-  EXPECT_FALSE(ShowingInterstitialPage());
-  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
-}
-
-IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
                        SubResourceHitWithMainFrameReferrer) {
   GURL first_url = embedded_test_server()->GetURL(kEmptyPage);
   GURL second_url = embedded_test_server()->GetURL(kMalwarePage);
   GURL bad_url = embedded_test_server()->GetURL(kMalwareImg);
 
   MarkUrlForMalwareUnexpired(bad_url);
 
   // Navigate to first, safe page.
   ui_test_utils::NavigateToURL(browser(), first_url);
   EXPECT_FALSE(ShowingInterstitialPage());
@@ skipping 436 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     MaybeSetMetadata,
     V4SafeBrowsingServiceMetadataTest,
     testing::Values(ThreatPatternType::NONE,
                     ThreatPatternType::MALWARE_LANDING,
                     ThreatPatternType::MALWARE_DISTRIBUTION));
 
 }  // namespace safe_browsing