Skip to content

Potential fix for code scanning alert no. 8: Insecure local authentication #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Potential fix for code scanning alert no. 8: Insecure local authentication #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions ...c/main/java/com/freshkeeper/screens/profileSettings/viewmodel/ProfileSettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import javax.inject.Inject

import java.security.KeyStore
import javax.crypto.Cipher
import javax.crypto.KeyGenerator
import javax.crypto.SecretKey
import android.security.keystore.KeyGenParameterSpec
import android.security.keystore.KeyProperties

@HiltViewModel
class ProfileSettingsViewModel
@Inject
Expand Down Expand Up @@ -114,15 +121,38 @@ class ProfileSettingsViewModel

activity?.let {
val executor = ContextCompat.getMainExecutor(context)

// Ensure key exists. Safe to call each time.
generateSecretKey()
val cipher = try {
getCipher()
} catch (e: Exception) {
_isBiometricEnabled.value = false
return
}

val biometricPrompt =
BiometricPrompt(
it,
executor,
object : BiometricPrompt.AuthenticationCallback() {
override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
launchCatching {
accountService.updateBiometricEnabled(true)
_isBiometricEnabled.value = true
// Use the cipher to prove authentication!
val cryptoObject = result.cryptoObject
val cipher = cryptoObject?.cipher
if (cipher != null) {
try {
// Encrypt some dummy data as a proof of auth; discard result
cipher.doFinal(ByteArray(16))
launchCatching {
accountService.updateBiometricEnabled(true)
_isBiometricEnabled.value = true
}
} catch (e: Exception) {
_isBiometricEnabled.value = false
}
} else {
_isBiometricEnabled.value = false
}
}

Expand All @@ -147,7 +177,10 @@ class ProfileSettingsViewModel
.setNegativeButtonText(context.getString(R.string.cancel))
.build()

biometricPrompt.authenticate(promptInfo)
biometricPrompt.authenticate(
BiometricPrompt.CryptoObject(cipher),
promptInfo
)
} ?: run {
_isBiometricEnabled.value = false
}
Expand Down
Loading