mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-04 21:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: regex OTP recognition #1596

Browse source
This commit is contained in:
J-Jamet 2023-11-04 16:03:20 +01:00
parent 68cbdae8e0
commit 815fb911d6
4 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -1,6 +1,7 @@
KeePassDX(4.0.3) KeePassDX(4.0.3)
* Fix "Save as" in Read Only mode #1666 * Fix "Save as" in Read Only mode #1666
* Fix username autofill #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667 * Fix username autofill #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667
* Fix regex OTP recognition #1596
KeePassDX(4.0.2) KeePassDX(4.0.2)
* Fix Autofill with API 33 * Fix Autofill with API 33

32
database/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt
View file

@ -50,7 +50,7 @@ object OtpEntryFields {
private const val COUNTER_URL_PARAM = "counter" private const val COUNTER_URL_PARAM = "counter"
// OTPauth URI // OTPauth URI
private const val REGEX_OTP_AUTH = "^(?:otpauth://([ht]otp)/)(?:(?:([^:?#]*): *)?([^:?#]*))(?:\\?([^#]+))$" private const val REGEX_OTP_AUTH = "^otpauth://([ht]otp)/?(?:([^:?#]*): *)?([^:?#]*)\\?([^#]+)$"
// Key-values (maybe from plugin or old KeePassXC) // Key-values (maybe from plugin or old KeePassXC)
private const val SEED_KEY = "key" private const val SEED_KEY = "key"
@ -140,7 +140,7 @@ object OtpEntryFields {
*/ */
private fun parseOTPUri(getField: (id: String) -> String?, otpElement: OtpElement): Boolean { private fun parseOTPUri(getField: (id: String) -> String?, otpElement: OtpElement): Boolean {
val otpPlainText = getField(OTP_FIELD) val otpPlainText = getField(OTP_FIELD)
if (otpPlainText != null && otpPlainText.isNotEmpty() && isOTPUri(otpPlainText)) { if (!otpPlainText.isNullOrEmpty() && isOTPUri(otpPlainText)) {
val uri = Uri.parse(otpPlainText.removeSpaceChars()) val uri = Uri.parse(otpPlainText.removeSpaceChars())
if (uri.scheme == null || OTP_SCHEME != uri.scheme!!.lowercase(Locale.ENGLISH)) { if (uri.scheme == null || OTP_SCHEME != uri.scheme!!.lowercase(Locale.ENGLISH)) {
@ -171,7 +171,7 @@ object OtpEntryFields {
} }
val nameParam = validateAndGetNameInPath(uri.path) val nameParam = validateAndGetNameInPath(uri.path)
if (nameParam != null && nameParam.isNotEmpty()) { if (!nameParam.isNullOrEmpty()) {
val userIdArray = nameParam.split(":", "%3A") val userIdArray = nameParam.split(":", "%3A")
if (userIdArray.size > 1) { if (userIdArray.size > 1) {
otpElement.issuer = userIdArray[0].removeLineChars() otpElement.issuer = userIdArray[0].removeLineChars()
@ -182,11 +182,11 @@ object OtpEntryFields {
} }
val issuerParam = uri.getQueryParameter(ISSUER_URL_PARAM) val issuerParam = uri.getQueryParameter(ISSUER_URL_PARAM)
if (issuerParam != null && issuerParam.isNotEmpty()) if (!issuerParam.isNullOrEmpty())
otpElement.issuer = issuerParam.removeLineChars() otpElement.issuer = issuerParam.removeLineChars()
val secretParam = uri.getQueryParameter(SECRET_URL_PARAM) val secretParam = uri.getQueryParameter(SECRET_URL_PARAM)
if (secretParam != null && secretParam.isNotEmpty()) { if (!secretParam.isNullOrEmpty()) {
try { try {
otpElement.setBase32Secret(secretParam) otpElement.setBase32Secret(secretParam)
} catch (exception: Exception) { } catch (exception: Exception) {
@ -195,11 +195,11 @@ object OtpEntryFields {
} }
val encoderParam = uri.getQueryParameter(ENCODER_URL_PARAM) val encoderParam = uri.getQueryParameter(ENCODER_URL_PARAM)
if (encoderParam != null && encoderParam.isNotEmpty()) if (!encoderParam.isNullOrEmpty())
otpElement.tokenType = OtpTokenType.getFromString(encoderParam) otpElement.tokenType = OtpTokenType.getFromString(encoderParam)
val digitsParam = uri.getQueryParameter(DIGITS_URL_PARAM) val digitsParam = uri.getQueryParameter(DIGITS_URL_PARAM)
if (digitsParam != null && digitsParam.isNotEmpty()) if (!digitsParam.isNullOrEmpty())
try { try {
otpElement.digits = digitsParam.toIntOrNull() ?: OTP_DEFAULT_DIGITS otpElement.digits = digitsParam.toIntOrNull() ?: OTP_DEFAULT_DIGITS
} catch (exception: Exception) { } catch (exception: Exception) {
@ -208,7 +208,7 @@ object OtpEntryFields {
} }
val counterParam = uri.getQueryParameter(COUNTER_URL_PARAM) val counterParam = uri.getQueryParameter(COUNTER_URL_PARAM)
if (counterParam != null && counterParam.isNotEmpty()) if (!counterParam.isNullOrEmpty())
try { try {
otpElement.counter = counterParam.toLongOrNull() ?: HOTP_INITIAL_COUNTER otpElement.counter = counterParam.toLongOrNull() ?: HOTP_INITIAL_COUNTER
} catch (exception: Exception) { } catch (exception: Exception) {
@ -217,7 +217,7 @@ object OtpEntryFields {
} }
val stepParam = uri.getQueryParameter(PERIOD_URL_PARAM) val stepParam = uri.getQueryParameter(PERIOD_URL_PARAM)
if (stepParam != null && stepParam.isNotEmpty()) if (!stepParam.isNullOrEmpty())
try { try {
otpElement.period = stepParam.toIntOrNull() ?: TOTP_DEFAULT_PERIOD otpElement.period = stepParam.toIntOrNull() ?: TOTP_DEFAULT_PERIOD
} catch (exception: Exception) { } catch (exception: Exception) {
@ -226,7 +226,7 @@ object OtpEntryFields {
} }
val algorithmParam = uri.getQueryParameter(ALGORITHM_URL_PARAM) val algorithmParam = uri.getQueryParameter(ALGORITHM_URL_PARAM)
if (algorithmParam != null && algorithmParam.isNotEmpty()) { if (!algorithmParam.isNullOrEmpty()) {
otpElement.algorithm = HashAlgorithm.fromString(algorithmParam) otpElement.algorithm = HashAlgorithm.fromString(algorithmParam)
} }
@ -253,12 +253,12 @@ object OtpEntryFields {
} }
} }
val issuer = val issuer =
if (title != null && title.isNotEmpty()) if (!title.isNullOrEmpty())
encodeParameter(title) encodeParameter(title)
else else
encodeParameter(otpElement.issuer) encodeParameter(otpElement.issuer)
val accountName = val accountName =
if (username != null && username.isNotEmpty()) if (!username.isNullOrEmpty())
encodeParameter(username) encodeParameter(username)
else else
encodeParameter(otpElement.name) encodeParameter(otpElement.name)
@ -324,7 +324,7 @@ object OtpEntryFields {
private fun parseTOTPKeyValues(getField: (id: String) -> String?, otpElement: OtpElement): Boolean { private fun parseTOTPKeyValues(getField: (id: String) -> String?, otpElement: OtpElement): Boolean {
val plainText = getField(OTP_FIELD) val plainText = getField(OTP_FIELD)
if (plainText != null && plainText.isNotEmpty()) { if (!plainText.isNullOrEmpty()) {
if (Pattern.matches(validKeyValueRegex, plainText)) { if (Pattern.matches(validKeyValueRegex, plainText)) {
return try { return try {
// KeeOtp string format // KeeOtp string format
@ -353,7 +353,7 @@ object OtpEntryFields {
val settingsField = getField(TOTP_SETTING_FIELD) val settingsField = getField(TOTP_SETTING_FIELD)
if (settingsField != null) { if (settingsField != null) {
// Regex match, sync with shortNameToEncoder // Regex match, sync with shortNameToEncoder
val pattern = Pattern.compile("(\\d+);((?:\\d+)|S)") val pattern = Pattern.compile("(\\d+);(\\d+|S)")
val matcher = pattern.matcher(settingsField) val matcher = pattern.matcher(settingsField)
if (!matcher.matches()) { if (!matcher.matches()) {
// malformed // malformed
@ -407,9 +407,9 @@ object OtpEntryFields {
} }
// path is "/name", so remove leading "/", and trailing white spaces // path is "/name", so remove leading "/", and trailing white spaces
val name = path.substring(1).trim { it <= ' ' } val name = path.substring(1).trim { it <= ' ' }
return if (name.isEmpty()) { return name.ifEmpty {
null null
} else name }
} }
private fun breakDownKeyValuePairs(pairs: String): HashMap<String, String> { private fun breakDownKeyValuePairs(pairs: String): HashMap<String, String> {

3
fastlane/metadata/android/en-US/changelogs/126.txt
View file

@ -1,2 +1,3 @@
* Fix "Save as" in Read Only mode #1666 * Fix "Save as" in Read Only mode #1666
* Fix username autofill #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667 * Fix username autofill #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667
* Fix regex OTP recognition #1596

1
fastlane/metadata/android/fr-FR/changelogs/126.txt
View file

@ -1,2 +1,3 @@
* Correction "Sauvegarder comme" en mode lecture seule #1666 * Correction "Sauvegarder comme" en mode lecture seule #1666
* Correction du nom d'utilisateur dans la reconnaissance automatique #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667 * Correction du nom d'utilisateur dans la reconnaissance automatique #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667
* Correction de la regex de reconnaissance OTP #1596