vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvement(Passkey): Always provide collected client data JSON

Browse Source
This commit is contained in:
Artem Chepurnyi 2024-12-08 23:23:32 +02:00
parent 1f88d63039
commit 24dd880ad1
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/src/androidMain/kotlin/com/artemchep/keyguard/android/PasskeyProviderGetRequest.kt
View File

@ -34,11 +34,6 @@ class PasskeyProviderGetRequest(
private val cryptoService: CryptoGenerator,
private val passkeyUtils: PasskeyUtils,
) {
private class ClientData(
val bytes: ByteArray? = null,
val hash: ByteArray,
)
constructor(
directDI: DirectDI,
) : this(
@ -99,30 +94,21 @@ class PasskeyProviderGetRequest(
userPresence = true,
)
val clientData = opt.clientDataHash
?.let { hash ->
ClientData(
hash = hash,
)
}
?: run {
val jsonObject = buildJsonObject {
put("type", "webauthn.get")
put("challenge", challenge)
put("origin", origin)
put("androidPackageName", packageName)
}
val jsonString = json.encodeToString(jsonObject)
val bytes = jsonString.toByteArray()
val hash = cryptoService.hashSha256(bytes)
ClientData(
bytes = bytes,
hash = hash,
)
val clientDataJsonBytes = kotlin.run {
val jsonObject = buildJsonObject {
put("type", "webauthn.get")
put("challenge", challenge)
put("origin", origin)
put("androidPackageName", packageName)
}
json.encodeToString(jsonObject)
.toByteArray()
}
val clientDataJsonHash = opt.clientDataHash
?: cryptoService.hashSha256(clientDataJsonBytes)
val signature = kotlin.run {
val dataToSign = defaultAuthenticatorData + clientData.hash
val dataToSign = defaultAuthenticatorData + clientDataJsonHash
val sig = Signature.getInstance("SHA256withECDSA")
sig.initSign(privateKey)
sig.update(dataToSign)
@ -130,11 +116,7 @@ class PasskeyProviderGetRequest(
}
val r = buildJsonObject {
val clientDataBytes = clientData.bytes
if (clientDataBytes != null) {
put("clientDataJSON", clientDataBytes)
}
put("clientDataJSON", clientDataJsonBytes)
put("authenticatorData", defaultAuthenticatorData)
put("signature", PasskeyBase64.encodeToString(signature))
put("userHandle", credential.userHandle)