Skip to content

fix: reject proof signed with non-attested key #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vafeini merged 2 commits into from
Feb 16, 2026
Merged

fix: reject proof signed with non-attested key #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae3a930
fix: reject proof signed with non-attested key
asserh Feb 10, 2026
c513522
test(issuance): move non-attested key test to WalletApiTest
asserh Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/eu/europa/ec/eudi/pidissuer/domain/KeyAttestationJWT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.nimbusds.jose.jwk.JWK
import com.nimbusds.jose.jwk.RSAKey
import com.nimbusds.jwt.SignedJWT
import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.launch

data class KeyAttestationJWT private constructor(
Expand Down Expand Up @@ -131,4 +131,4 @@ internal suspend fun signatureVerifiedByKey(vararg tasks: suspend () -> JWK?): J
tasks.forEach {
launch { send(it()) }
}
}.first { it != null }
}.firstOrNull { it != null }
35 changes: 34 additions & 1 deletion src/test/kotlin/eu/europa/ec/eudi/pidissuer/adapter/input/web/WalletApiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,39 @@ internal class WalletApiEncryptionOptionalKeyAttestationsRequiredTest : BaseWall
assertEquals("Invalid proof JWT: Key Attestation 'nonce' does not match JWT Proof 'nonce'", response.errorDescription)
}

@Test
internal fun `issuance with jwt proof that contains key attestation fails when proof is signed with non-attested key`() =
runTest {
val authentication = dPoPTokenAuthentication(clock = clock)
val cNonce = generateNonce(clock.now(), 5L.minutes)
val nonAttestedProofKey = ECKeyGenerator(Curve.P_256).generate()
val attestedKey = ECKeyGenerator(Curve.P_256).generate()
val keyAttestationJwt = keyAttestationJWT(proofSigningKey = attestedKey)

val proofs = jwtProof(credentialIssuerMetadata.id, clock, cNonce, nonAttestedProofKey) {
customParam("key_attestation", keyAttestationJwt.serialize())
}.toJwtProofs()

val response = client()
.mutateWith(mockAuthentication(authentication))
.post()
.uri(WalletApi.CREDENTIAL_ENDPOINT)
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(requestByCredentialIdentifier(proofs))
.accept(MediaType.APPLICATION_JSON)
.exchange()
.expectStatus().isBadRequest()
.expectBody<IssueCredentialResponse.FailedTO>()
.returnResult()
.let { assertNotNull(it.responseBody) }

assertEquals(CredentialErrorTypeTo.INVALID_PROOF, response.type)
assertEquals(
"Invalid proof JWT: Key attestation does not contain a key that verifies the jwt proof signature",
response.errorDescription,
)
}

@Test
fun `issuance with attestation proof (without 'exp' claim) is successful`() = runTest {
val authentication = dPoPTokenAuthentication(clock = clock)
Expand Down Expand Up @@ -1527,7 +1560,7 @@ private suspend fun keyAttestationJWT(
clock: Clock = Clock.System,
expiresAt: Instant = clock.now() + 1.days,
includeExpiresAt: Boolean = true,
extraKeys: () -> List<ECKey>,
extraKeys: () -> List<ECKey> = { emptyList() },
): SignedJWT {
val keyAttestationSigningKey = loadECKey("key-attestation-key.pem")
val signer = ECDSASigner(keyAttestationSigningKey)
Expand Down
Loading