Commit 460fdaf5 authored by artsiom's avatar artsiom Committed by Stephane Nicoll

Add configurable property for JWK encryption algorithm

See gh-15145
parent 5674a53d
...@@ -40,6 +40,11 @@ public class OAuth2ResourceServerProperties { ...@@ -40,6 +40,11 @@ public class OAuth2ResourceServerProperties {
*/ */
private String jwkSetUri; private String jwkSetUri;
/**
* JSON Web Algorithm used for verifying the digital signatures.
*/
private String jwsAlgorithm = "RS256";
/** /**
* URI that an OpenID Connect Provider asserts as its Issuer Identifier. * URI that an OpenID Connect Provider asserts as its Issuer Identifier.
*/ */
...@@ -53,6 +58,14 @@ public class OAuth2ResourceServerProperties { ...@@ -53,6 +58,14 @@ public class OAuth2ResourceServerProperties {
this.jwkSetUri = jwkSetUri; this.jwkSetUri = jwkSetUri;
} }
public String getJwsAlgorithm() {
return this.jwsAlgorithm;
}
public void setJwsAlgorithm(String jwsAlgorithm) {
this.jwsAlgorithm = jwsAlgorithm;
}
public String getIssuerUri() { public String getIssuerUri() {
return this.issuerUri; return this.issuerUri;
} }
......
...@@ -46,7 +46,8 @@ class OAuth2ResourceServerJwkConfiguration { ...@@ -46,7 +46,8 @@ class OAuth2ResourceServerJwkConfiguration {
@ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.jwt.jwk-set-uri") @ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.jwt.jwk-set-uri")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public JwtDecoder jwtDecoderByJwkKeySetUri() { public JwtDecoder jwtDecoderByJwkKeySetUri() {
return new NimbusJwtDecoderJwkSupport(this.properties.getJwt().getJwkSetUri()); return new NimbusJwtDecoderJwkSupport(this.properties.getJwt().getJwkSetUri(),
this.properties.getJwt().getJwsAlgorithm());
} }
@Bean @Bean
......
...@@ -22,6 +22,7 @@ import java.util.Map; ...@@ -22,6 +22,7 @@ import java.util.Map;
import javax.servlet.Filter; import javax.servlet.Filter;
import com.nimbusds.jose.JWSAlgorithm;
import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockWebServer;
import org.junit.After; import org.junit.After;
...@@ -78,8 +79,26 @@ public class OAuth2ResourceServerAutoConfigurationTests { ...@@ -78,8 +79,26 @@ public class OAuth2ResourceServerAutoConfigurationTests {
this.contextRunner.withPropertyValues( this.contextRunner.withPropertyValues(
"spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://jwk-set-uri.com") "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://jwk-set-uri.com")
.run((context) -> { .run((context) -> {
assertThat(context.getBean(JwtDecoder.class)) JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class);
.isInstanceOf(NimbusJwtDecoderJwkSupport.class); assertThat(jwtDecoder).isInstanceOf(NimbusJwtDecoderJwkSupport.class);
NimbusJwtDecoderJwkSupport decoder = (NimbusJwtDecoderJwkSupport) jwtDecoder;
assertThat(decoder).hasFieldOrPropertyWithValue("jwsAlgorithm",
JWSAlgorithm.RS256);
assertThat(getBearerTokenFilter(context)).isNotNull();
});
}
@Test
public void autoConfigurationShouldConfigureResourceServerWithJwsAlgotihms() {
this.contextRunner.withPropertyValues(
"spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://jwk-set-uri.com",
"spring.security.oauth2.resourceserver.jwt.jws-algorithm=HS512")
.run((context) -> {
JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class);
assertThat(jwtDecoder).isInstanceOf(NimbusJwtDecoderJwkSupport.class);
NimbusJwtDecoderJwkSupport decoder = (NimbusJwtDecoderJwkSupport) jwtDecoder;
assertThat(decoder).hasFieldOrPropertyWithValue("jwsAlgorithm",
JWSAlgorithm.HS512);
assertThat(getBearerTokenFilter(context)).isNotNull(); assertThat(getBearerTokenFilter(context)).isNotNull();
}); });
} }
......
...@@ -547,6 +547,7 @@ content into your application. Rather, pick only the properties that you need. ...@@ -547,6 +547,7 @@ content into your application. Rather, pick only the properties that you need.
# SECURITY OAUTH2 RESOURCE SERVER ({sc-spring-boot-autoconfigure}/security/oauth2/resource/OAuth2ResourceServerProperties.{sc-ext}[OAuth2ResourceServerProperties]) # SECURITY OAUTH2 RESOURCE SERVER ({sc-spring-boot-autoconfigure}/security/oauth2/resource/OAuth2ResourceServerProperties.{sc-ext}[OAuth2ResourceServerProperties])
spring.security.oauth2.resourceserver.jwt.jwk-set-uri= # JSON Web Key URI to use to verify the JWT token. spring.security.oauth2.resourceserver.jwt.jwk-set-uri= # JSON Web Key URI to use to verify the JWT token.
spring.security.oauth2.resourceserver.jwt.jws-algorithm= # JSON Web Algorithm used for verifying the digital signatures.
spring.security.oauth2.resourceserver.jwt.issuer-uri= # URI that an OpenID Connect Provider asserts as its Issuer Identifier. spring.security.oauth2.resourceserver.jwt.issuer-uri= # URI that an OpenID Connect Provider asserts as its Issuer Identifier.
# ---------------------------------------- # ----------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment