Add the SocEng as a type for checking in CheckUrlForSubresourceFilter.

components/safe_browsing_db/v4_local_database_manager.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.
 
 // This file should not be build on Android but is currently getting built.
 // TODO(vakh): Fix that: http://crbug.com/621647
 
 #include "components/safe_browsing_db/v4_local_database_manager.h"
 
 #include <vector>
@@ skipping 56 matching lines @@
       ListInfo(kSyncAlways, "UrlUws.store", GetUrlUwsId(),
                SB_THREAT_TYPE_URL_UNWANTED),
       ListInfo(kSyncAlways, "UrlMalBin.store", GetUrlMalBinId(),
                SB_THREAT_TYPE_BINARY_MALWARE_URL),
       ListInfo(kSyncAlways, "ChromeExtMalware.store", GetChromeExtMalwareId(),
                SB_THREAT_TYPE_EXTENSION),
       ListInfo(kSyncOnlyOnChromeBuilds, "ChromeUrlClientIncident.store",
                GetChromeUrlClientIncidentId(),
                SB_THREAT_TYPE_BLACKLISTED_RESOURCE),
       ListInfo(kSyncNever, "", GetChromeUrlApiId(), SB_THREAT_TYPE_API_ABUSE),
-      ListInfo(kSyncOnlyOnChromeBuilds, "UrlSubresourceFilter.store",
+      ListInfo(kSyncAlways, "UrlSubresourceFilter.store",

[melandory, 2017/04/19 14:47:11]

+nparker@

Before start debugging I want to check if I'm hitting something known.

The main change in this CL -- CheckUrlForSubresourceFilter will check not only
against GetUrlSubresourceFilterId(), but also against GetUrlSocEngId(). These
two lists have different fetch_updates strategies, SocEng is kSyncAlways and
SubresourceFilter is kSyncOnlyOnChromeBuilds.

The symptom I observe is for SubresourceFilterBrowserTest:
1.fetch_update strategy of SB_THREAT_TYPE_SUBRESOURCE_FILTER is
kSyncOnlyOnChromeBuilds.
2. Configure the url to be a SocEng via test wrappers from
chrome/browser/safe_browsing/v4_test_utils.cc (MarkPrefixAsBad from
safe_browsing::TestV4DatabaseFactory and AddToFullHashCache from
safe_browsing::TestV4GetHashProtocolManagerFactory)
3. Navigate to this URL.

The call to CheckUrlForSubresourceFilter identifies the URL as
SB_THREAT_TYPE_SAFE.

But if I change the fetch_update strategy as in this patch (to kSyncAlways)
everything works.

I'll start debugging if the symptoms doesn't ring a bell. Thanks!

                GetUrlSubresourceFilterId(), SB_THREAT_TYPE_SUBRESOURCE_FILTER),
   });
   // NOTE(vakh): IMPORTANT: Please make sure that the server already supports
   // any list before adding it to this list otherwise the prefix updates break
   // for all Canary users.
 }
 
 // Returns the severity information about a given SafeBrowsing list. The lowest
 // value is 0, which represents the most severe list.
 ThreatSeverity GetThreatSeverity(const ListIdentifier& list_id) {
@@ skipping 181 matching lines @@
       client, ClientCallbackType::CHECK_RESOURCE_URL, stores_to_check,
       std::vector<GURL>(1, url));
 
   return HandleCheck(std::move(check));
 }
 
 bool V4LocalDatabaseManager::CheckUrlForSubresourceFilter(const GURL& url,
                                                           Client* client) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  StoresToCheck stores_to_check({GetUrlSubresourceFilterId()});
+  StoresToCheck stores_to_check(
+      {GetUrlSocEngId(), GetUrlSubresourceFilterId()});

[engedy, 2017/04/20 11:16:10]

Just to double check: does this cover both SOCIAL_ENG_ADS_INTERSTITIAL as well
as PHISHING_INTERSTITIAL?

[melandory, 2017/04/25 13:48:13]

Yes

   if (!AreStoresAvailableNow(stores_to_check) || !CanCheckUrl(url)) {
     return true;
   }
 
   std::unique_ptr<PendingCheck> check = base::MakeUnique<PendingCheck>(
       client, ClientCallbackType::CHECK_URL_FOR_SUBRESOURCE_FILTER,
       stores_to_check, std::vector<GURL>(1, url));
 
   return HandleCheck(std::move(check));
 }
@@ skipping 467 matching lines @@
                             db_updated_callback_);
 }
 
 bool V4LocalDatabaseManager::AreStoresAvailableNow(
     const StoresToCheck& stores_to_check) const {
   return enabled_ && v4_database_ &&
          v4_database_->AreStoresAvailable(stores_to_check);
 }
 
 }  // namespace safe_browsing