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

components/safe_browsing_db/util.cc

 // Copyright (c) 2015 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 "components/safe_browsing_db/util.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 35 matching lines @@
 const char kMalwareList[] = "goog-malware-shavar";
 const char kPhishingList[] = "goog-phish-shavar";
 const char kBinUrlList[] = "goog-badbinurl-shavar";
 const char kCsdWhiteList[] = "goog-csdwhite-sha256";
 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256";
 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar";
 const char kIPBlacklist[] = "goog-badip-digest256";
 const char kUnwantedUrlList[] = "goog-unwanted-shavar";
 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256";
 const char kModuleWhitelist[] = "goog-whitemodule-digest256";
+const char kResourceBlacklist[] = "goog-badresource-shavar";
 
-const char* kAllLists[10] = {
+const char* kAllLists[11] = {
     kMalwareList,        kPhishingList,       kBinUrlList,  kCsdWhiteList,
     kDownloadWhiteList,  kExtensionBlacklist, kIPBlacklist, kUnwantedUrlList,
-    kInclusionWhitelist, kModuleWhitelist,
+    kInclusionWhitelist, kModuleWhitelist, kResourceBlacklist,
 };
 
 ListType GetListId(const base::StringPiece& name) {
   ListType id;
   if (name == kMalwareList) {
     id = MALWARE;
   } else if (name == kPhishingList) {
     id = PHISH;
   } else if (name == kBinUrlList) {
     id = BINURL;
   } else if (name == kCsdWhiteList) {
     id = CSDWHITELIST;
   } else if (name == kDownloadWhiteList) {
     id = DOWNLOADWHITELIST;
   } else if (name == kExtensionBlacklist) {
     id = EXTENSIONBLACKLIST;
   } else if (name == kIPBlacklist) {
     id = IPBLACKLIST;
   } else if (name == kUnwantedUrlList) {
     id = UNWANTEDURL;
   } else if (name == kInclusionWhitelist) {
     id = INCLUSIONWHITELIST;
   } else if (name == kModuleWhitelist) {
     id = MODULEWHITELIST;
+  } else if (name == kResourceBlacklist) {
+    id = RESOURCEBLACKLIST;
   } else {
     id = INVALID;
   }
   return id;
 }
 
 bool GetListName(ListType list_id, std::string* list) {
   switch (list_id) {
     case MALWARE:
       *list = kMalwareList;
@@ skipping 17 matching lines @@
       *list = kIPBlacklist;
       break;
     case UNWANTEDURL:
       *list = kUnwantedUrlList;
       break;
     case INCLUSIONWHITELIST:
       *list = kInclusionWhitelist;
       break;
     case MODULEWHITELIST:
       *list = kModuleWhitelist;
+    case RESOURCEBLACKLIST:
+      *list = kResourceBlacklist;

[igorcov, 2016/10/26 11:37:34]

The break statement was stolen from above and now MODULEWHITELIST is impossible
to happen

[grt (UTC plus 2), 2016/10/26 11:44:49]

fix out for review in https://codereview.chromium.org/2451163002/

       break;
     default:
       return false;
   }
   DCHECK(IsKnownList(*list));
   return true;
 }
 
 
 SBFullHash SBFullHashForString(const base::StringPiece& str) {
@@ skipping 277 matching lines @@
   GenerateHostsToCheck(url, &hosts);
   GeneratePathsToCheck(url, &paths);
   for (size_t h = 0; h < hosts.size(); ++h) {
     for (size_t p = 0; p < paths.size(); ++p) {
       urls->push_back(hosts[h] + paths[p]);
     }
   }
 }
 
 }  // namespace safe_browsing