diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index be1b29ed05..bf9d5f6dc9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -23,6 +23,14 @@ internal object LoginFlows { override val userAgent: String get() = GogAuth.GALAXY_UA override fun isRedirect(url: String): Boolean = url.startsWith(GogAuth.REDIRECT_PREFIX) + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(GogAuth.SIGN_IN_URLS, GogAuth.COOKIE_DOMAIN, listOf("/")) { done() } } + .onFailure { + Log.w(TAG, "gog: could not clear the previous web sign-in: ${it.javaClass.simpleName}") + done() + } + } + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { val fragment = Uri.parse(url).fragment ?: return activity.getString(com.droiddeck.launcher.R.string.stores_login_error_verification) val frag = Uri.parse("x://x?$fragment") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 2416358432..1951ffd470 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -38,6 +38,7 @@ class StoreLoginActivity : ComponentActivity() { const val EXTRA_STORE = "store" const val EXTRA_CLIENT_URL = "client_url" private const val KEY_STATE = "oauth_state" + private const val KEY_SIGN_IN_CLEARED = "sign_in_cleared" @Volatile internal var floodColor: Int? = null internal const val CHROME_UA = "Mozilla/5.0 (Linux; Android 14; SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36" @@ -54,6 +55,7 @@ class StoreLoginActivity : ComponentActivity() { fun isRedirect(url: String): Boolean fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? val readsPage: Boolean get() = false + fun forgetSignIn(done: () -> Unit) = done() } private var store: Store? = null @@ -74,6 +76,7 @@ class StoreLoginActivity : ComponentActivity() { private var oauthState: String? = null private val captured = AtomicBoolean(false) private var flooded = false + private var signInCleared = false private fun dp(value: Int): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value.toFloat(), resources.displayMetrics).toInt() @@ -109,7 +112,13 @@ class StoreLoginActivity : ComponentActivity() { } } }) - webView.loadUrl(flow!!.startUrl) + val start = flow!!.startUrl + signInCleared = savedInstanceState?.getBoolean(KEY_SIGN_IN_CLEARED) == true + if (signInCleared) webView.loadUrl(start) + else flow!!.forgetSignIn { + signInCleared = true + if (!isDestroyed) webView.loadUrl(start) + } } private fun newFlow(state: String): Flow? { @@ -330,6 +339,7 @@ class StoreLoginActivity : ComponentActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) oauthState?.let { outState.putString(KEY_STATE, it) } + outState.putBoolean(KEY_SIGN_IN_CLEARED, signInCleared) } override fun onStart() { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt b/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt new file mode 100644 index 0000000000..b44a274c50 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.stores + +import android.net.Uri +import android.webkit.CookieManager + +internal object WebCookies { + fun expired(header: String?, domain: String, paths: List, host: String? = null): List { + val domains = listOfNotNull(domain, host?.takeIf { it.endsWith(domain) }) + return header.orEmpty().split(';').map { it.substringBefore('=').trim() }.filter { it.isNotEmpty() }.distinct() + .flatMap { name -> + paths.flatMap { path -> + listOf("$name=; Max-Age=0; Path=$path; Secure") + domains.map { "$name=; Max-Age=0; Path=$path; Secure; Domain=$it" } + } + } + } + + fun expire(urls: List, domain: String, paths: List, done: (Int) -> Unit) { + val cookies = CookieManager.getInstance() + val lines = urls.flatMap { url -> expired(cookies.getCookie(url), domain, paths, Uri.parse(url).host).map { url to it } } + if (lines.isEmpty()) { + done(0) + return + } + var left = lines.size + for ((url, line) in lines) { + cookies.setCookie(url, line) { + if (--left == 0) { + cookies.flush() + done(lines.size) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt index a1bad46229..1f8a6ba9d0 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt @@ -21,6 +21,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLog import com.droiddeck.launcher.stores.StoreLoginActivity import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.WebCookies import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.SteamLiveShortcuts @@ -108,28 +109,15 @@ object EpicClient { fun forgetWebSignIn() { android.os.Handler(android.os.Looper.getMainLooper()).post { runCatching { - val cookies = android.webkit.CookieManager.getInstance() - var cleared = 0 - for (url in COOKIE_URLS) { - val lines = expiredCookies(cookies.getCookie(url), Uri.parse(url).host) - for (line in lines) cookies.setCookie(url, line) - cleared += lines.size + WebCookies.expire(COOKIE_URLS, COOKIE_DOMAIN, COOKIE_PATHS) { cleared -> + Log.i(TAG, "cleared the Epic web sign-in ($cleared cookie lines)") } - cookies.flush() - Log.i(TAG, "cleared the Epic web sign-in ($cleared cookie lines)") }.onFailure { Log.w(TAG, "could not clear the Epic web sign-in: ${it.javaClass.simpleName}") } } } - internal fun expiredCookies(header: String?, host: String? = null): List { - val domains = listOfNotNull(COOKIE_DOMAIN, host?.takeIf { it.endsWith(COOKIE_DOMAIN) }) - return header.orEmpty().split(';').map { it.substringBefore('=').trim() }.filter { it.isNotEmpty() }.distinct() - .flatMap { name -> - COOKIE_PATHS.flatMap { path -> - listOf("$name=; Max-Age=0; Path=$path; Secure") + domains.map { "$name=; Max-Age=0; Path=$path; Secure; Domain=$it" } - } - } - } + internal fun expiredCookies(header: String?, host: String? = null): List = + WebCookies.expired(header, COOKIE_DOMAIN, COOKIE_PATHS, host) fun read(context: Context): Status { val app = context.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt index 2de0880bd1..8e58fab033 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt @@ -20,6 +20,8 @@ object GogAuth { "&redirect_uri=https%3A%2F%2Fembed.gog.com%2Fon_login_success%3Forigin%3Dclient&response_type=token&layout=client2" const val REDIRECT_PREFIX = "https://embed.gog.com/on_login_success" const val GALAXY_UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) GOG Galaxy/2.0" + const val COOKIE_DOMAIN = ".gog.com" + val SIGN_IN_URLS = listOf("https://login.gog.com/", "https://auth.gog.com/") fun authUrl(state: String): String = "$AUTH_URL&state=${Uri.encode(state)}" diff --git a/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt new file mode 100644 index 0000000000..ec8c63d100 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.stores + +import com.droiddeck.launcher.stores.gog.GogAuth +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class WebCookiesTest { + @Test fun gogLoginCookiesAreExpiredOnTheLoginHostAndTheDomain() { + val lines = WebCookies.expired("galaxy-login-s=a; galaxy-login-tsa=b; galaxy-login-al=c", GogAuth.COOKIE_DOMAIN, listOf("/"), "login.gog.com") + assertEquals(9, lines.size) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure")) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure; Domain=.gog.com")) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure; Domain=login.gog.com")) + assertTrue(lines.none { it.startsWith("galaxy-login-al=c") }) + assertEquals(emptyList(), WebCookies.expired(null, GogAuth.COOKIE_DOMAIN, listOf("/"), "login.gog.com")) + } +}