From 921e9f96b9bec5e2bf8633947792d6991956507f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 17 Jul 2021 03:13:16 +0530 Subject: Refactor TOTP implementation and expand SteamGuard hacks (#1460) * UriTotpFinder: commonize query parameter handling * gitignore: add more IDEA files * TotpFinder: add `findIssuer` * PasswordEntry: don't eagerly fetch TOTP related fields * format-common: expand SteamGuard workaround * CHANGELOG: add SteamGuard workaround --- .../dev/msfjarvis/aps/util/totp/UriTotpFinder.kt | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt b/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt index fa8481a9..a420fe5d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt @@ -24,32 +24,29 @@ class UriTotpFinder @Inject constructor() : TotpFinder { } override fun findDigits(content: String): String { - content.split("\n".toRegex()).forEach { line -> - if (line.startsWith(TOTP_FIELDS[0]) && Uri.parse(line).getQueryParameter("digits") != null) { - return Uri.parse(line).getQueryParameter("digits")!! - } - } - return "6" + return getQueryParameter(content, "digits") ?: "6" } override fun findPeriod(content: String): Long { - content.split("\n".toRegex()).forEach { line -> - if (line.startsWith(TOTP_FIELDS[0]) && Uri.parse(line).getQueryParameter("period") != null) { - val period = Uri.parse(line).getQueryParameter("period")!!.toLongOrNull() - if (period != null && period > 0) return period - } - } - return 30 + return getQueryParameter(content, "period")?.toLongOrNull() ?: 30 } override fun findAlgorithm(content: String): String { + return getQueryParameter(content, "algorithm") ?: "sha1" + } + + override fun findIssuer(content: String): String? { + return getQueryParameter(content, "issuer") ?: Uri.parse(content).authority + } + + private fun getQueryParameter(content: String, parameterName: String): String? { content.split("\n".toRegex()).forEach { line -> - if (line.startsWith(TOTP_FIELDS[0]) && Uri.parse(line).getQueryParameter("algorithm") != null - ) { - return Uri.parse(line).getQueryParameter("algorithm")!! + val uri = Uri.parse(line) + if (line.startsWith(TOTP_FIELDS[0]) && uri.getQueryParameter(parameterName) != null) { + return uri.getQueryParameter(parameterName) } } - return "sha1" + return null } companion object { -- cgit v1.2.3