Fix network pattern checking (#28174)

* Fix network pattern checking

Fixes brave/brave-browser#44717

Author: bsclifton

browser/net/brave_static_redirect_network_delegate_helper.cc

@@ -88,6 +88,11 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
       URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS,
       kWidevineGoogleDlPrefix);
 
+  if (widevine_gvt1_pattern->MatchesURL(request_url) ||
+      widevine_google_dl_pattern->MatchesURL(request_url)) {
+    return net::OK;
+  }
+
   if (geo_pattern->MatchesURL(request_url)) {
     *new_url = GURL(BUILDFLAG(GOOGLEAPIS_URL));
     return net::OK;
@@ -156,16 +161,15 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
     *new_url = request_url.ReplaceComponents(replacements);
     return net::OK;
   }
-  if (gvt1_pattern->MatchesURL(request_url) &&
-      !widevine_gvt1_pattern->MatchesURL(request_url)) {
+
+  if (gvt1_pattern->MatchesURL(request_url)) {
     replacements.SetSchemeStr("https");
     replacements.SetHostStr(kBraveRedirectorProxy);
     *new_url = request_url.ReplaceComponents(replacements);
     return net::OK;
   }
 
-  if (googleDl_pattern->MatchesURL(request_url) &&
-      !widevine_google_dl_pattern->MatchesURL(request_url)) {
+  if (googleDl_pattern->MatchesURL(request_url)) {
     replacements.SetSchemeStr("https");
     replacements.SetHostStr(kBraveRedirectorProxy);
     *new_url = request_url.ReplaceComponents(replacements);

browser/net/brave_static_redirect_network_delegate_helper_unittest.cc

@@ -275,6 +275,19 @@ TEST(BraveStaticRedirectNetworkDelegateHelperTest, DontModifyGvt1ForWidevine) {
   EXPECT_EQ(rc, net::OK);
 }
 
+TEST(BraveStaticRedirectNetworkDelegateHelperTest, DontModifyGvt1ForWidevine2) {
+  const GURL url(
+      "http://r2---sn-n4v7sn7y.gvt1.com/edgedl/release2/chrome_component/"
+      "adpwdrehowm2a6w7spq52lx3eyla_4.10.2891.0/"
+      "oimompecagnajdejgnnjijobebaeigek_4.10.2891.0_mac_arm64_"
+      "adebp6igda2i2udepjmfqykgfjja.crx3");
+  auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
+  int rc =
+      OnBeforeURLRequest_StaticRedirectWork(ResponseCallback(), request_info);
+  EXPECT_EQ(request_info->new_url_spec, "");
+  EXPECT_EQ(rc, net::OK);
+}
+
 TEST(BraveStaticRedirectNetworkDelegateHelperTest,
      DontModifyGoogleDlForWidevine) {
   const GURL url(
@@ -289,6 +302,20 @@ TEST(BraveStaticRedirectNetworkDelegateHelperTest,
   EXPECT_EQ(rc, net::OK);
 }
 
+TEST(BraveStaticRedirectNetworkDelegateHelperTest,
+     DontModifyGoogleDlForWidevine2) {
+  const GURL url(
+      "http://dl.google.com/edgedl/release2/chrome_component/"
+      "adpwdrehowm2a6w7spq52lx3eyla_4.10.2891.0/"
+      "oimompecagnajdejgnnjijobebaeigek_4.10.2891.0_mac_arm64_"
+      "adebp6igda2i2udepjmfqykgfjja.crx3");
+  auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
+  int rc =
+      OnBeforeURLRequest_StaticRedirectWork(ResponseCallback(), request_info);
+  EXPECT_EQ(request_info->new_url_spec, "");
+  EXPECT_EQ(rc, net::OK);
+}
+
 TEST(BraveStaticRedirectNetworkDelegateHelperTest,
      ModifySafeBrowsingFileCheckURL) {
   brave::SetSafeBrowsingEndpointForTesting(true);