codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented passing only userPassword to saveNewAuthenticationMethod() (makes the parameter clearer)

This commit is contained in:
dankito 2020-10-13 17:18:43 +02:00
parent 93254c1d21
commit af67f4d404
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/authentication/AuthenticationService.kt
View File

@ -138,7 +138,7 @@ open class AuthenticationService(
open fun setAuthenticationMethodToBiometric() { open fun setAuthenticationMethodToBiometric() {
saveNewAuthenticationMethod(AuthenticationType.Biometric, generateRandomPassword()) saveNewAuthenticationMethod(AuthenticationType.Biometric, null)
} }
open fun setAuthenticationMethodToPassword(newPassword: String) { open fun setAuthenticationMethodToPassword(newPassword: String) {
@ -146,34 +146,42 @@ open class AuthenticationService(
} }
open fun removeAppProtection() { open fun removeAppProtection() {
saveNewAuthenticationMethod(AuthenticationType.None, generateRandomPassword()) saveNewAuthenticationMethod(AuthenticationType.None, null)
} }
protected open fun saveNewAuthenticationMethod(type: AuthenticationType, newPassword: String): Boolean { protected open fun saveNewAuthenticationMethod(type: AuthenticationType, newUserPassword: String?): Boolean {
val settings = loadOrCreateDefaultAuthenticationSettings() val settings = loadOrCreateDefaultAuthenticationSettings()
val newDefaultPassword = generateRandomPassword()
var newDatabasePassword = newDefaultPassword
settings.type = type settings.type = type
settings.hashedUserPassword = if (type == AuthenticationType.Password) BCrypt.withDefaults().hashToString(12, newPassword.toCharArray()) else null settings.hashedUserPassword = null
settings.initializationVector = null settings.initializationVector = null
settings.salt = null settings.salt = null
if (type == AuthenticationType.Biometric) { if (type == AuthenticationType.Biometric) {
encryptionCipherForBiometric?.let { encryptionCipher -> encryptionCipherForBiometric?.let { encryptionCipher ->
val encryptedPassword = cryptographyManager.encryptData(newPassword, encryptionCipher) val encryptedPassword = cryptographyManager.encryptData(newDefaultPassword, encryptionCipher)
settings.defaultPassword = encodeToBase64(encryptedPassword) settings.defaultPassword = encodeToBase64(encryptedPassword)
settings.initializationVector = encodeToBase64(encryptionCipher.iv) settings.initializationVector = encodeToBase64(encryptionCipher.iv)
} }
} }
else if (type == AuthenticationType.Password) {
if (newUserPassword != null) {
settings.hashedUserPassword = BCrypt.withDefaults().hashToString(12, newUserPassword.toCharArray())
newDatabasePassword = newUserPassword
}
}
else if (type == AuthenticationType.None) { else if (type == AuthenticationType.None) {
val salt = cryptographyManager.generateRandomBytes(8) val salt = cryptographyManager.generateRandomBytes(8)
val (encryptedPassword, iv) = cryptographyManager.encryptDataWithPbe(newPassword, DefaultPasswordEncryptionKey, salt) val (encryptedPassword, iv) = cryptographyManager.encryptDataWithPbe(newDefaultPassword, DefaultPasswordEncryptionKey, salt)
settings.defaultPassword = encodeToBase64(encryptedPassword) settings.defaultPassword = encodeToBase64(encryptedPassword)
settings.initializationVector = encodeToBase64(iv) settings.initializationVector = encodeToBase64(iv)
settings.salt = encodeToBase64(salt) settings.salt = encodeToBase64(salt)
} }
if (persistence.changePassword(newPassword)) { if (persistence.changePassword(newDatabasePassword)) {
if (saveAuthenticationSettings(settings)) { if (saveAuthenticationSettings(settings)) {
this.authenticationType = type this.authenticationType = type
this.encryptionCipherForBiometric = null this.encryptionCipherForBiometric = null