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

Polish 

See gh-15814
This commit is contained in:
Stephane Nicoll 2019-04-09 14:20:52 +02:00
parent f42b6199ae
commit ee735a61ce
6 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/KeyValueCondition.java
View File

@ -42,7 +42,7 @@ public class KeyValueCondition extends SpringBootCondition {
"spring.security.oauth2.resourceserver.jwt.public-key-location");
if (!StringUtils.hasText(publicKeyLocation)) {
return ConditionOutcome
.noMatch(message.didNotFind("issuer-uri property").atAll());
.noMatch(message.didNotFind("public-key-location property").atAll());
}
String issuerUri = environment
.getProperty("spring.security.oauth2.resourceserver.jwt.issuer-uri");

28
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -15,7 +15,15 @@
*/
package org.springframework.boot.autoconfigure.security.oauth2.resource;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
import org.springframework.util.StreamUtils;
/**
* OAuth 2.0 resource server properties.
@ -53,7 +61,7 @@ public class OAuth2ResourceServerProperties {
/**
* Location of the file containing the public key used to verify a JWT.
*/
private String publicKeyLocation;
private Resource publicKeyLocation;
public String getJwkSetUri() {
return this.jwkSetUri;
@ -79,14 +87,26 @@ public class OAuth2ResourceServerProperties {
this.issuerUri = issuerUri;
}
public String getPublicKeyLocation() {
public Resource getPublicKeyLocation() {
return this.publicKeyLocation;
}
public void setPublicKeyLocation(String publicKeyLocation) {
public void setPublicKeyLocation(Resource publicKeyLocation) {
this.publicKeyLocation = publicKeyLocation;
}
public String readPublicKey() throws IOException {
String key = "spring.security.oauth2.resourceserver.public-key-location";
Assert.notNull(this.publicKeyLocation, "PublicKeyLocation must not be null");
if (!this.publicKeyLocation.exists()) {
throw new InvalidConfigurationPropertyValueException(key,
this.publicKeyLocation, "Public key location does not exist");
}
try (InputStream inputStream = this.publicKeyLocation.getInputStream()) {
return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
}
}
}
}

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java
View File

@ -15,7 +15,6 @@
*/
package org.springframework.boot.autoconfigure.security.oauth2.resource.reactive;
import java.io.InputStreamReader;
import java.security.KeyFactory;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.X509EncodedKeySpec;
@ -32,8 +31,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.oauth2.jwt.NimbusReactiveJwtDecoder;
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoders;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.ResourceUtils;
/**
* Configures a {@link ReactiveJwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI
@ -63,10 +60,9 @@ class ReactiveOAuth2ResourceServerJwkConfiguration {
@Conditional(KeyValueCondition.class)
@ConditionalOnMissingBean
public NimbusReactiveJwtDecoder jwtDecoderByPublicKeyValue() throws Exception {
String keyValue = FileCopyUtils.copyToString(new InputStreamReader(ResourceUtils
.getURL(this.properties.getPublicKeyLocation()).openStream()));
RSAPublicKey publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA")
.generatePublic(new X509EncodedKeySpec(getKeySpec(keyValue)));
.generatePublic(new X509EncodedKeySpec(
getKeySpec(this.properties.readPublicKey())));
return NimbusReactiveJwtDecoder.withPublicKey(publicKey).build();
}

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java
View File

@ -15,7 +15,6 @@
*/
package org.springframework.boot.autoconfigure.security.oauth2.resource.servlet;
import java.io.InputStreamReader;
import java.security.KeyFactory;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.X509EncodedKeySpec;
@ -32,8 +31,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtDecoders;
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.ResourceUtils;
/**
* Configures a {@link JwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI or Public
@ -63,10 +60,9 @@ class OAuth2ResourceServerJwtConfiguration {
@Conditional(KeyValueCondition.class)
@ConditionalOnMissingBean
public JwtDecoder jwtDecoderByPublicKeyValue() throws Exception {
String keyValue = FileCopyUtils.copyToString(new InputStreamReader(ResourceUtils
.getURL(this.properties.getPublicKeyLocation()).openStream()));
RSAPublicKey publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA")
.generatePublic(new X509EncodedKeySpec(getKeySpec(keyValue)));
.generatePublic(new X509EncodedKeySpec(
getKeySpec(this.properties.readPublicKey())));
return NimbusJwtDecoder.withPublicKey(publicKey).build();
}

9
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
View File

@ -115,6 +115,15 @@ public class ReactiveOAuth2ResourceServerAutoConfigurationTests {
});
}
@Test
public void autoConfigurationShouldFailIfPublicKeyLocationDoesNotExist() {
this.contextRunner.withPropertyValues(
"spring.security.oauth2.resourceserver.jwt.public-key-location=classpath:does-not-exist")
.run((context) -> assertThat(context).hasFailed().getFailure()
.hasMessageContaining("class path resource [does-not-exist]")
.hasMessageContaining("Public key location does not exist"));
}
@Test
public void autoConfigurationWhenSetUriKeyLocationIssuerUriPresentShouldUseSetUri() {
this.contextRunner.withPropertyValues(

9
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
View File

@ -149,6 +149,15 @@ public class OAuth2ResourceServerAutoConfigurationTests {
});
}
@Test
public void autoConfigurationShouldFailIfPublicKeyLocationDoesNotExist() {
this.contextRunner.withPropertyValues(
"spring.security.oauth2.resourceserver.jwt.public-key-location=classpath:does-not-exist")
.run((context) -> assertThat(context).hasFailed().getFailure()
.hasMessageContaining("class path resource [does-not-exist]")
.hasMessageContaining("Public key location does not exist"));
}
@Test
public void autoConfigurationWhenSetUriKeyLocationAndIssuerUriPresentShouldUseSetUri() {
this.contextRunner.withPropertyValues(