Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_util.cc

Issue 835523002: Add support for goog-csdinclusionwhite-sha256 in SafeBrowsingDatabase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@##python_fix
Patch Set: fix tests post merge Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
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"; 198 const char kSideEffectFreeWhitelist[] = "goog-sideeffectfree-shavar";
199 const char kIPBlacklist[] = "goog-badip-digest256"; 199 const char kIPBlacklist[] = "goog-badip-digest256";
200 const char kUnwantedUrlList[] = "goog-unwanted-shavar"; 200 const char kUnwantedUrlList[] = "goog-unwanted-shavar";
201 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256";
201 202
202 const char* kAllLists[9] = { 203 const char* kAllLists[10] = {
203 kMalwareList, 204 kMalwareList,
204 kPhishingList, 205 kPhishingList,
205 kBinUrlList, 206 kBinUrlList,
206 kCsdWhiteList, 207 kCsdWhiteList,
207 kDownloadWhiteList, 208 kDownloadWhiteList,
208 kExtensionBlacklist, 209 kExtensionBlacklist,
209 kSideEffectFreeWhitelist, 210 kSideEffectFreeWhitelist,
210 kIPBlacklist, 211 kIPBlacklist,
211 kUnwantedUrlList, 212 kUnwantedUrlList,
213 kInclusionWhitelist,
212 }; 214 };
213 215
214 ListType GetListId(const base::StringPiece& name) { 216 ListType GetListId(const base::StringPiece& name) {
215 ListType id; 217 ListType id;
216 if (name == safe_browsing_util::kMalwareList) { 218 if (name == safe_browsing_util::kMalwareList) {
217 id = MALWARE; 219 id = MALWARE;
218 } else if (name == safe_browsing_util::kPhishingList) { 220 } else if (name == safe_browsing_util::kPhishingList) {
219 id = PHISH; 221 id = PHISH;
220 } else if (name == safe_browsing_util::kBinUrlList) { 222 } else if (name == safe_browsing_util::kBinUrlList) {
221 id = BINURL; 223 id = BINURL;
222 } else if (name == safe_browsing_util::kCsdWhiteList) { 224 } else if (name == safe_browsing_util::kCsdWhiteList) {
223 id = CSDWHITELIST; 225 id = CSDWHITELIST;
224 } else if (name == safe_browsing_util::kDownloadWhiteList) { 226 } else if (name == safe_browsing_util::kDownloadWhiteList) {
225 id = DOWNLOADWHITELIST; 227 id = DOWNLOADWHITELIST;
226 } else if (name == safe_browsing_util::kExtensionBlacklist) { 228 } else if (name == safe_browsing_util::kExtensionBlacklist) {
227 id = EXTENSIONBLACKLIST; 229 id = EXTENSIONBLACKLIST;
228 } else if (name == safe_browsing_util::kSideEffectFreeWhitelist) { 230 } else if (name == safe_browsing_util::kSideEffectFreeWhitelist) {
229 id = SIDEEFFECTFREEWHITELIST; 231 id = SIDEEFFECTFREEWHITELIST;
230 } else if (name == safe_browsing_util::kIPBlacklist) { 232 } else if (name == safe_browsing_util::kIPBlacklist) {
231 id = IPBLACKLIST; 233 id = IPBLACKLIST;
232 } else if (name == safe_browsing_util::kUnwantedUrlList) { 234 } else if (name == safe_browsing_util::kUnwantedUrlList) {
233 id = UNWANTEDURL; 235 id = UNWANTEDURL;
236 } else if (name == safe_browsing_util::kInclusionWhitelist) {
237 id = INCLUSIONWHITELIST;
234 } else { 238 } else {
235 id = INVALID; 239 id = INVALID;
236 } 240 }
237 return id; 241 return id;
238 } 242 }
239 243
240 bool GetListName(ListType list_id, std::string* list) { 244 bool GetListName(ListType list_id, std::string* list) {
241 switch (list_id) { 245 switch (list_id) {
242 case MALWARE: 246 case MALWARE:
243 *list = safe_browsing_util::kMalwareList; 247 *list = safe_browsing_util::kMalwareList;
(...skipping 15 matching lines...) Expand all
259 break; 263 break;
260 case SIDEEFFECTFREEWHITELIST: 264 case SIDEEFFECTFREEWHITELIST:
261 *list = safe_browsing_util::kSideEffectFreeWhitelist; 265 *list = safe_browsing_util::kSideEffectFreeWhitelist;
262 break; 266 break;
263 case IPBLACKLIST: 267 case IPBLACKLIST:
264 *list = safe_browsing_util::kIPBlacklist; 268 *list = safe_browsing_util::kIPBlacklist;
265 break; 269 break;
266 case UNWANTEDURL: 270 case UNWANTEDURL:
267 *list = safe_browsing_util::kUnwantedUrlList; 271 *list = safe_browsing_util::kUnwantedUrlList;
268 break; 272 break;
273 case INCLUSIONWHITELIST:
274 *list = safe_browsing_util::kInclusionWhitelist;
275 break;
269 default: 276 default:
270 return false; 277 return false;
271 } 278 }
272 DCHECK(IsKnownList(*list)); 279 DCHECK(IsKnownList(*list));
273 return true; 280 return true;
274 } 281 }
275 282
276 std::string Unescape(const std::string& url) { 283 std::string Unescape(const std::string& url) {
277 std::string unescaped_str(url); 284 std::string unescaped_str(url);
278 std::string old_unescaped_str; 285 std::string old_unescaped_str;
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 if (status == kOff) 544 if (status == kOff)
538 return UWS_OFF; 545 return UWS_OFF;
539 if (status == kOnButInvisible) 546 if (status == kOnButInvisible)
540 return UWS_ON_INVISIBLE; 547 return UWS_ON_INVISIBLE;
541 if (status == kOn) 548 if (status == kOn)
542 return UWS_ON; 549 return UWS_ON;
543 return UWS_OFF; 550 return UWS_OFF;
544 } 551 }
545 552
546 } // namespace safe_browsing_util 553 } // namespace safe_browsing_util
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_util.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698