mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-28 03:57:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure app waits for Cloudflare challenge to complete before continuing (#2200)

Browse Source 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
This commit is contained in:
AwkwardPeak7
2025-06-13 22:24:13 +05:00
committed by GitHub
parent ee19050cc0
commit 2df3382148
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
View File

@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.network.interceptor
import android.annotation.SuppressLint
import android.content.Context
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.Toast
@ -16,6 +16,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import org.jsoup.Jsoup
import tachiyomi.core.common.i18n.stringResource
import tachiyomi.i18n.MR
import java.io.IOException
@ -31,7 +32,18 @@ class CloudflareInterceptor(
override fun shouldIntercept(response: Response): Boolean {
// Check if Cloudflare anti-bot is on
return response.code in ERROR_CODES && response.header("Server") in SERVER_CHECK
return if (response.code in ERROR_CODES && response.header("Server") in SERVER_CHECK) {
val document = Jsoup.parse(
response.peekBody(Long.MAX_VALUE).string(),
response.request.url.toString(),
)
// solve with webview only on captcha, not on geo block
document.getElementById("challenge-error-title") != null ||
document.getElementById("challenge-error-text") != null
} else {
false
}
}
override fun intercept(
@ -94,9 +106,13 @@ class CloudflareInterceptor(
}
}
override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
if (request.isForMainFrame) {
if (error.errorCode in ERROR_CODES) {
override fun onReceivedHttpError(
view: WebView?,
request: WebResourceRequest?,
errorResponse: WebResourceResponse?,
) {
if (request?.isForMainFrame == true) {
if (errorResponse?.statusCode in ERROR_CODES) {
// Found the Cloudflare challenge page.
challengeFound = true
} else {