temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-04 11:24:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add setting to use the flaresolverr response (#990)

Browse Source
This commit is contained in:
AeonLucid
2024-07-28 21:57:40 +02:00
committed by GitHub
parent 25a62e33a1
commit 9e006166a8
6 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
View File

@@ -23,6 +23,7 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import okhttp3.ResponseBody.Companion.toResponseBody
import suwayomi.tachidesk.server.serverConfig
import uy.kohesive.injekt.injectLazy
import java.io.IOException
@@ -56,11 +57,38 @@ class CloudflareInterceptor(
originalResponse.close()
// network.cookieStore.remove(originalRequest.url.toUri())
val request =
val flareResponseFallback = serverConfig.flareSolverrAsResponseFallback.value
val flareResponse =
runBlocking {
CFClearance.resolveWithFlareSolverr(setUserAgent, originalRequest)
CFClearance.resolveWithFlareSolver(originalRequest, !flareResponseFallback)
}
if (flareResponse.message.contains("not detected", ignoreCase = true)) {
logger.debug { "FlareSolverr failed to detect Cloudflare challenge" }
if (flareResponseFallback &&
flareResponse.solution.status in 200..299 &&
flareResponse.solution.response != null
) {
val isImage = flareResponse.solution.response.contains(CHROME_IMAGE_TEMPLATE_REGEX)
if (!isImage) {
logger.debug { "Falling back to FlareSolverr response" }
setUserAgent(flareResponse.solution.userAgent)
return originalResponse
.newBuilder()
.code(flareResponse.solution.status)
.body(flareResponse.solution.response.toResponseBody())
.build()
} else {
logger.debug { "FlareSolverr response is an image html template, not falling back" }
}
}
}
val request = CFClearance.requestWithFlareSolverr(flareResponse, setUserAgent, originalRequest)
chain.proceed(request)
} catch (e: Exception) {
// Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
@@ -73,6 +101,7 @@ class CloudflareInterceptor(
private val ERROR_CODES = listOf(403, 503)
private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
private val COOKIE_NAMES = listOf("cf_clearance")
private val CHROME_IMAGE_TEMPLATE_REGEX = Regex("""<title>(.*?) \(\d+×\d+\)</title>""")
}
}
@@ -153,37 +182,43 @@ object CFClearance {
val version: String,
)
suspend fun resolveWithFlareSolverr(
suspend fun resolveWithFlareSolver(
originalRequest: Request,
onlyCookies: Boolean,
): FlareSolverResponse {
val timeout = serverConfig.flareSolverrTimeout.value.seconds
return with(json) {
mutex.withLock {
client.value.newCall(
POST(
url = serverConfig.flareSolverrUrl.value.removeSuffix("/") + "/v1",
body =
Json.encodeToString(
FlareSolverRequest(
"request.get",
originalRequest.url.toString(),
session = serverConfig.flareSolverrSessionName.value,
sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
cookies =
network.cookieStore.get(originalRequest.url).map {
FlareSolverCookie(it.name, it.value)
},
returnOnlyCookies = onlyCookies,
maxTimeout = timeout.inWholeMilliseconds.toInt(),
),
).toRequestBody(jsonMediaType),
),
).awaitSuccess().parseAs<FlareSolverResponse>()
}
}
}
fun requestWithFlareSolverr(
flareSolverResponse: FlareSolverResponse,
setUserAgent: (String) -> Unit,
originalRequest: Request,
): Request {
val timeout = serverConfig.flareSolverrTimeout.value.seconds
val flareSolverResponse =
with(json) {
mutex.withLock {
client.value.newCall(
POST(
url = serverConfig.flareSolverrUrl.value.removeSuffix("/") + "/v1",
body =
Json.encodeToString(
FlareSolverRequest(
"request.get",
originalRequest.url.toString(),
session = serverConfig.flareSolverrSessionName.value,
sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
cookies =
network.cookieStore.get(originalRequest.url).map {
FlareSolverCookie(it.name, it.value)
},
returnOnlyCookies = true,
maxTimeout = timeout.inWholeMilliseconds.toInt(),
),
).toRequestBody(jsonMediaType),
),
).awaitSuccess().parseAs<FlareSolverResponse>()
}
}
if (flareSolverResponse.solution.status in 200..299) {
setUserAgent(flareSolverResponse.solution.userAgent)
val cookies =