Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-12-26 11:43:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

consider not touching YK as cancellation

Browse Source
This commit is contained in:
Adam Velebil 2022-09-23 11:41:07 +02:00
parent 38a2a852e0
commit bf9b85f069
No known key found for this signature in database
GPG Key ID: AC6D6B9D715FC084
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
android/app/src/main/kotlin/com/yubico/authenticator/oath/OathManager.kt
View File

@ -15,6 +15,7 @@ import com.yubico.yubikit.core.Transport
import com.yubico.yubikit.core.YubiKeyDevice import com.yubico.yubikit.core.YubiKeyDevice
import com.yubico.yubikit.core.YubiKeyType import com.yubico.yubikit.core.YubiKeyType
import com.yubico.yubikit.core.application.ApplicationNotAvailableException import com.yubico.yubikit.core.application.ApplicationNotAvailableException
import com.yubico.yubikit.core.smartcard.ApduException
import com.yubico.yubikit.core.smartcard.SmartCardConnection import com.yubico.yubikit.core.smartcard.SmartCardConnection
import com.yubico.yubikit.core.util.Result import com.yubico.yubikit.core.util.Result
import com.yubico.yubikit.oath.* import com.yubico.yubikit.oath.*
@ -461,10 +462,19 @@ class OathManager(
): Code { ): Code {
// Manual calculate, need to pad timer to avoid immediate expiration // Manual calculate, need to pad timer to avoid immediate expiration
val timestamp = System.currentTimeMillis() + 10000 val timestamp = System.currentTimeMillis() + 10000
return if (credential.isSteamCredential()) { try {
session.calculateSteamCode(credential, timestamp) return if (credential.isSteamCredential()) {
} else { session.calculateSteamCode(credential, timestamp)
session.calculateCode(credential, timestamp) } else {
session.calculateCode(credential, timestamp)
}
} catch (apduException: ApduException) {
if (credential.isTouchRequired && apduException.sw.toInt() == 0x6982) {
// the most probable reason for this exception
// is that the user did not touch the key
throw CancellationException()
}
throw apduException
} }
} }