Skip to content

fix(webauthn): verify assertion against stored signature count #20029

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

Open
Sudhakar7J wants to merge 1 commit into
base: main
Choose a base branch
from
+54 −1
Open

fix(webauthn): verify assertion against stored signature count #20029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion ...rg/springframework/security/web/webauthn/management/Webauthn4JRelyingPartyOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,15 @@ public PublicKeyCredentialUserEntity authenticate(RelyingPartyAuthenticationRequ

// CollectedClientData and ExtensionsClientOutputs is registration data, and can
// be null at authentication time.
AttestedCredentialData attestedCredentialData = wa4jAttestationObject.getAuthenticatorData()
.getAttestedCredentialData();
Assert.notNull(attestedCredentialData, "attestedCredentialData cannot be null");
com.webauthn4j.credential.CredentialRecord wa4jCredentialRecord = new CredentialRecordImpl(
wa4jAttestationObject, null, null, convertTransportsToWebauthn4j(credentialRecord.getTransports()));
wa4jAttestationObject.getAttestationStatement(), credentialRecord.isUvInitialized(),
credentialRecord.isBackupEligible(), credentialRecord.isBackupState(),
credentialRecord.getSignatureCount(), attestedCredentialData,
wa4jAttestationObject.getAuthenticatorData().getExtensions(), null, null,
convertTransportsToWebauthn4j(credentialRecord.getTransports()));
List<byte[]> allowCredentials = convertAllowedCredentialsToWebauthn4j(
request.getRequestOptions().getAllowCredentials());
AuthenticationParameters authenticationParameters = new AuthenticationParameters(serverProperty,
Expand Down
46 changes: 46 additions & 0 deletions ...ringframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.webauthn4j.converter.AttestationObjectConverter;
import com.webauthn4j.converter.util.ObjectConverter;
import com.webauthn4j.data.AuthenticationData;
import com.webauthn4j.data.AuthenticationParameters;
import com.webauthn4j.data.AuthenticationRequest;
import com.webauthn4j.data.attestation.AttestationObject;
import com.webauthn4j.data.attestation.authenticator.AttestedCredentialData;
Expand Down Expand Up @@ -680,6 +681,51 @@ void authenticateThenWa4jRequestCredentialIdIsRawIdBytes() throws Exception {
assertThat(wa4jRequest.getValue().getCredentialId()).isEqualTo(publicKey.getRawId().getBytes());
}

// gh-19994
@Test
void authenticateThenWa4jCredentialRecordUsesStoredSignatureCount() throws Exception {
PublicKeyCredentialRequestOptions options = TestPublicKeyCredentialRequestOptions.create().build();
AuthenticatorAssertionResponse response = TestAuthenticationAssertionResponses
.createAuthenticatorAssertionResponse()
.build();
PublicKeyCredential<AuthenticatorAssertionResponse> credentials = TestPublicKeyCredentials
.createPublicKeyCredential(response)
.build();
RelyingPartyAuthenticationRequest request = new RelyingPartyAuthenticationRequest(options, credentials);

ImmutableCredentialRecord credentialRecord = TestCredentialRecords.fullUserCredential()
.signatureCount(42)
.build();
given(this.userCredentials.findByCredentialId(request.getPublicKey().getRawId()))
.willReturn(credentialRecord);
JsonMapper json = new JsonMapper();
CBORMapper cbor = mock(CBORMapper.class);
CBORMapper.Builder builder = mock(CBORMapper.Builder.class, RETURNS_SELF);
given(builder.build()).willReturn(cbor);
given(cbor.rebuild()).willReturn(builder);
AttestationObject attestationObject = mock(AttestationObject.class);
AuthenticatorData wa4jAuthData = mock(AuthenticatorData.class);
given(attestationObject.getAuthenticatorData()).willReturn(wa4jAuthData);
given(wa4jAuthData.getAttestedCredentialData()).willReturn(mock(AttestedCredentialData.class));
given(cbor.readValue(credentialRecord.getAttestationObject().getBytes(), AttestationObject.class))
.willReturn(attestationObject);
this.rpOperations.setObjectConverter(new ObjectConverter(json, cbor));

WebAuthnManager manager = mock(WebAuthnManager.class);
ArgumentCaptor<AuthenticationParameters> parameters = ArgumentCaptor
.forClass(AuthenticationParameters.class);
AuthenticationData wa4jData = mock(AuthenticationData.class);
given(wa4jData.getAuthenticatorData()).willReturn(mock(AuthenticatorData.class));
given(manager.verify(any(AuthenticationRequest.class), parameters.capture())).willReturn(wa4jData);
given(this.userEntities.findById(any()))
.willReturn(TestPublicKeyCredentialUserEntities.userEntity().build());
this.rpOperations.setWebAuthnManager(manager);

this.rpOperations.authenticate(request);

assertThat(parameters.getValue().getCredentialRecord().getCounter()).isEqualTo(42);
}

private static AuthenticatorAttestationResponse setFlag(byte... flags) throws Exception {
AuthenticatorAttestationResponseBuilder authAttResponseBldr = TestAuthenticatorAttestationResponses
.createAuthenticatorAttestationResponse();
Expand Down