fix(flaresolverr): support possible rewrite flaresolverr (#1020)

This PR:
https://github.com/FlareSolverr/FlareSolverr/pull/1300

Solve a lot of issue with not solving challenge, however, the cookie don't have path, httpOnly, secure and sameSite.

By making them optional that should work for both version of flaresolverr.
This commit is contained in:
Antoine Aflalo
2024-08-31 18:55:02 -04:00
committed by GitHub
parent 5dced82e5a
commit 301980ab14

View File

@@ -153,13 +153,13 @@ object CFClearance {
val name: String, val name: String,
val value: String, val value: String,
val domain: String, val domain: String,
val path: String, val path: String? = null,
val expires: Double? = null, val expires: Double? = null,
val size: Int? = null, val size: Int? = null,
val httpOnly: Boolean, val httpOnly: Boolean? = null,
val secure: Boolean, val secure: Boolean? = null,
val session: Boolean? = null, val session: Boolean? = null,
val sameSite: String, val sameSite: String? = null,
) )
@Serializable @Serializable
@@ -228,11 +228,11 @@ object CFClearance {
.name(cookie.name) .name(cookie.name)
.value(cookie.value) .value(cookie.value)
.domain(cookie.domain.removePrefix(".")) .domain(cookie.domain.removePrefix("."))
.path(cookie.path)
.expiresAt(cookie.expires?.takeUnless { it < 0.0 }?.toLong() ?: Long.MAX_VALUE) .expiresAt(cookie.expires?.takeUnless { it < 0.0 }?.toLong() ?: Long.MAX_VALUE)
.also { .also {
if (cookie.httpOnly) it.httpOnly() if (cookie.httpOnly != null && cookie.httpOnly) it.httpOnly()
if (cookie.secure) it.secure() if (cookie.secure != null && cookie.secure) it.secure()
if (!cookie.path.isNullOrEmpty()) it.path(cookie.path)
} }
.build() .build()
} }