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

improve exception handling

Browse Source
This commit is contained in:
Adam Velebil 2024-09-05 18:14:43 +02:00
parent 4e1abf2b3b
commit d677dfed69
No known key found for this signature in database
GPG Key ID: C9B1E4A3CBBD2E10
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
android/app/src/main/kotlin/com/yubico/authenticator/MainActivity.kt
View File

@ -322,10 +322,10 @@ class MainActivity : FlutterFragmentActivity() {
appMethodChannel.nfcActivityStateChanged(NfcActivityState.PROCESSING_STARTED)
}
val scpKeyParams : ScpKeyParams? = try {
// If NFC and FIPS check for SCP11b key
if (device.transport == Transport.NFC && deviceInfo.fipsCapable != 0) {
logger.debug("Checking for usable SCP11b key...")
// If NFC and FIPS check for SCP11b key
if (device.transport == Transport.NFC && deviceInfo.fipsCapable != 0) {
logger.debug("Checking for usable SCP11b key...")
deviceManager.scpKeyParams = try {
device.withConnection<SmartCardConnection, ScpKeyParams?> { connection ->
val scp = SecurityDomainSession(connection)
val keyRef = scp.keyInformation.keys.firstOrNull { it.kid == ScpKid.SCP11b }
@ -339,22 +339,22 @@ class MainActivity : FlutterFragmentActivity() {
logger.debug("Found SCP11b key: {}", keyRef)
}
}
} else null
} catch (e: Exception) {
logger.debug("Exception while getting scp keys: ", e)
if (device is NfcYubiKeyDevice) {
appMethodChannel.nfcActivityStateChanged(NfcActivityState.PROCESSING_INTERRUPTED)
} catch (e: Exception) {
logger.debug("Exception while getting scp keys: ", e)
if (device is NfcYubiKeyDevice) {
appMethodChannel.nfcActivityStateChanged(NfcActivityState.PROCESSING_INTERRUPTED)
}
null
}
null
}
// this YubiKey provides SCP11b key but the phone cannot perform AESCMAC
if (scpKeyParams != null && !supportsScp11b) {
if (deviceManager.scpKeyParams != null && !supportsScp11b) {
deviceManager.setDeviceInfo(noScp11bNfcSupport)
return
}
deviceManager.setDeviceInfo(deviceInfo, scpKeyParams)
deviceManager.setDeviceInfo(deviceInfo)
val supportedContexts = DeviceManager.getSupportedContexts(deviceInfo)
logger.debug("Connected key supports: {}", supportedContexts)
var switchedContext: Boolean = false
@ -381,12 +381,10 @@ class MainActivity : FlutterFragmentActivity() {
appMethodChannel.nfcActivityStateChanged(NfcActivityState.READY)
}
}
} catch (e: IOException) {
logger.debug("Caught IOException during YubiKey processing: ", e)
} catch (e: Exception) {
logger.debug("Caught Exception during YubiKey processing: ", e)
appMethodChannel.nfcActivityStateChanged(NfcActivityState.PROCESSING_INTERRUPTED)
}
}
}

6
android/app/src/main/kotlin/com/yubico/authenticator/device/DeviceManager.kt
View File

@ -172,9 +172,9 @@ class DeviceManager(
appViewModel.connectedYubiKey.removeObserver(usbObserver)
}
fun setDeviceInfo(deviceInfo: Info?, scpKeyParams: ScpKeyParams? = null) {
fun setDeviceInfo(deviceInfo: Info?) {
appViewModel.setDeviceInfo(deviceInfo)
this.scpKeyParams = scpKeyParams
this.scpKeyParams = null
}
fun isUsbKeyConnected(): Boolean {
@ -228,8 +228,6 @@ class DeviceManager(
appMethodChannel.nfcActivityStateChanged(NfcActivityState.PROCESSING_INTERRUPTED)
}
}
}

12
android/app/src/main/kotlin/com/yubico/authenticator/yubikit/ConnectionHelper.kt
View File

@ -23,13 +23,9 @@ import kotlin.coroutines.suspendCoroutine
suspend inline fun <reified C : YubiKeyConnection, T> YubiKeyDevice.withConnection(
crossinline block: (C) -> T
): T = suspendCoroutine { continuation ->
try {
requestConnection(C::class.java) {
continuation.resumeWith(runCatching {
block(it.value)
})
}
} catch (_: Exception) {
// ignored
requestConnection(C::class.java) {
continuation.resumeWith(runCatching {
block(it.value)
})
}
}