Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add property defaults for Spring Authorization Server"

Browse Source 
See gh-35460
This commit is contained in:
Phillip Webb
2023-05-17 17:06:30 -07:00
parent 42c3cba18e
commit d7b4353e99
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerPropertiesTests.java
View File

@@ -76,52 +76,45 @@ class OAuth2AuthorizationServerPropertiesTests {
@Test
void defaultEndpointPropertiesMatchBuilderDefaults() {
OAuth2AuthorizationServerProperties.Endpoint endpoint = new OAuth2AuthorizationServerProperties.Endpoint();
AuthorizationServerSettings authorizationServerSettings = AuthorizationServerSettings.builder().build();
assertThat(endpoint.getAuthorizationUri()).isEqualTo(authorizationServerSettings.getAuthorizationEndpoint());
assertThat(endpoint.getDeviceAuthorizationUri())
.isEqualTo(authorizationServerSettings.getDeviceAuthorizationEndpoint());
assertThat(endpoint.getDeviceVerificationUri())
.isEqualTo(authorizationServerSettings.getDeviceVerificationEndpoint());
assertThat(endpoint.getTokenUri()).isEqualTo(authorizationServerSettings.getTokenEndpoint());
assertThat(endpoint.getJwkSetUri()).isEqualTo(authorizationServerSettings.getJwkSetEndpoint());
assertThat(endpoint.getTokenRevocationUri())
.isEqualTo(authorizationServerSettings.getTokenRevocationEndpoint());
assertThat(endpoint.getTokenIntrospectionUri())
.isEqualTo(authorizationServerSettings.getTokenIntrospectionEndpoint());
OAuth2AuthorizationServerProperties.OidcEndpoint oidc = endpoint.getOidc();
assertThat(oidc.getLogoutUri()).isEqualTo(authorizationServerSettings.getOidcLogoutEndpoint());
assertThat(oidc.getClientRegistrationUri())
.isEqualTo(authorizationServerSettings.getOidcClientRegistrationEndpoint());
assertThat(oidc.getUserInfoUri()).isEqualTo(authorizationServerSettings.getOidcUserInfoEndpoint());
OAuth2AuthorizationServerProperties.Endpoint properties = new OAuth2AuthorizationServerProperties.Endpoint();
AuthorizationServerSettings defaults = AuthorizationServerSettings.builder().build();
assertThat(properties.getAuthorizationUri()).isEqualTo(defaults.getAuthorizationEndpoint());
assertThat(properties.getDeviceAuthorizationUri()).isEqualTo(defaults.getDeviceAuthorizationEndpoint());
assertThat(properties.getDeviceVerificationUri()).isEqualTo(defaults.getDeviceVerificationEndpoint());
assertThat(properties.getTokenUri()).isEqualTo(defaults.getTokenEndpoint());
assertThat(properties.getJwkSetUri()).isEqualTo(defaults.getJwkSetEndpoint());
assertThat(properties.getTokenRevocationUri()).isEqualTo(defaults.getTokenRevocationEndpoint());
assertThat(properties.getTokenIntrospectionUri()).isEqualTo(defaults.getTokenIntrospectionEndpoint());
OAuth2AuthorizationServerProperties.OidcEndpoint oidc = properties.getOidc();
assertThat(oidc.getLogoutUri()).isEqualTo(defaults.getOidcLogoutEndpoint());
assertThat(oidc.getClientRegistrationUri()).isEqualTo(defaults.getOidcClientRegistrationEndpoint());
assertThat(oidc.getUserInfoUri()).isEqualTo(defaults.getOidcUserInfoEndpoint());
}
@Test
void defaultClientPropertiesMatchBuilderDefaults() {
OAuth2AuthorizationServerProperties.Client client = new OAuth2AuthorizationServerProperties.Client();
ClientSettings clientSettings = ClientSettings.builder().build();
assertThat(client.isRequireProofKey()).isEqualTo(clientSettings.isRequireProofKey());
assertThat(client.isRequireAuthorizationConsent()).isEqualTo(clientSettings.isRequireAuthorizationConsent());
assertThat(client.getJwkSetUri()).isEqualTo(clientSettings.getJwkSetUrl());
if (clientSettings.getTokenEndpointAuthenticationSigningAlgorithm() != null) {
assertThat(client.getTokenEndpointAuthenticationSigningAlgorithm())
.isEqualTo(clientSettings.getTokenEndpointAuthenticationSigningAlgorithm().getName());
}
OAuth2AuthorizationServerProperties.Client properties = new OAuth2AuthorizationServerProperties.Client();
ClientSettings defaults = ClientSettings.builder().build();
assertThat(properties.isRequireProofKey()).isEqualTo(defaults.isRequireProofKey());
assertThat(properties.isRequireAuthorizationConsent()).isEqualTo(defaults.isRequireAuthorizationConsent());
assertThat(properties.getJwkSetUri()).isEqualTo(defaults.getJwkSetUrl());
assertThat(properties.getTokenEndpointAuthenticationSigningAlgorithm())
.isEqualTo((defaults.getTokenEndpointAuthenticationSigningAlgorithm() != null)
? defaults.getTokenEndpointAuthenticationSigningAlgorithm().getName() : null);
}
@Test
void defaultTokenPropertiesMatchBuilderDefaults() {
OAuth2AuthorizationServerProperties.Token token = new OAuth2AuthorizationServerProperties.Token();
TokenSettings tokenSettings = TokenSettings.builder().build();
assertThat(token.getAuthorizationCodeTimeToLive()).isEqualTo(tokenSettings.getAuthorizationCodeTimeToLive());
assertThat(token.getAccessTokenTimeToLive()).isEqualTo(tokenSettings.getAccessTokenTimeToLive());
assertThat(token.getAccessTokenFormat()).isEqualTo(tokenSettings.getAccessTokenFormat().getValue());
assertThat(token.getDeviceCodeTimeToLive()).isEqualTo(tokenSettings.getDeviceCodeTimeToLive());
assertThat(token.isReuseRefreshTokens()).isEqualTo(tokenSettings.isReuseRefreshTokens());
assertThat(token.getRefreshTokenTimeToLive()).isEqualTo(tokenSettings.getRefreshTokenTimeToLive());
assertThat(token.getIdTokenSignatureAlgorithm())
.isEqualTo(tokenSettings.getIdTokenSignatureAlgorithm().getName());
OAuth2AuthorizationServerProperties.Token properties = new OAuth2AuthorizationServerProperties.Token();
TokenSettings defaults = TokenSettings.builder().build();
assertThat(properties.getAuthorizationCodeTimeToLive()).isEqualTo(defaults.getAuthorizationCodeTimeToLive());
assertThat(properties.getAccessTokenTimeToLive()).isEqualTo(defaults.getAccessTokenTimeToLive());
assertThat(properties.getAccessTokenFormat()).isEqualTo(defaults.getAccessTokenFormat().getValue());
assertThat(properties.getDeviceCodeTimeToLive()).isEqualTo(defaults.getDeviceCodeTimeToLive());
assertThat(properties.isReuseRefreshTokens()).isEqualTo(defaults.isReuseRefreshTokens());
assertThat(properties.getRefreshTokenTimeToLive()).isEqualTo(defaults.getRefreshTokenTimeToLive());
assertThat(properties.getIdTokenSignatureAlgorithm())
.isEqualTo(defaults.getIdTokenSignatureAlgorithm().getName());
}
}