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

Android: Add 10s to time for manually calculated codes or NFC.

Browse Source
This commit is contained in:
Dain Nilsson 2022-05-09 17:32:45 +02:00
parent 715229c5ac
commit be652a9f9a
No known key found for this signature in database
GPG Key ID: F04367096FBA95E8
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ class OathManager(
val code =
if (credentialData.oathType == OathType.TOTP && !requireTouch) {
// recalculate the code
calculateCode(session, credential, System.currentTimeMillis())
calculateCode(session, credential)
} else null
val addedCred = _model.add(
@ -348,7 +348,7 @@ class OathManager(
val code = _model.updateCode(
session.deviceId,
credential.model(session.deviceId),
calculateCode(session, credential, System.currentTimeMillis()).model()
calculateCode(session, credential).model()
)
if (code != null) {
@ -371,20 +371,21 @@ class OathManager(
* Returns Steam code or standard TOTP code based on the credential.
* @param session OathSession which calculates the TOTP code
* @param credential
* @param timestamp time for TOTP calculation
*
* @return calculated Code
*/
private fun calculateCode(
session: OathSession,
credential: Credential,
timestamp: Long
) =
if (credential.isSteamCredential()) {
credential: Credential
): Code {
// Manual calculate, need to pad timer to avoid immediate expiration
val timestamp = System.currentTimeMillis() + 10000
return if (credential.isSteamCredential()) {
session.calculateSteamCode(credential, timestamp)
} else {
session.calculateCode(credential, timestamp)
}
}
private suspend fun sendDeviceInfo(device: YubiKeyDevice) {
@ -490,11 +491,15 @@ class OathManager(
}
private fun calculateOathCodes(session: OathSession): Map<Credential, Code> {
val timeStamp = System.currentTimeMillis()
return session.calculateCodes(timeStamp).map { (credential, code) ->
var timestamp = System.currentTimeMillis()
if (!_isUsbKey) {
// NFC, need to pad timer to avoid immediate expiration
timestamp += 10000
}
return session.calculateCodes(timestamp).map { (credential, code) ->
Pair(
credential, if (credential.isSteamCredential()) {
session.calculateSteamCode(credential, timeStamp)
credential, if (credential.isSteamCredential() && !credential.isTouchRequired) {
session.calculateSteamCode(credential, timestamp)
} else {
code
}