rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change Regex to allow infinite OTP padding #585

Browse Source
This commit is contained in:
J-Jamet
2021-02-10 17:56:22 +01:00
parent fe4faf9ebc
commit 35cfe261d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/otp/OtpElement.kt
View File

@@ -210,13 +210,13 @@ data class OtpElement(var otpModel: OtpModel = OtpModel()) {
fun isValidBase32(secret: String): Boolean { fun isValidBase32(secret: String): Boolean {
val secretChars = replaceBase32Chars(secret) val secretChars = replaceBase32Chars(secret)
return secret.isNotEmpty() return secret.isNotEmpty()
&& (Pattern.matches("^(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}={6}|[A-Z2-7]{4}={4}|[A-Z2-7]{5}={3}|[A-Z2-7]{7}=)?$", secretChars)) && (Pattern.matches("^(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}=*|[A-Z2-7]{4}=*|[A-Z2-7]{5}=*|[A-Z2-7]{7}=*)?$", secretChars))
} }
fun isValidBase64(secret: String): Boolean { fun isValidBase64(secret: String): Boolean {
// TODO replace base 64 chars // TODO replace base 64 chars
return secret.isNotEmpty() return secret.isNotEmpty()
&& (Pattern.matches("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$", secret)) && (Pattern.matches("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}=*|[A-Za-z0-9+/]{3}=*)?$", secret))
} }
fun replaceBase32Chars(parameter: String): String { fun replaceBase32Chars(parameter: String): String {