root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Madhura Bhave 2017-02-21 12:14:23 -08:00
parent 923393d5af 67810abd9e
commit b8a38d60b7
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java
View File

@ -161,6 +161,10 @@ public class OAuth2ResourceServerConfiguration {
return ConditionOutcome return ConditionOutcome
.match(message.foundExactly("JWT resource configuration")); .match(message.foundExactly("JWT resource configuration"));
} }
if (!resolver.getSubProperties("jwk").isEmpty()) {
return ConditionOutcome
.match(message.foundExactly("JWK resource configuration"));
}
if (StringUtils.hasText(resolver.getProperty("user-info-uri"))) { if (StringUtils.hasText(resolver.getProperty("user-info-uri"))) {
return ConditionOutcome return ConditionOutcome
.match(message.foundExactly("user-info-uri property")); .match(message.foundExactly("user-info-uri property"));

10
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
View File

@ -388,6 +388,16 @@ public class OAuth2AutoConfigurationTests {
.isEqualTo(PrePostAnnotationSecurityMetadataSource.class.getName()); .isEqualTo(PrePostAnnotationSecurityMetadataSource.class.getName());
} }
@Test
public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch() throws Exception {
this.context = new AnnotationConfigEmbeddedWebApplicationContext();
EnvironmentTestUtils.addEnvironment(this.context,
"security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys");
this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class);
this.context.refresh();
assertThat(countBeans(RESOURCE_SERVER_CONFIG)).isEqualTo(1);
}
/** /**
* Connect to the oauth service, get a token, and then attempt some operations using * Connect to the oauth service, get a token, and then attempt some operations using
* it. * it.