feat: Add KPEX_PASSKEY_FLAG_BE and KPEX_PASSKEY_FLAG_BS flags #2212

database/src/main/java/com/kunzisoft/keepass/database/element/security/ProtectedString.kt

@@ -74,6 +74,17 @@ class ProtectedString : Parcelable {
                 return arrayOfNulls(size)
             }
         }
+
+        fun String.toBooleanCompat(): Boolean {
+            return if (this.equals("1", ignoreCase = true))
+                true
+            else
+                this.toBoolean()
+        }
+
+        fun Boolean.toFieldValue(): String {
+            return if (this) "1" else "0"
+        }
     }
 
 }

database/src/main/java/com/kunzisoft/keepass/model/Passkey.kt

@@ -28,5 +28,32 @@ data class Passkey(
     val privateKeyPem: String,
     val credentialId: String,
     val userHandle: String,
-    val relyingParty: String
-): Parcelable
+    val relyingParty: String,
+    val backupEligibility: Boolean?,
+    val backupState: Boolean?
+): Parcelable {
+    // Do not compare BE and BS because are modifiable by the user
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Passkey
+
+        if (username != other.username) return false
+        if (privateKeyPem != other.privateKeyPem) return false
+        if (credentialId != other.credentialId) return false
+        if (userHandle != other.userHandle) return false
+        if (relyingParty != other.relyingParty) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = username.hashCode()
+        result = 31 * result + privateKeyPem.hashCode()
+        result = 31 * result + credentialId.hashCode()
+        result = 31 * result + userHandle.hashCode()
+        result = 31 * result + relyingParty.hashCode()
+        return result
+    }
+}

database/src/main/java/com/kunzisoft/keepass/model/PasskeyEntryFields.kt

@@ -2,6 +2,8 @@ package com.kunzisoft.keepass.model
 
 import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.security.ProtectedString
+import com.kunzisoft.keepass.database.element.security.ProtectedString.Companion.toBooleanCompat
+import com.kunzisoft.keepass.database.element.security.ProtectedString.Companion.toFieldValue
 
 object PasskeyEntryFields {
 
@@ -12,6 +14,8 @@ object PasskeyEntryFields {
     const val FIELD_CREDENTIAL_ID = "KPEX_PASSKEY_CREDENTIAL_ID"
     const val FIELD_USER_HANDLE = "KPEX_PASSKEY_USER_HANDLE"
     const val FIELD_RELYING_PARTY = "KPEX_PASSKEY_RELYING_PARTY"
+    const val FIELD_FLAG_BE = "KPEX_PASSKEY_FLAG_BE"
+    const val FIELD_FLAG_BS = "KPEX_PASSKEY_FLAG_BS"
 
     const val PASSKEY_FIELD = "Passkey"
     const val PASSKEY_TAG = "Passkey"
@@ -20,11 +24,14 @@ object PasskeyEntryFields {
      * Parse fields of an entry to retrieve a Passkey
      */
     fun parseFields(getField: (id: String) -> String?): Passkey? {
-        val usernameField = getField(FIELD_USERNAME)
-        val privateKeyField = getField(FIELD_PRIVATE_KEY)
-        val credentialIdField = getField(FIELD_CREDENTIAL_ID)
-        val userHandleField = getField(FIELD_USER_HANDLE)
-        val relyingPartyField = getField(FIELD_RELYING_PARTY)
+        val usernameField: String? = getField(FIELD_USERNAME)
+        val privateKeyField: String? = getField(FIELD_PRIVATE_KEY)
+        val credentialIdField: String? = getField(FIELD_CREDENTIAL_ID)
+        val userHandleField: String? = getField(FIELD_USER_HANDLE)
+        val relyingPartyField: String? = getField(FIELD_RELYING_PARTY)
+        // Optional fields
+        val backupEligibilityField: Boolean? = getField(FIELD_FLAG_BE)?.toBooleanCompat()
+        val backupStateField: Boolean? = getField(FIELD_FLAG_BS)?.toBooleanCompat()
         if (usernameField == null
             || privateKeyField == null
             || credentialIdField == null
@@ -36,7 +43,9 @@ object PasskeyEntryFields {
             privateKeyPem = privateKeyField,
             credentialId = credentialIdField,
             userHandle = userHandleField,
-            relyingParty = relyingPartyField
+            relyingParty = relyingPartyField,
+            backupEligibility = backupEligibilityField,
+            backupState = backupStateField
         )
     }
 
@@ -91,6 +100,24 @@ object PasskeyEntryFields {
                     ProtectedString(enableProtection = false, passkey.relyingParty)
                 )
             )
+            passkey.backupEligibility?.let { backupEligibility ->
+                addOrReplaceField(
+                    Field(
+                        FIELD_FLAG_BE,
+                        ProtectedString(enableProtection = false,
+                            backupEligibility.toFieldValue())
+                    )
+                )
+            }
+            passkey.backupState?.let { backupState ->
+                addOrReplaceField(
+                    Field(
+                        FIELD_FLAG_BS,
+                        ProtectedString(enableProtection = false,
+                            backupState.toFieldValue())
+                    )
+                )
+            }
         }
         return overwrite
     }
@@ -107,17 +134,23 @@ object PasskeyEntryFields {
         val credentialIdField = Field(FIELD_CREDENTIAL_ID)
         val userHandleField = Field(FIELD_USER_HANDLE)
         val relyingPartyField = Field(FIELD_RELYING_PARTY)
+        val backupEligibilityField = Field(FIELD_FLAG_BE)
+        val backupStateField = Field(FIELD_FLAG_BS)
         newCustomFields.remove(usernameField)
         newCustomFields.remove(privateKeyField)
         newCustomFields.remove(credentialIdField)
         newCustomFields.remove(userHandleField)
         newCustomFields.remove(relyingPartyField)
-        // Empty auto generated OTP Token field
+        newCustomFields.remove(backupEligibilityField)
+        newCustomFields.remove(backupStateField)
+        // Empty auto generated Passkey field
         if (fieldsToParse.contains(usernameField)
             || fieldsToParse.contains(privateKeyField)
             || fieldsToParse.contains(credentialIdField)
             || fieldsToParse.contains(userHandleField)
             || fieldsToParse.contains(relyingPartyField)
+            || fieldsToParse.contains(backupEligibilityField)
+            || fieldsToParse.contains(backupStateField)
         )
             newCustomFields.add(
                 Field(