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

Throw exception if classpath*: is used

Browse Source 
Update `ConfigFileApplicationListener` to throw a better exception if
`classpath*:` is used as a location.

Closes gh-21168
This commit is contained in:
Phillip Webb
2020-04-27 13:37:54 -07:00
parent 16005c608f
commit e2705b2cfd
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View File

@@ -62,6 +62,7 @@ import org.springframework.core.env.PropertySource;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
@@ -618,6 +619,8 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
for (String path : asResolvedSet(this.environment.getProperty(propertyName), null)) {
if (!path.contains("$")) {
path = StringUtils.cleanPath(path);
Assert.state(!path.startsWith(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX),
"Classpath wildard patterns cannot be used as a search location");
if (!ResourceUtils.isUrl(path)) {
path = ResourceUtils.FILE_URL_PREFIX + path;
}

10
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@@ -63,6 +63,7 @@ import org.springframework.test.context.support.TestPropertySourceUtils;
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* Tests for {@link ConfigFileApplicationListener}.
@@ -648,6 +649,15 @@ public class ConfigFileApplicationListenerTests {
matchingPropertySource("applicationConfig: [file:" + location.replace(File.separatorChar, '/') + "]"));
}
@Test
public void classpathWildcardResourceThrowsException() {
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
"spring.config.location=classpath*:override.properties");
assertThatIllegalStateException()
.isThrownBy(() -> this.initializer.postProcessEnvironment(this.environment, this.application))
.withMessage("Classpath wildard patterns cannot be used as a search location");
}
@Test
public void propertySourceAnnotation() {
SpringApplication application = new SpringApplication(WithPropertySource.class);