Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable Safe Browsing endpoint for extension blacklist (fixes brave/brave-browser#12297)

Browse Source
This commit is contained in:
Francois Marier
2021-02-05 15:43:04 -08:00
parent 34f7db3456
commit db1038fd6c
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/net/brave_block_safebrowsing_urls.cc
+3
View File
@@ -20,6 +20,9 @@ bool IsSafeBrowsingReportingURL(const GURL& gurl) {
URLPattern(
URLPattern::SCHEME_HTTPS,
"https://sb-ssl.google.com/safebrowsing/clientreport/download*"),
URLPattern(URLPattern::SCHEME_HTTPS,
"https://safebrowsing.google.com/safebrowsing/clientreport/"
"crx-list-info*"),
});
static const std::vector<URLPattern> reporting_patterns({
URLPattern(URLPattern::SCHEME_HTTPS,
browser/net/brave_block_safebrowsing_urls_unittest.cc
+2 -1
View File
@@ -33,7 +33,9 @@ TEST(BraveBlockReportingUrlsHelperTest, PreserveNormalUrls) {
const std::vector<const std::string> normalUrls({
"https://brave.com/",
"https://safebrowsing.google.com/safebrowsing",
"https://safebrowsing.google.com/safebrowsing/clientreport/crx-list-info",
"https://safebrowsing.googleapis.com/v4",
"https://sb-ssl.google.com/safebrowsing/clientreport/download",
});
for (const auto& url : normalUrls) {
@@ -57,7 +59,6 @@ TEST(BraveBlockReportingUrlsHelperTest, CancelReportingUrl) {
"https://safebrowsing.google.com/safebrowsing/report",
"https://safebrowsing.google.com/safebrowsing/clientreport/malware",
"https://safebrowsing.google.com/safebrowsing/uploads/chrome",
"https://safebrowsing.google.com/safebrowsing/clientreport/crx-list-info",
"https://safebrowsing.google.com/safebrowsing/clientreport/realtime",
});
browser/net/brave_static_redirect_network_delegate_helper.cc
+13 -3
View File
@@ -57,7 +57,9 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
static URLPattern safeBrowsing_pattern(URLPattern::SCHEME_HTTPS,
kSafeBrowsingPrefix);
static URLPattern safebrowsingfilecheck_pattern(URLPattern::SCHEME_HTTPS,
kSafeBrowsingFileCheckPrefix);
kSafeBrowsingFileCheckPrefix);
static URLPattern safebrowsingcrxlist_pattern(URLPattern::SCHEME_HTTPS,
kSafeBrowsingCrxListPrefix);
// To-Do (@jumde) - Update the naming for the variables below
// https://github.com/brave/brave-browser/issues/10314
@@ -105,8 +107,16 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
return net::OK;
}
if (safebrowsingfilecheck_pattern.MatchesHost(request_url)) {
replacements.SetHostStr(kBraveSafeBrowsingFileCheckProxy);
if (!safebrowsing_endpoint.empty() &&
safebrowsingfilecheck_pattern.MatchesHost(request_url)) {
replacements.SetHostStr(kBraveSafeBrowsingSslProxy);
*new_url = request_url.ReplaceComponents(replacements);
return net::OK;
}
if (!safebrowsing_endpoint.empty() &&
safebrowsingcrxlist_pattern.MatchesHost(request_url)) {
replacements.SetHostStr(kBraveSafeBrowsing2Proxy);
*new_url = request_url.ReplaceComponents(replacements);
return net::OK;
}
common/network_constants.cc
+4 -1
View File
@@ -16,7 +16,8 @@ const char kBraveReferralsHeadersPath[] = "/promo/custom-headers";
const char kBraveReferralsInitPath[] = "/promo/initialize/nonua";
const char kBraveReferralsActivityPath[] = "/promo/activity";
const char kBraveSafeBrowsingFileCheckProxy[] = "sb-ssl.brave.com";
const char kBraveSafeBrowsing2Proxy[] = "safebrowsing2.brave.com";
const char kBraveSafeBrowsingSslProxy[] = "sb-ssl.brave.com";
const char kBraveRedirectorProxy[] = "redirector.brave.com";
const char kBraveClients4Proxy[] = "clients4.brave.com";
const char kBraveStaticProxy[] = "static1.brave.com";
@@ -33,6 +34,8 @@ const char kJSDataURLPrefix[] = "data:application/javascript;base64,";
const char kGeoLocationsPattern[] =
"https://www.googleapis.com/geolocation/v1/geolocate?key=*";
const char kSafeBrowsingPrefix[] = "https://safebrowsing.googleapis.com/";
const char kSafeBrowsingCrxListPrefix[] =
"https://safebrowsing.google.com/safebrowsing/clientreport/crx-list-info";
const char kSafeBrowsingFileCheckPrefix[] =
"https://sb-ssl.google.com/safebrowsing/clientreport/download";
const char kCRLSetPrefix1[] =
common/network_constants.h
+3 -1
View File
@@ -15,7 +15,8 @@ extern const char kBraveReferralsServer[];
extern const char kBraveReferralsHeadersPath[];
extern const char kBraveReferralsInitPath[];
extern const char kBraveReferralsActivityPath[];
extern const char kBraveSafeBrowsingFileCheckProxy[];
extern const char kBraveSafeBrowsing2Proxy[];
extern const char kBraveSafeBrowsingSslProxy[];
extern const char kBraveRedirectorProxy[];
extern const char kBraveClients4Proxy[];
extern const char kBraveStaticProxy[];
@@ -28,6 +29,7 @@ extern const char kEmptyImageDataURI[];
extern const char kJSDataURLPrefix[];
extern const char kGeoLocationsPattern[];
extern const char kSafeBrowsingPrefix[];
extern const char kSafeBrowsingCrxListPrefix[];
extern const char kSafeBrowsingFileCheckPrefix[];
extern const char kCRLSetPrefix1[];
extern const char kCRLSetPrefix2[];