Skip to content

Commit 8873aeb

Browse files
committed
fix: Fix serializing Java objects from yubico's webauthn library
1 parent ae52f9a commit 8873aeb

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

handlers/Authentication.cfc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ component {
2929

3030
flash.put(
3131
name = "passkeyAssertionRequest",
32-
value = req,
32+
value = req.toJson(),
3333
saveNow = true
3434
);
3535

@@ -61,7 +61,11 @@ component {
6161
var result = variables.relyingParty.finishAssertion(
6262
createObject( "java", "com.yubico.webauthn.FinishAssertionOptions" )
6363
.builder()
64-
.request( flash.get( "passkeyAssertionRequest" ) )
64+
.request(
65+
createObject( "java", "com.yubico.webauthn.AssertionRequest" ).fromJson(
66+
flash.get( "passkeyAssertionRequest" )
67+
)
68+
)
6569
.response(
6670
createObject( "java", "com.yubico.webauthn.data.PublicKeyCredential" ).parseAssertionResponseJson(
6771
rc.publicKeyCredentialJson

handlers/Registration.cfc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ component secured {
4848

4949
flash.put(
5050
name = "passkeyRegistrationRequest",
51-
value = req,
51+
value = req.toJson(),
5252
saveNow = true
5353
);
5454

@@ -92,7 +92,11 @@ component secured {
9292
var result = variables.relyingParty.finishRegistration(
9393
createObject( "java", "com.yubico.webauthn.FinishRegistrationOptions" )
9494
.builder()
95-
.request( flash.get( "passkeyRegistrationRequest" ) )
95+
.request(
96+
createObject( "java", "com.yubico.webauthn.data.PublicKeyCredentialCreationOptions" ).fromJson(
97+
flash.get( "passkeyRegistrationRequest" )
98+
)
99+
)
96100
.response( pkc )
97101
.build()
98102
);

models/PasskeyService.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ component singleton {
2727
.type( variables.PUBLIC_KEY_TYPE )
2828
.build();
2929
} )
30-
);;
30+
);
3131
}
3232

3333
function getUserHandleForUsername( required string username ) {

0 commit comments

Comments
 (0)