AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Handle BadPaddingException if the key in the Keystore got invalidated

Browse Source 
Recover from BadPaddingException which can be thrown on some devices if the key in the keystore is invalidated e.g. due to a fingerprint added because of an upstream error in Android, fixes #400
This commit is contained in:
Julian Raufelder 2022-01-13 10:56:05 +01:00
parent f1f4258871
commit 31c2599276
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
View File

@ -1,9 +1,7 @@
package org.cryptomator.presentation.util
import android.content.Context
import android.os.Build
import android.security.keystore.KeyPermanentlyInvalidatedException
import androidx.annotation.RequiresApi
import androidx.biometric.BiometricPrompt
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
@ -12,8 +10,9 @@ import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.util.crypto.BiometricAuthCryptor
import org.cryptomator.util.crypto.UnrecoverableStorageKeyException
import java.util.concurrent.Executor
import timber.log.Timber
import java.util.concurrent.Executor
import javax.crypto.BadPaddingException
class BiometricAuthentication(val callback: Callback, val context: Context, val cryptoMode: CryptoMode, private val useConfirmationInFaceUnlockAuth: Boolean) {
@ -72,20 +71,28 @@ class BiometricAuthentication(val callback: Callback, val context: Context, val
val cipher = result.cryptoObject?.cipher
val transformedPassword = if (cryptoMode == CryptoMode.ENCRYPT) {
biometricAuthCryptor.encrypt(cipher, vaultModel.password)
} else {
biometricAuthCryptor.decrypt(cipher, vaultModel.password)
try {
val transformedPassword = if (cryptoMode == CryptoMode.ENCRYPT) {
biometricAuthCryptor.encrypt(cipher, vaultModel.password)
} else {
biometricAuthCryptor.decrypt(cipher, vaultModel.password)
}
val vaultModelPasswordAware = VaultModel(
Vault //
.aCopyOf(vaultModel.toVault()) //
.withSavedPassword(transformedPassword) //
.build()
)
callback.onBiometricAuthenticated(vaultModelPasswordAware)
} catch (e: BadPaddingException) {
Timber.tag("BiometricAuthentication").i(
e,
"Recover from BadPaddingException which can be thrown on some devices if the key in the keystore is invalidated e.g. due to a fingerprint added because of an upstream error in Android, see #400 for more info"
)
callback.onBiometricKeyInvalidated(vaultModel)
}
val vaultModelPasswordAware = VaultModel(
Vault //
.aCopyOf(vaultModel.toVault()) //
.withSavedPassword(transformedPassword) //
.build()
)
callback.onBiometricAuthenticated(vaultModelPasswordAware)
}
override fun onAuthenticationFailed() {