copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions 1

fix(ExH): Fix CF cookies interceptor (#1485)

Browse source 
* fix(ExH): Fix CF cookies interceptor

* No need getting cookies from system webview
This commit is contained in:
Cuong-Tran 2026-02-10 12:51:57 +07:00 committed by GitHub
parent 513e5e8dd3
commit b68444f3cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View file

@ -32,6 +32,7 @@ import exh.eh.EHentaiUpdateHelper
import exh.eh.EHentaiUpdateWorkerConstants import exh.eh.EHentaiUpdateWorkerConstants
import exh.eh.GalleryEntry import exh.eh.GalleryEntry
import exh.log.xLogD import exh.log.xLogD
import exh.log.xLogI
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata
import exh.metadata.metadata.EHentaiSearchMetadata.Companion.EH_GENRE_NAMESPACE import exh.metadata.metadata.EHentaiSearchMetadata.Companion.EH_GENRE_NAMESPACE
@ -960,10 +961,11 @@ class EHentai(
override val client = override val client =
network.client.newBuilder() network.client.newBuilder()
// .cookieJar(CookieJar.NO_COOKIES) // .cookieJar(CookieJar.NO_COOKIES)
.addInterceptor { chain -> // KMK -->
.addNetworkInterceptor { chain ->
// Keep only Cloudflare cookies from incoming cookies
val cfCookies = chain.request().header("Cookie")?.split("; ") val cfCookies = chain.request().header("Cookie")?.split("; ")
?.filter { ?.filter {
// KMK -->
// Only accept cookie in form of name=value // Only accept cookie in form of name=value
if (!it.contains("=")) return@filter false if (!it.contains("=")) return@filter false
val name = it.substringBefore("=").trim().lowercase() val name = it.substringBefore("=").trim().lowercase()
@ -972,6 +974,8 @@ class EHentai(
} }
// KMK --> // KMK -->
?.associate { it.substringBefore("=").trim() to it.substringAfter("=").trim() } ?.associate { it.substringBefore("=").trim() to it.substringAfter("=").trim() }
val newCookies = cookiesHeader(cfCookies ?: emptyMap())
xLogI("Overwritten Cookie: $newCookies")
// KMK <-- // KMK <--
val newReq = val newReq =
@ -979,7 +983,13 @@ class EHentai(
.request() .request()
.newBuilder() .newBuilder()
.removeHeader("Cookie") .removeHeader("Cookie")
.addHeader("Cookie", cookiesHeader(cfCookies ?: emptyMap())) // KMK -->
.apply {
if (newCookies.isNotBlank()) {
addHeader("Cookie", newCookies)
}
}
// KMK <--
.build() .build()
chain.proceed(newReq) chain.proceed(newReq)