From c3f60e04d5a8696d67995acc2bf4ec99353d503c Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Tue, 28 May 2024 10:14:47 +0000
Subject: [PATCH] fix(pt/betteranime): Fix crashes + fix auto-login (#3270)

---
 src/pt/betteranime/build.gradle               |  2 +-
 .../pt/betteranime/RecaptchaV3Bypasser.kt     | 31 ++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/pt/betteranime/build.gradle b/src/pt/betteranime/build.gradle
index eb02af39d..04eb57b02 100644
--- a/src/pt/betteranime/build.gradle
+++ b/src/pt/betteranime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Better Anime'
     extClass = '.BetterAnime'
-    extVersionCode = 9
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/RecaptchaV3Bypasser.kt b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/RecaptchaV3Bypasser.kt
index d08a10673..8588c43d2 100644
--- a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/RecaptchaV3Bypasser.kt
+++ b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/RecaptchaV3Bypasser.kt
@@ -11,6 +11,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import uy.kohesive.injekt.injectLazy
 import java.io.ByteArrayInputStream
@@ -60,14 +61,25 @@ internal class RecaptchaV3Bypasser(private val client: OkHttpClient, private val
                     }
                 }
 
+                override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+                    if (url != null) {
+                        if (url.startsWith("data:")) return false
+                        if (url.startsWith("intent:")) return true
+                        val domain = url.toHttpUrl().host
+
+                        return !ALLOWED_HOSTS.contains(domain)
+                    }
+                    return true
+                }
+
                 override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
                     val url = request?.url.toString()
                     val reqHeaders = request?.requestHeaders.orEmpty()
                     // Our beloved token
-                    if (url.contains("/recaptcha/api2/anchor")) {
+                    if (url.contains("/recaptcha/api2/anchor") || url.contains("/recaptcha/api2/bframe")) {
                         // Injects the script to click on the captcha box
                         return injectScripts(url, reqHeaders, CLICK_BOX_SCRIPT, INTERCEPTOR_SCRIPT)
-                    } else if (reqHeaders.get("Accept").orEmpty().contains("text/html")) {
+                    } else if (reqHeaders.get("Accept").orEmpty().contains("text/html") && !url.startsWith("intent")) {
                         // Injects the XMLHttpRequest hack
                         return injectScripts(url, reqHeaders, INTERCEPTOR_SCRIPT)
                     }
@@ -94,9 +106,11 @@ internal class RecaptchaV3Bypasser(private val client: OkHttpClient, private val
         .mapValues { it.value.getOrNull(0) ?: "" }
         .toMutableMap()
         .apply {
-            remove("cross-origin-embedder-policy")
             remove("content-security-policy")
+            remove("cross-origin-embedder-policy")
+            remove("cross-origin-resource-policy")
             remove("report-to")
+            remove("x-xss-protection")
         }
 
     private fun injectScripts(
@@ -149,7 +163,16 @@ window.XMLHttpRequest.prototype.open = function(_unused_method, url, _unused_arg
 private const val CLICK_BOX_SCRIPT = """
 <script type="text/javascript">
 setInterval(async () => {
-    const items = document.querySelectorAll("#recaptcha-anchor, .recaptcha-checkbox, #rc-anchor-container span[role=checkbox]")
+    const items = document.querySelectorAll(".recaptcha-checkbox-checkmark, #recaptcha-anchor, .recaptcha-checkbox, #rc-anchor-container span[role=checkbox]")
     items.forEach(x => {try { x.click() } catch (e) {} })
 }, 500)
 </script>"""
+
+private val ALLOWED_HOSTS = listOf(
+    "www.google.com",
+    "betteranime.net",
+    "fonts.googleapis.com",
+    "cdnjs.cloudflare.com",
+    "cdn.jsdelivr.net",
+    "www.gstatic.com",
+)