mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-06 09:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Login edgecase fix

Browse source
This commit is contained in:
Kelvin 2025-05-05 11:18:46 +02:00
commit 35dc186395
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/futo/platformplayer/Extensions_Formatting.kt
View file

@ -399,9 +399,11 @@ fun String.matchesDomain(queryDomain: String): Boolean {
fun String.getSubdomainWildcardQuery(): String { fun String.getSubdomainWildcardQuery(): String {
val domainParts = this.split("."); val domainParts = this.split(".");
val sldParts = "." + domainParts[domainParts.size - 2].lowercase() + "." + domainParts[domainParts.size - 1].lowercase(); var wildcardDomain = if(domainParts.size > 2)
if(slds.contains(sldParts)) "." + domainParts.drop(1).joinToString(".")
return "." + domainParts.drop(domainParts.size - 3).joinToString(".");
else else
return "." + domainParts.drop(domainParts.size - 2).joinToString("."); "." + domainParts.joinToString(".");
if(slds.contains(wildcardDomain.lowercase()))
"." + domainParts.joinToString(".");
return wildcardDomain;
} }

2
app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt
View file

@ -113,7 +113,7 @@ class LoginWebViewClient : WebViewClient {
//val domainParts = domain!!.split("."); //val domainParts = domain!!.split(".");
//val cookieDomain = "." + domainParts.drop(domainParts.size - 2).joinToString("."); //val cookieDomain = "." + domainParts.drop(domainParts.size - 2).joinToString(".");
val cookieDomain = domain!!.getSubdomainWildcardQuery(); val cookieDomain = domain!!.getSubdomainWildcardQuery();
if(_pluginConfig == null || _pluginConfig.allowUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) }) if(_pluginConfig == null || _pluginConfig.allowUrls.any { it == "everywhere" || domain.matchesDomain(it) })
_authConfig.cookiesToFind?.let { cookiesToFind -> _authConfig.cookiesToFind?.let { cookiesToFind ->
val cookies = cookieString.split(";"); val cookies = cookieString.split(";");
for(cookieStr in cookies) { for(cookieStr in cookies) {

2
app/src/main/java/com/futo/platformplayer/others/WebViewRequirementExtractor.kt
View file

@ -67,7 +67,7 @@ class WebViewRequirementExtractor {
if(cookieString != null) { if(cookieString != null) {
//val domainParts = domain!!.split("."); //val domainParts = domain!!.split(".");
val cookieDomain = domain!!.getSubdomainWildcardQuery()//"." + domainParts.drop(domainParts.size - 2).joinToString("."); val cookieDomain = domain!!.getSubdomainWildcardQuery()//"." + domainParts.drop(domainParts.size - 2).joinToString(".");
if(allowedUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) }) if(allowedUrls.any { it == "everywhere" || domain.matchesDomain(it) })
cookiesToFind?.let { cookiesToFind -> cookiesToFind?.let { cookiesToFind ->
val cookies = cookieString.split(";"); val cookies = cookieString.split(";");
for(cookieStr in cookies) { for(cookieStr in cookies) {