Merge pull request #84 from brave/brave-ua-whitelist

Use Brave UA for whitelist of URL patterns

Author: bbondy

browser/net/brave_site_hacks_network_delegate_helper.cc

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/base64url.h"
+#include "base/strings/string_util.h"
 #include "brave/common/network_constants.h"
 #include "extensions/common/url_pattern.h"
 #include "net/url_request/url_request.h"
@@ -34,6 +35,20 @@ bool IsBlockedResource(const GURL& gurl) {
       });
 }
 
+bool IsUAWhitelisted(const GURL& gurl) {
+  static std::vector<URLPattern> whitelist_patterns({
+    URLPattern(URLPattern::SCHEME_ALL, "https://*.adobe.com/*"),
+    URLPattern(URLPattern::SCHEME_ALL, "https://*.duckduckgo.com/*"),
+    URLPattern(URLPattern::SCHEME_ALL, "https://*.brave.com/*"),
+    // For Widevine
+    URLPattern(URLPattern::SCHEME_ALL, "https://*.netflix.com/*")
+  });
+  return std::any_of(whitelist_patterns.begin(), whitelist_patterns.end(),
+      [&gurl](URLPattern pattern){
+        return pattern.MatchesURL(gurl);
+      });
+}
+
 std::string GetGoogleTagManagerPolyfillJS() {
   static std::string base64_output;
   if (base64_output.length() != 0)  {
@@ -142,6 +157,13 @@ int OnBeforeStartTransaction_SiteHacksWork(net::URLRequest* request,
     request->Cancel();
     return net::ERR_ABORTED;
   }
+  if (IsUAWhitelisted(request->url())) {
+    std::string user_agent;
+    if (headers->GetHeader(kUserAgentHeader, &user_agent)) {
+      base::ReplaceFirstSubstringAfterOffset(&user_agent, 0, "Chrome", "Brave Chrome");
+      headers->SetHeader(kUserAgentHeader, user_agent);
+    }
+  }
   return net::OK;
 }
 

browser/net/brave_site_hacks_network_delegate_helper_unittest.cc

@@ -65,7 +65,8 @@ TEST_F(BraveSiteHacksNetworkDelegateHelperTest, RedirectsToEmptyDataURLs) {
           brave_request_info);
     EXPECT_EQ(ret, net::OK);
     EXPECT_STREQ(new_url.spec().c_str(), kEmptyDataURI);
-  }); }
+  });
+}
 
 TEST_F(BraveSiteHacksNetworkDelegateHelperTest, RedirectsToStubs) {
   std::vector<GURL> urls({
@@ -217,5 +218,77 @@ TEST_F(BraveSiteHacksNetworkDelegateHelperTest, TwitterNoCancelWithReferer) {
   EXPECT_EQ(ret, net::OK);
 }
 
+TEST_F(BraveSiteHacksNetworkDelegateHelperTest, UAWhitelistedTest) {
+  std::vector<GURL> urls({
+    GURL("https://adobe.com"),
+    GURL("https://adobe.com/something"),
+    GURL("https://duckduckgo.com"),
+    GURL("https://duckduckgo.com/something"),
+    GURL("https://brave.com"),
+    GURL("https://brave.com/something"),
+    GURL("https://netflix.com"),
+    GURL("https://netflix.com/something"),
+    GURL("https://a.adobe.com"),
+    GURL("https://a.duckduckgo.com"),
+    GURL("https://a.brave.com"),
+    GURL("https://a.netflix.com"),
+    GURL("https://a.adobe.com/something"),
+    GURL("https://a.duckduckgo.com/something"),
+    GURL("https://a.brave.com/something"),
+    GURL("https://a.netflix.com/something")
+  });
+  std::for_each(urls.begin(), urls.end(),
+      [this](GURL url){
+    net::TestDelegate test_delegate;
+    std::unique_ptr<net::URLRequest> request =
+        context()->CreateRequest(url, net::IDLE, &test_delegate,
+                                 TRAFFIC_ANNOTATION_FOR_TESTS);
+    net::HttpRequestHeaders headers;
+    headers.SetHeader(kUserAgentHeader,
+        "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36");
+    std::shared_ptr<brave::BraveRequestInfo>
+        brave_request_info(new brave::BraveRequestInfo());
+    brave::ResponseCallback callback;
+    int ret = brave::OnBeforeStartTransaction_SiteHacksWork(request.get(), &headers,
+        callback, brave_request_info);
+    std::string user_agent;
+    headers.GetHeader(kUserAgentHeader, &user_agent);
+    EXPECT_EQ(ret, net::OK);
+    EXPECT_STREQ(user_agent.c_str(),
+        "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Brave Chrome/33.0.1750.117 Safari/537.36");
+  });
+}
+
+TEST_F(BraveSiteHacksNetworkDelegateHelperTest, NOTUAWhitelistedTest) {
+  std::vector<GURL> urls({
+    GURL("https://brianbondy.com"),
+    GURL("https://bravecombo.com"),
+    GURL("https://brave.example.com")
+  });
+  std::for_each(urls.begin(), urls.end(),
+      [this](GURL url){
+    net::TestDelegate test_delegate;
+    std::unique_ptr<net::URLRequest> request =
+        context()->CreateRequest(url, net::IDLE, &test_delegate,
+                                 TRAFFIC_ANNOTATION_FOR_TESTS);
+    net::HttpRequestHeaders headers;
+    headers.SetHeader(kUserAgentHeader,
+        "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36");
+    std::shared_ptr<brave::BraveRequestInfo>
+        brave_request_info(new brave::BraveRequestInfo());
+    brave::ResponseCallback callback;
+    int ret = brave::OnBeforeStartTransaction_SiteHacksWork(request.get(), &headers,
+        callback, brave_request_info);
+    std::string user_agent;
+    headers.GetHeader(kUserAgentHeader, &user_agent);
+    EXPECT_EQ(ret, net::OK);
+    EXPECT_STREQ(user_agent.c_str(),
+        "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36");
+  });
+}
 
 }  // namespace

common/network_constants.cc

@@ -5,11 +5,13 @@ const char kJSDataURLPrefix[] = "data:application/javascript;base64,";
 const char kGeoLocationsPattern[] = "https://www.googleapis.com/geolocation/v1/geolocate?key=*";
 const char kGoogleTagManagerPattern[] = "https://www.googletagmanager.com/gtm.js";
 const char kGoogleTagServicesPattern[] = "https://www.googletagservices.com/tag/js/gpt.js";
-const char kCookieHeader[] = "Cookie";
-// Intentional mispelling on referrer to match HTTP spec
-const char kRefererHeader[] = "Referer";
 const char kForbesPattern[] = "https://www.forbes.com/*";
 const char kForbesExtraCookies[] = "forbes_ab=true; welcomeAd=true; adblock_session=Off; dailyWelcomeCookie=true";
 const char kTwitterPattern[] = "https://*.twitter.com/*";
 const char kTwitterReferrer[] = "https://twitter.com/*";
 const char kTwitterRedirectURL[] = "https://mobile.twitter.com/i/nojs_router*";
+
+const char kCookieHeader[] = "Cookie";
+// Intentional mispelling on referrer to match HTTP spec
+const char kRefererHeader[] = "Referer";
+const char kUserAgentHeader[] = "User-Agent";

common/network_constants.h

@@ -6,13 +6,15 @@ extern const char kJSDataURLPrefix[];
 extern const char kGeoLocationsPattern[];
 extern const char kGoogleTagManagerPattern[];
 extern const char kGoogleTagServicesPattern[];
-extern const char kCookieHeader[];
-extern const char kRefererHeader[];
 extern const char kForbesPattern[];
 extern const char kForbesExtraCookies[];
 extern const char kTwitterPattern[];
 extern const char kTwitterReferrer[];
 extern const char kTwitterRedirectURL[];
 
+extern const char kCookieHeader[];
+extern const char kRefererHeader[];
+extern const char kUserAgentHeader[];
+
 #endif  // BRAVE_COMMON_NETWORK_CONSTANTS_H_