Fix #5373: Add regex debouncing

brave · Jul 11, 2022 · 9b1ad98 · 9b1ad98
1 parent 5ec87e7
commit 9b1ad98
Show file tree

Hide file tree

Showing 7 changed files with 777 additions and 224 deletions.
diff --git a/...t/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...t/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -202,20 +202,37 @@ extension BrowserViewController: WKNavigationDelegate {
        let currentURL = tab?.webView?.url,
        currentURL.baseDomain != url.baseDomain,
        domainForRequestURL.isShieldExpected(.AdblockAndTp, considerAllShieldsOption: true),
-       navigationAction.targetFrame?.isMainFrame == true,
-       let redirectURL = DebouncingResourceDownloader.shared.redirectURL(for: url) {
-      // Cancel the original request. We don't want it to load as it's tracking us
-      decisionHandler(.cancel, preferences)
+       navigationAction.targetFrame?.isMainFrame == true {
+
+      // Lets get the redirect chain.
+      // Then we simply get all elements up until the user allows us to redirect
+      // (i.e. appropriate settings are enabled for that redirect rule)
+      let redirectChain = DebouncingResourceDownloader.shared
+        .redirectChain(for: url)
+        .contiguousUntil { _, rule in
+          return rule.preferences.allSatisfy { pref in
+            switch pref {
+            case .deAmpEnabled:
+              return Preferences.Shields.autoRedirectAMPPages.value
+            }
+          }
+        }
+
+      // Once we check the redirect chain only need the last (final) url from our redirect chain
+      if let redirectURL = redirectChain.last?.url {
+        // Cancel the original request. We don't want it to load as it's tracking us
+        decisionHandler(.cancel, preferences)
 
-      // For now we only allow the `Referer`. The browser will other headers during navigation.
-      var modifiedRequest = URLRequest(url: redirectURL)
+        // For now we only allow the `Referer`. The browser will add other headers during navigation.
+        var modifiedRequest = URLRequest(url: redirectURL)
 
-      for (headerKey, headerValue) in navigationAction.request.allHTTPHeaderFields ?? [:] {
-        guard headerKey == "Referer" else { continue }
-        modifiedRequest.setValue(headerValue, forHTTPHeaderField: headerKey)
-      }
+        for (headerKey, headerValue) in navigationAction.request.allHTTPHeaderFields ?? [:] {
+          guard headerKey == "Referer" else { continue }
+          modifiedRequest.setValue(headerValue, forHTTPHeaderField: headerKey)
+        }
 
-      tab?.loadRequest(modifiedRequest)
+        tab?.loadRequest(modifiedRequest)
+      }
     }
 
     // Add de-amp script