Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-22 16:32:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #233.

Browse Source
This commit is contained in:
Adam Velebil 2022-09-30 10:40:53 +02:00
commit dd123adc07
No known key found for this signature in database
GPG Key ID: AC6D6B9D715FC084
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,8 @@ 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.SW
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.*
@ -39,7 +41,7 @@ class OathManager(
) : AppContextManager { ) : AppContextManager {
companion object { companion object {
const val TAG = "OathManager" const val TAG = "OathManager"
const val NFC_DATA_CLEANUP_DELAY = 30L * 1000; // 30s const val NFC_DATA_CLEANUP_DELAY = 30L * 1000 // 30s
} }
private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher() private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
@ -461,10 +463,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 == SW.SECURITY_CONDITION_NOT_SATISFIED) {
// the most probable reason for this exception
// is that the user did not touch the key
throw CancellationException()
}
throw apduException
} }
} }