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

Side by Side Diff: components/safe_browsing_db/util.cc

Issue 1638223003: Add support for a module whitelist (goog-whitemodule-digest256) to the safe browsing db (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix browser test Created 4 years, 10 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
« no previous file with comments | « components/safe_browsing_db/util.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "components/safe_browsing_db/util.h" 5 #include "components/safe_browsing_db/util.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Listnames that browser can process. 45 // Listnames that browser can process.
46 const char kMalwareList[] = "goog-malware-shavar"; 46 const char kMalwareList[] = "goog-malware-shavar";
47 const char kPhishingList[] = "goog-phish-shavar"; 47 const char kPhishingList[] = "goog-phish-shavar";
48 const char kBinUrlList[] = "goog-badbinurl-shavar"; 48 const char kBinUrlList[] = "goog-badbinurl-shavar";
49 const char kCsdWhiteList[] = "goog-csdwhite-sha256"; 49 const char kCsdWhiteList[] = "goog-csdwhite-sha256";
50 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256"; 50 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256";
51 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar"; 51 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar";
52 const char kIPBlacklist[] = "goog-badip-digest256"; 52 const char kIPBlacklist[] = "goog-badip-digest256";
53 const char kUnwantedUrlList[] = "goog-unwanted-shavar"; 53 const char kUnwantedUrlList[] = "goog-unwanted-shavar";
54 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256"; 54 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256";
55 const char kModuleWhitelist[] = "goog-whitemodule-digest256";
55 56
56 const char* kAllLists[9] = { 57 const char* kAllLists[10] = {
57 kMalwareList, 58 kMalwareList, kPhishingList, kBinUrlList, kCsdWhiteList,
58 kPhishingList, 59 kDownloadWhiteList, kExtensionBlacklist, kIPBlacklist, kUnwantedUrlList,
59 kBinUrlList, 60 kInclusionWhitelist, kModuleWhitelist,
60 kCsdWhiteList,
61 kDownloadWhiteList,
62 kExtensionBlacklist,
63 kIPBlacklist,
64 kUnwantedUrlList,
65 kInclusionWhitelist,
66 }; 61 };
67 62
68 ListType GetListId(const base::StringPiece& name) { 63 ListType GetListId(const base::StringPiece& name) {
69 ListType id; 64 ListType id;
70 if (name == kMalwareList) { 65 if (name == kMalwareList) {
71 id = MALWARE; 66 id = MALWARE;
72 } else if (name == kPhishingList) { 67 } else if (name == kPhishingList) {
73 id = PHISH; 68 id = PHISH;
74 } else if (name == kBinUrlList) { 69 } else if (name == kBinUrlList) {
75 id = BINURL; 70 id = BINURL;
76 } else if (name == kCsdWhiteList) { 71 } else if (name == kCsdWhiteList) {
77 id = CSDWHITELIST; 72 id = CSDWHITELIST;
78 } else if (name == kDownloadWhiteList) { 73 } else if (name == kDownloadWhiteList) {
79 id = DOWNLOADWHITELIST; 74 id = DOWNLOADWHITELIST;
80 } else if (name == kExtensionBlacklist) { 75 } else if (name == kExtensionBlacklist) {
81 id = EXTENSIONBLACKLIST; 76 id = EXTENSIONBLACKLIST;
82 } else if (name == kIPBlacklist) { 77 } else if (name == kIPBlacklist) {
83 id = IPBLACKLIST; 78 id = IPBLACKLIST;
84 } else if (name == kUnwantedUrlList) { 79 } else if (name == kUnwantedUrlList) {
85 id = UNWANTEDURL; 80 id = UNWANTEDURL;
86 } else if (name == kInclusionWhitelist) { 81 } else if (name == kInclusionWhitelist) {
87 id = INCLUSIONWHITELIST; 82 id = INCLUSIONWHITELIST;
83 } else if (name == kModuleWhitelist) {
84 id = MODULEWHITELIST;
88 } else { 85 } else {
89 id = INVALID; 86 id = INVALID;
90 } 87 }
91 return id; 88 return id;
92 } 89 }
93 90
94 bool GetListName(ListType list_id, std::string* list) { 91 bool GetListName(ListType list_id, std::string* list) {
95 switch (list_id) { 92 switch (list_id) {
96 case MALWARE: 93 case MALWARE:
97 *list = kMalwareList; 94 *list = kMalwareList;
(...skipping 15 matching lines...) Expand all
113 break; 110 break;
114 case IPBLACKLIST: 111 case IPBLACKLIST:
115 *list = kIPBlacklist; 112 *list = kIPBlacklist;
116 break; 113 break;
117 case UNWANTEDURL: 114 case UNWANTEDURL:
118 *list = kUnwantedUrlList; 115 *list = kUnwantedUrlList;
119 break; 116 break;
120 case INCLUSIONWHITELIST: 117 case INCLUSIONWHITELIST:
121 *list = kInclusionWhitelist; 118 *list = kInclusionWhitelist;
122 break; 119 break;
120 case MODULEWHITELIST:
121 *list = kModuleWhitelist;
122 break;
123 default: 123 default:
124 return false; 124 return false;
125 } 125 }
126 DCHECK(IsKnownList(*list)); 126 DCHECK(IsKnownList(*list));
127 return true; 127 return true;
128 } 128 }
129 129
130 130
131 SBFullHash SBFullHashForString(const base::StringPiece& str) { 131 SBFullHash SBFullHashForString(const base::StringPiece& str) {
132 SBFullHash h; 132 SBFullHash h;
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 GenerateHostsToCheck(url, &hosts); 409 GenerateHostsToCheck(url, &hosts);
410 GeneratePathsToCheck(url, &paths); 410 GeneratePathsToCheck(url, &paths);
411 for (size_t h = 0; h < hosts.size(); ++h) { 411 for (size_t h = 0; h < hosts.size(); ++h) {
412 for (size_t p = 0; p < paths.size(); ++p) { 412 for (size_t p = 0; p < paths.size(); ++p) {
413 urls->push_back(hosts[h] + paths[p]); 413 urls->push_back(hosts[h] + paths[p]);
414 } 414 }
415 } 415 }
416 } 416 }
417 417
418 } // namespace safe_browsing 418 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « components/safe_browsing_db/util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698