| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/safe_browsing/safe_browsing_util.h" | 5 #include "chrome/browser/safe_browsing/safe_browsing_util.h" | 
| 6 | 6 | 
| 7 #include "base/logging.h" | 7 #include "base/logging.h" | 
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" | 
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" | 
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 188 const char kMalwareList[] = "goog-mobilemalware-shavar"; | 188 const char kMalwareList[] = "goog-mobilemalware-shavar"; | 
| 189 const char kPhishingList[] = "goog-mobilephish-shavar"; | 189 const char kPhishingList[] = "goog-mobilephish-shavar"; | 
| 190 #else | 190 #else | 
| 191 const char kMalwareList[] = "goog-malware-shavar"; | 191 const char kMalwareList[] = "goog-malware-shavar"; | 
| 192 const char kPhishingList[] = "goog-phish-shavar"; | 192 const char kPhishingList[] = "goog-phish-shavar"; | 
| 193 #endif | 193 #endif | 
| 194 const char kBinUrlList[] = "goog-badbinurl-shavar"; | 194 const char kBinUrlList[] = "goog-badbinurl-shavar"; | 
| 195 const char kCsdWhiteList[] = "goog-csdwhite-sha256"; | 195 const char kCsdWhiteList[] = "goog-csdwhite-sha256"; | 
| 196 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256"; | 196 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256"; | 
| 197 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar"; | 197 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar"; | 
| 198 const char kSideEffectFreeWhitelist[] = "goog-sideeffectfree-shavar"; |  | 
| 199 const char kIPBlacklist[] = "goog-badip-digest256"; | 198 const char kIPBlacklist[] = "goog-badip-digest256"; | 
| 200 const char kUnwantedUrlList[] = "goog-unwanted-shavar"; | 199 const char kUnwantedUrlList[] = "goog-unwanted-shavar"; | 
| 201 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256"; | 200 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256"; | 
| 202 | 201 | 
| 203 const char* kAllLists[10] = { | 202 const char* kAllLists[9] = { | 
| 204     kMalwareList, | 203     kMalwareList, | 
| 205     kPhishingList, | 204     kPhishingList, | 
| 206     kBinUrlList, | 205     kBinUrlList, | 
| 207     kCsdWhiteList, | 206     kCsdWhiteList, | 
| 208     kDownloadWhiteList, | 207     kDownloadWhiteList, | 
| 209     kExtensionBlacklist, | 208     kExtensionBlacklist, | 
| 210     kSideEffectFreeWhitelist, |  | 
| 211     kIPBlacklist, | 209     kIPBlacklist, | 
| 212     kUnwantedUrlList, | 210     kUnwantedUrlList, | 
| 213     kInclusionWhitelist, | 211     kInclusionWhitelist, | 
| 214 }; | 212 }; | 
| 215 | 213 | 
| 216 ListType GetListId(const base::StringPiece& name) { | 214 ListType GetListId(const base::StringPiece& name) { | 
| 217   ListType id; | 215   ListType id; | 
| 218   if (name == safe_browsing_util::kMalwareList) { | 216   if (name == safe_browsing_util::kMalwareList) { | 
| 219     id = MALWARE; | 217     id = MALWARE; | 
| 220   } else if (name == safe_browsing_util::kPhishingList) { | 218   } else if (name == safe_browsing_util::kPhishingList) { | 
| 221     id = PHISH; | 219     id = PHISH; | 
| 222   } else if (name == safe_browsing_util::kBinUrlList) { | 220   } else if (name == safe_browsing_util::kBinUrlList) { | 
| 223     id = BINURL; | 221     id = BINURL; | 
| 224   } else if (name == safe_browsing_util::kCsdWhiteList) { | 222   } else if (name == safe_browsing_util::kCsdWhiteList) { | 
| 225     id = CSDWHITELIST; | 223     id = CSDWHITELIST; | 
| 226   } else if (name == safe_browsing_util::kDownloadWhiteList) { | 224   } else if (name == safe_browsing_util::kDownloadWhiteList) { | 
| 227     id = DOWNLOADWHITELIST; | 225     id = DOWNLOADWHITELIST; | 
| 228   } else if (name == safe_browsing_util::kExtensionBlacklist) { | 226   } else if (name == safe_browsing_util::kExtensionBlacklist) { | 
| 229     id = EXTENSIONBLACKLIST; | 227     id = EXTENSIONBLACKLIST; | 
| 230   } else if (name == safe_browsing_util::kSideEffectFreeWhitelist) { |  | 
| 231     id = SIDEEFFECTFREEWHITELIST; |  | 
| 232   } else if (name == safe_browsing_util::kIPBlacklist) { | 228   } else if (name == safe_browsing_util::kIPBlacklist) { | 
| 233     id = IPBLACKLIST; | 229     id = IPBLACKLIST; | 
| 234   } else if (name == safe_browsing_util::kUnwantedUrlList) { | 230   } else if (name == safe_browsing_util::kUnwantedUrlList) { | 
| 235     id = UNWANTEDURL; | 231     id = UNWANTEDURL; | 
| 236   } else if (name == safe_browsing_util::kInclusionWhitelist) { | 232   } else if (name == safe_browsing_util::kInclusionWhitelist) { | 
| 237     id = INCLUSIONWHITELIST; | 233     id = INCLUSIONWHITELIST; | 
| 238   } else { | 234   } else { | 
| 239     id = INVALID; | 235     id = INVALID; | 
| 240   } | 236   } | 
| 241   return id; | 237   return id; | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 254       break; | 250       break; | 
| 255     case CSDWHITELIST: | 251     case CSDWHITELIST: | 
| 256       *list = safe_browsing_util::kCsdWhiteList; | 252       *list = safe_browsing_util::kCsdWhiteList; | 
| 257       break; | 253       break; | 
| 258     case DOWNLOADWHITELIST: | 254     case DOWNLOADWHITELIST: | 
| 259       *list = safe_browsing_util::kDownloadWhiteList; | 255       *list = safe_browsing_util::kDownloadWhiteList; | 
| 260       break; | 256       break; | 
| 261     case EXTENSIONBLACKLIST: | 257     case EXTENSIONBLACKLIST: | 
| 262       *list = safe_browsing_util::kExtensionBlacklist; | 258       *list = safe_browsing_util::kExtensionBlacklist; | 
| 263       break; | 259       break; | 
| 264     case SIDEEFFECTFREEWHITELIST: |  | 
| 265       *list = safe_browsing_util::kSideEffectFreeWhitelist; |  | 
| 266       break; |  | 
| 267     case IPBLACKLIST: | 260     case IPBLACKLIST: | 
| 268       *list = safe_browsing_util::kIPBlacklist; | 261       *list = safe_browsing_util::kIPBlacklist; | 
| 269       break; | 262       break; | 
| 270     case UNWANTEDURL: | 263     case UNWANTEDURL: | 
| 271       *list = safe_browsing_util::kUnwantedUrlList; | 264       *list = safe_browsing_util::kUnwantedUrlList; | 
| 272       break; | 265       break; | 
| 273     case INCLUSIONWHITELIST: | 266     case INCLUSIONWHITELIST: | 
| 274       *list = safe_browsing_util::kInclusionWhitelist; | 267       *list = safe_browsing_util::kInclusionWhitelist; | 
| 275       break; | 268       break; | 
| 276     default: | 269     default: | 
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 544   if (status == kOff) | 537   if (status == kOff) | 
| 545     return UWS_OFF; | 538     return UWS_OFF; | 
| 546   if (status == kOnButInvisible) | 539   if (status == kOnButInvisible) | 
| 547     return UWS_ON_INVISIBLE; | 540     return UWS_ON_INVISIBLE; | 
| 548   if (status == kOn) | 541   if (status == kOn) | 
| 549     return UWS_ON; | 542     return UWS_ON; | 
| 550   return UWS_ON; | 543   return UWS_ON; | 
| 551 } | 544 } | 
| 552 | 545 | 
| 553 }  // namespace safe_browsing_util | 546 }  // namespace safe_browsing_util | 
| OLD | NEW | 
|---|