Skip to content

Update WebAuthn Test Objects Class Names #16604 #16814

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

Closed
wants to merge 1 commit into from
Closed

Update WebAuthn Test Objects Class Names #16604 #16814

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
10 changes: 5 additions & 5 deletions ...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestAuthenticationAssertionResponses;
import org.springframework.security.web.webauthn.api.TestBytes;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredential;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentials;
import org.springframework.security.web.webauthn.api.UserVerificationRequirement;
import org.springframework.security.web.webauthn.authentication.WebAuthnAuthentication;
import org.springframework.security.web.webauthn.authentication.WebAuthnAuthenticationRequestToken;
Expand Down Expand Up @@ -640,7 +640,7 @@ class SpringSecurityCoreVersionSerializableTests {
AuthenticationExtensionsClientOutputs outputs = new ImmutableAuthenticationExtensionsClientOutputs(credentialOutput);
AuthenticatorAssertionResponse response = TestAuthenticationAssertionResponses.createAuthenticatorAssertionResponse()
.build();
PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredential.createPublicKeyCredential(
PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredentials.createPublicKeyCredential(
response, outputs)
.build();
RelyingPartyAuthenticationRequest authRequest = new RelyingPartyAuthenticationRequest(
Expand All @@ -658,9 +658,9 @@ class SpringSecurityCoreVersionSerializableTests {
generatorByClassName.put(AuthenticatorAttachment.class, (r) -> AuthenticatorAttachment.PLATFORM);
// @formatter:on
generatorByClassName.put(ImmutablePublicKeyCredentialUserEntity.class,
(r) -> TestPublicKeyCredentialUserEntity.userEntity().id(TestBytes.get()).build());
(r) -> TestPublicKeyCredentialUserEntities.userEntity().id(TestBytes.get()).build());
generatorByClassName.put(WebAuthnAuthentication.class, (r) -> {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
.id(TestBytes.get())
.build();
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
Expand Down
4 changes: 2 additions & 2 deletions ...TestAuthenticatorAttestationResponse.java → ...estAuthenticatorAttestationResponses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.springframework.security.web.webauthn.api;

public final class TestAuthenticatorAttestationResponse {
public final class TestAuthenticatorAttestationResponses {

public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseBuilder createAuthenticatorAttestationResponse() {
return AuthenticatorAttestationResponse.builder()
Expand All @@ -27,7 +27,7 @@ public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseB
.transports(AuthenticatorTransport.HYBRID, AuthenticatorTransport.INTERNAL);
}

private TestAuthenticatorAttestationResponse() {
private TestAuthenticatorAttestationResponses() {
}

}
4 changes: 2 additions & 2 deletions ...eb/webauthn/api/TestCredentialRecord.java → ...b/webauthn/api/TestCredentialRecords.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.time.Instant;
import java.util.Set;

public final class TestCredentialRecord {
public final class TestCredentialRecords {

public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder userCredential() {
return ImmutableCredentialRecord.builder()
Expand Down Expand Up @@ -50,7 +50,7 @@ public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder fullUse
.backupState(true);
}

private TestCredentialRecord() {
private TestCredentialRecords() {
}

}
4 changes: 2 additions & 2 deletions ...pi/TestPublicKeyCredentialUserEntity.java → .../TestPublicKeyCredentialUserEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity.PublicKeyCredentialUserEntityBuilder;

public final class TestPublicKeyCredentialUserEntity {
public final class TestPublicKeyCredentialUserEntities {

public static PublicKeyCredentialUserEntityBuilder userEntity() {
return ImmutablePublicKeyCredentialUserEntity.builder().name("user").id(TestBytes.get()).displayName("user");
}

private TestPublicKeyCredentialUserEntity() {
private TestPublicKeyCredentialUserEntities() {
}

}
6 changes: 3 additions & 3 deletions ...webauthn/api/TestPublicKeyCredential.java → ...ebauthn/api/TestPublicKeyCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package org.springframework.security.web.webauthn.api;

public final class TestPublicKeyCredential {
public final class TestPublicKeyCredentials {

public static PublicKeyCredential.PublicKeyCredentialBuilder<AuthenticatorAttestationResponse> createPublicKeyCredential() {
AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponse
AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponses
.createAuthenticatorAttestationResponse()
.build();
return createPublicKeyCredential(response);
Expand Down Expand Up @@ -49,7 +49,7 @@ public static <R extends AuthenticatorResponse> PublicKeyCredential.PublicKeyCre
.clientExtensionResults(outputs);
}

private TestPublicKeyCredential() {
private TestPublicKeyCredentials() {
}

}
4 changes: 2 additions & 2 deletions ...ringframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions;
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
import org.springframework.security.web.webauthn.management.RelyingPartyAuthenticationRequest;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

Expand Down Expand Up @@ -153,7 +153,7 @@ void doFilterWhenOptionsNullThenUnAuthorized() throws Exception {
void doFilterWhenValidThenOk() throws Exception {
PublicKeyCredentialRequestOptions options = TestPublicKeyCredentialRequestOptions.create().build();
given(this.requestOptionsRepository.load(any())).willReturn(options);
PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntities.userEntity().build();
WebAuthnAuthentication authentication = new WebAuthnAuthentication(principal,
AuthorityUtils.createAuthorityList("ROLE_USER"));
given(this.authenticationManager.authenticate(any())).willReturn(authentication);
Expand Down
8 changes: 4 additions & 4 deletions ...org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
Expand All @@ -32,23 +32,23 @@ class WebAuthnAuthenticationTests {

@Test
void isAuthenticatedThenTrue() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
assertThat(authentication.isAuthenticated()).isTrue();
}

@Test
void setAuthenticationWhenTrueThenException() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
assertThatIllegalArgumentException().isThrownBy(() -> authentication.setAuthenticated(true));
}

@Test
void setAuthenticationWhenFalseThenNotAuthenticated() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
authentication.setAuthenticated(false);
Expand Down
14 changes: 7 additions & 7 deletions ...rk/security/web/webauthn/management/JdbcPublicKeyCredentialUserEntityRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.springframework.security.web.webauthn.api.Bytes;
import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
Expand Down Expand Up @@ -107,7 +107,7 @@ void findByUserNameWheUserNameIsNullThenThrowIllegalArgumentException() {

@Test
void saveUserEntityWhenSaveThenReturnsSaved() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();

this.repository.save(userEntity);

Expand All @@ -120,7 +120,7 @@ void saveUserEntityWhenSaveThenReturnsSaved() {

@Test
void saveUserEntityWhenUserEntityExistsThenUpdates() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
this.repository.save(userEntity);

this.repository.save(testUserEntity(userEntity.getId()));
Expand All @@ -134,7 +134,7 @@ void saveUserEntityWhenUserEntityExistsThenUpdates() {

@Test
void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
this.repository.save(userEntity);

PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
Expand All @@ -144,7 +144,7 @@ void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {

@Test
void deleteUserEntityWhenRecordExistThenSuccess() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
this.repository.save(userEntity);

this.repository.delete(userEntity.getId());
Expand All @@ -155,15 +155,15 @@ void deleteUserEntityWhenRecordExistThenSuccess() {

@Test
void findUserEntityByIdWhenUserEntityDoesNotExistThenReturnsNull() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();

PublicKeyCredentialUserEntity savedUserEntity = this.repository.findById(userEntity.getId());
assertThat(savedUserEntity).isNull();
}

@Test
void findUserEntityByUserNameWhenUserEntityDoesNotExistThenReturnsEmpty() {
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();

PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
assertThat(savedUserEntity).isNull();
Expand Down
14 changes: 7 additions & 7 deletions ...g/springframework/security/web/webauthn/management/JdbcUserCredentialRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.springframework.security.web.webauthn.api.CredentialRecord;
import org.springframework.security.web.webauthn.api.ImmutableCredentialRecord;
import org.springframework.security.web.webauthn.api.PublicKeyCredentialType;
import org.springframework.security.web.webauthn.api.TestCredentialRecord;
import org.springframework.security.web.webauthn.api.TestCredentialRecords;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
Expand Down Expand Up @@ -110,7 +110,7 @@ void findByCredentialIdWheUserIdIsNullThenThrowIllegalArgumentException() {

@Test
void saveCredentialRecordWhenSaveThenReturnsSaved() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
this.jdbcUserCredentialRepository.save(userCredential);

CredentialRecord savedUserCredential = this.jdbcUserCredentialRepository
Expand All @@ -136,7 +136,7 @@ void saveCredentialRecordWhenSaveThenReturnsSaved() {

@Test
void saveCredentialRecordWhenRecordExistsThenReturnsUpdated() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
this.jdbcUserCredentialRepository.save(userCredential);
// @formatter:off
CredentialRecord updatedRecord = ImmutableCredentialRecord.fromCredentialRecord(userCredential)
Expand All @@ -157,7 +157,7 @@ void saveCredentialRecordWhenRecordExistsThenReturnsUpdated() {

@Test
void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
this.jdbcUserCredentialRepository.save(userCredential);

List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
Expand All @@ -169,7 +169,7 @@ void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {

@Test
void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();

List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
.findByUserId(userCredential.getUserEntityUserId());
Expand All @@ -179,7 +179,7 @@ void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {

@Test
void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();

CredentialRecord credentialRecord = this.jdbcUserCredentialRepository
.findByCredentialId(userCredential.getCredentialId());
Expand All @@ -189,7 +189,7 @@ void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {

@Test
void deleteCredentialRecordWhenRecordExistThenSuccess() {
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
this.jdbcUserCredentialRepository.save(userCredential);

this.jdbcUserCredentialRepository.delete(userCredential.getCredentialId());
Expand Down
6 changes: 3 additions & 3 deletions ...ork/security/web/webauthn/management/MapPublicKeyCredentialUserEntityRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.junit.jupiter.api.Test;

import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
Expand All @@ -36,7 +36,7 @@ class MapPublicKeyCredentialUserEntityRepositoryTests {

private String username = "username";

private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
.name(this.username)
.build();

Expand Down Expand Up @@ -75,7 +75,7 @@ void saveWhenNonNullThenSuccess() {

@Test
void saveWhenUpdateThenUpdated() {
PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntity.userEntity()
PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntities.userEntity()
.name(this.userEntity.getName())
.displayName("Updated")
.build();
Expand Down
14 changes: 7 additions & 7 deletions ...rg/springframework/security/web/webauthn/management/MapUserCredentialRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.springframework.security.web.webauthn.api.CredentialRecord;
import org.springframework.security.web.webauthn.api.ImmutableCredentialRecord;
import org.springframework.security.web.webauthn.api.TestBytes;
import org.springframework.security.web.webauthn.api.TestCredentialRecord;
import org.springframework.security.web.webauthn.api.TestCredentialRecords;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
Expand Down Expand Up @@ -61,7 +61,7 @@ void findByCredentialIdWhenNotFoundThenIllegalArgumentException() {

@Test
void deleteWhenCredentialNotFoundThenNoException() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
assertThatNoException().isThrownBy(() -> this.userCredentials.delete(credentialRecord.getCredentialId()));
}

Expand All @@ -72,7 +72,7 @@ void deleteWhenNullIdThenIllegalArgumentException() {

@Test
void saveThenFound() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
this.userCredentials.save(credentialRecord);
assertThat(this.userCredentials.findByCredentialId(credentialRecord.getCredentialId()))
.isEqualTo(credentialRecord);
Expand All @@ -87,7 +87,7 @@ void saveWhenNullThenIllegalArgumentException() {

@Test
void saveAndDeleteThenNotFound() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
this.userCredentials.save(credentialRecord);
this.userCredentials.delete(credentialRecord.getCredentialId());
assertThat(this.userCredentials.findByCredentialId(credentialRecord.getCredentialId())).isNull();
Expand All @@ -96,7 +96,7 @@ void saveAndDeleteThenNotFound() {

@Test
void saveWhenUpdateThenUpdated() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
this.userCredentials.save(credentialRecord);
Instant updatedLastUsed = credentialRecord.getLastUsed().plusSeconds(120);
CredentialRecord updatedCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
Expand All @@ -111,7 +111,7 @@ void saveWhenUpdateThenUpdated() {

@Test
void saveWhenSameUserThenUpdated() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
this.userCredentials.save(credentialRecord);
CredentialRecord newCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
.credentialId(TestBytes.get())
Expand All @@ -127,7 +127,7 @@ void saveWhenSameUserThenUpdated() {

@Test
void saveWhenDifferentUserThenNewEntryAdded() {
ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
this.userCredentials.save(credentialRecord);
CredentialRecord newCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
.userEntityUserId(TestBytes.get())
Expand Down
Loading