From b2eb150c0faff4cf1c1c3bc6c1da23695914d47f Mon Sep 17 00:00:00 2001 From: Dan Ho Date: Thu, 14 Mar 2019 08:16:24 +0800 Subject: Read OTP digits, algorithm, period from uri, support Steam Guard --- .../main/java/com/zeapo/pwdstore/PasswordEntry.kt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt index 757681c5..82204317 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt @@ -11,7 +11,10 @@ import java.io.UnsupportedEncodingException class PasswordEntry(private val content: String) { val password: String val username: String? + val digits: String? val totpSecret: String? + val totpPeriod: Long + val totpAlgorithm: String val hotpSecret: String? val hotpCounter: Long? var extraContent: String? = null @@ -24,7 +27,10 @@ class PasswordEntry(private val content: String) { init { val passContent = content.split("\n".toRegex(), 2).toTypedArray() password = passContent[0] + digits = findOtpDigits(content) totpSecret = findTotpSecret(content) + totpPeriod = findTotpPeriod(content) + totpAlgorithm = findTotpAlgorithm(content) hotpSecret = findHotpSecret(content) hotpCounter = findHotpCounter(content) extraContent = findExtraContent(passContent) @@ -81,6 +87,36 @@ class PasswordEntry(private val content: String) { return null } + private fun findOtpDigits(decryptedContent: String): String? { + decryptedContent.split("\n".toRegex()).forEach { line -> + if (line.startsWith("otpauth://totp/")) { + return Uri.parse(line).getQueryParameter("digits") + } + if (line.startsWith("otpauth://hotp/")) { + return Uri.parse(line).getQueryParameter("digits") + } + } + return "6" + } + + private fun findTotpPeriod(decryptedContent: String): Long { + decryptedContent.split("\n".toRegex()).forEach { line -> + if (line.startsWith("otpauth://totp/") && Uri.parse(line).getQueryParameter("period") != null) { + return java.lang.Long.parseLong(Uri.parse(line).getQueryParameter("period")!!) + } + } + return 30 + } + + private fun findTotpAlgorithm(decryptedContent: String): String { + decryptedContent.split("\n".toRegex()).forEach { line -> + if (line.startsWith("otpauth://totp/") && Uri.parse(line).getQueryParameter("algorithm") != null) { + return Uri.parse(line).getQueryParameter("algorithm") + } + } + return "sha1" + } + private fun findHotpSecret(decryptedContent: String): String? { decryptedContent.split("\n".toRegex()).forEach { line -> if (line.startsWith("otpauth://hotp/")) { -- cgit v1.2.3 From f5139320dbb8be38af7b5b519a29cd06ec5cd30a Mon Sep 17 00:00:00 2001 From: Dan Ho Date: Fri, 15 Mar 2019 22:20:30 +0800 Subject: break several lines to limit the line length --- app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt | 17 ++++++++--------- .../main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 6 +++++- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt index 82204317..2b1f1eee 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt @@ -89,19 +89,17 @@ class PasswordEntry(private val content: String) { private fun findOtpDigits(decryptedContent: String): String? { decryptedContent.split("\n".toRegex()).forEach { line -> - if (line.startsWith("otpauth://totp/")) { - return Uri.parse(line).getQueryParameter("digits") - } - if (line.startsWith("otpauth://hotp/")) { - return Uri.parse(line).getQueryParameter("digits") - } + if (line.startsWith("optauth://totp/") || + line.startsWith("otpauth://hotp/")) + return Uri.parse(line).getQueryParameters("digits").toString() } return "6" } private fun findTotpPeriod(decryptedContent: String): Long { decryptedContent.split("\n".toRegex()).forEach { line -> - if (line.startsWith("otpauth://totp/") && Uri.parse(line).getQueryParameter("period") != null) { + if (line.startsWith("otpauth://totp/") && + Uri.parse(line).getQueryParameter("period") != null) { return java.lang.Long.parseLong(Uri.parse(line).getQueryParameter("period")!!) } } @@ -110,8 +108,9 @@ class PasswordEntry(private val content: String) { private fun findTotpAlgorithm(decryptedContent: String): String { decryptedContent.split("\n".toRegex()).forEach { line -> - if (line.startsWith("otpauth://totp/") && Uri.parse(line).getQueryParameter("algorithm") != null) { - return Uri.parse(line).getQueryParameter("algorithm") + if (line.startsWith("otpauth://totp/") && + Uri.parse(line).getQueryParameter("algorithm") != null) { + return Uri.parse(line).getQueryParameter("algorithm")!! } } return "sha1" diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index 055f50bf..dc9d399f 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -312,7 +312,11 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { ) } crypto_otp_show.text = - Otp.calculateCode(entry.totpSecret, Date().time / (1000 * entry.totpPeriod), entry.totpAlgorithm, entry.digits) + Otp.calculateCode( + entry.totpSecret, + Date().time / (1000 * entry.totpPeriod), + entry.totpAlgorithm, + entry.digits) } else { // we only want to calculate and show HOTP if the user requests it crypto_copy_otp.setOnClickListener { -- cgit v1.2.3 From 9137dadcbd7427569f85d6349ddb0190c1c09bb7 Mon Sep 17 00:00:00 2001 From: Dan Ho Date: Fri, 15 Mar 2019 22:49:14 +0800 Subject: minor spelling mistake fix --- app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt | 12 +++++++----- app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt index 2b1f1eee..392bc749 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordEntry.kt @@ -11,7 +11,7 @@ import java.io.UnsupportedEncodingException class PasswordEntry(private val content: String) { val password: String val username: String? - val digits: String? + val digits: String val totpSecret: String? val totpPeriod: Long val totpAlgorithm: String @@ -87,11 +87,13 @@ class PasswordEntry(private val content: String) { return null } - private fun findOtpDigits(decryptedContent: String): String? { + private fun findOtpDigits(decryptedContent: String): String { decryptedContent.split("\n".toRegex()).forEach { line -> - if (line.startsWith("optauth://totp/") || - line.startsWith("otpauth://hotp/")) - return Uri.parse(line).getQueryParameters("digits").toString() + if (line.startsWith("otpauth://totp/") || + line.startsWith("otpauth://hotp/") && + Uri.parse(line).getQueryParameter("digits") != null) { + return Uri.parse(line).getQueryParameter("digits")!! + } } return "6" } diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index dc9d399f..4e3b756c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -316,7 +316,8 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { entry.totpSecret, Date().time / (1000 * entry.totpPeriod), entry.totpAlgorithm, - entry.digits) + entry.digits + ) } else { // we only want to calculate and show HOTP if the user requests it crypto_copy_otp.setOnClickListener { -- cgit v1.2.3