MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix oversight when cookies are already stored in cloudflare

Browse source
This commit is contained in:
Blatzar 2022-08-21 20:51:01 +02:00
parent 5b5f5e1482
commit a273be6d89
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
View file

@ -23,16 +23,21 @@ class CloudflareKiller : Interceptor {
} }
} }
val savedCookies: MutableMap<String, String> = mutableMapOf() val savedCookies: MutableMap<String, Map<String, String>> = mutableMapOf()
override fun intercept(chain: Interceptor.Chain): Response = runBlocking { override fun intercept(chain: Interceptor.Chain): Response = runBlocking {
val request = chain.request() val request = chain.request()
if (savedCookies[request.url.host] == null) { val cookies = savedCookies[request.url.host]
if (cookies == null) {
bypassCloudflare(request)?.let { bypassCloudflare(request)?.let {
Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}") Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}")
return@runBlocking it return@runBlocking it
} }
} else {
return@runBlocking proceed(request, cookies)
} }
debugWarning({ true }) { "Failed cloudflare at: ${request.url}" } debugWarning({ true }) { "Failed cloudflare at: ${request.url}" }
return@runBlocking chain.proceed(request) return@runBlocking chain.proceed(request)
} }
@ -49,11 +54,25 @@ class CloudflareKiller : Interceptor {
// Not sure if this takes expiration into account // Not sure if this takes expiration into account
return getWebViewCookie(request.url.toString())?.let { cookie -> return getWebViewCookie(request.url.toString())?.let { cookie ->
cookie.contains("cf_clearance").also { solved -> cookie.contains("cf_clearance").also { solved ->
if (solved) savedCookies[request.url.host] = cookie if (solved) savedCookies[request.url.host] = parseCookieMap(cookie)
} }
} ?: false } ?: false
} }
private suspend fun proceed(request: Request, cookies: Map<String, String>): Response {
val userAgentMap = WebViewResolver.getWebViewUserAgent()?.let {
mapOf("user-agent" to it)
} ?: emptyMap()
val headers =
getHeaders(request.headers.toMap() + userAgentMap, cookies + request.cookies)
return app.baseClient.newCall(
request.newBuilder()
.headers(headers)
.build()
).await()
}
private suspend fun bypassCloudflare(request: Request): Response? { private suspend fun bypassCloudflare(request: Request): Response? {
val url = request.url.toString() val url = request.url.toString()
@ -78,17 +97,6 @@ class CloudflareKiller : Interceptor {
} }
val cookies = savedCookies[request.url.host] ?: return null val cookies = savedCookies[request.url.host] ?: return null
return proceed(request, cookies)
val mappedCookies = parseCookieMap(cookies)
val userAgentMap = WebViewResolver.getWebViewUserAgent()?.let {
mapOf("user-agent" to it)
} ?: emptyMap()
val headers = getHeaders(request.headers.toMap() + userAgentMap, mappedCookies + request.cookies)
return app.baseClient.newCall(
request.newBuilder()
.headers(headers)
.build()
).await()
} }
} }