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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-08-21 10:21:32 +03:00
parent b3aebf9e9b 6d8bf3466c
commit 364c7c459d
10 changed files with 115 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
View File

@@ -91,6 +91,13 @@ public class PathResourceResolverTests {
assertThat(actual).isNull();
}
@Test // gh-23463
public void ignoreInvalidEscapeSequence() throws IOException {
UrlResource location = new UrlResource(getClass().getResource("./test/"));
Resource resource = location.createRelative("test%file.txt");
assertTrue(this.resolver.checkResource(resource, location));
}
@Test
public void checkResourceWithAllowedLocations() {
this.resolver.setAllowedLocations(
@@ -104,8 +111,7 @@ public class PathResourceResolverTests {
assertThat(actual).isEqualTo("../testalternatepath/bar.css");
}
// SPR-12432
@Test
@Test // SPR-12432
public void checkServletContextResource() throws Exception {
Resource classpathLocation = new ClassPathResource("test/", PathResourceResolver.class);
MockServletContext context = new MockServletContext();
@@ -117,8 +123,7 @@ public class PathResourceResolverTests {
assertThat(this.resolver.checkResource(resource, servletContextLocation)).isTrue();
}
// SPR-12624
@Test
@Test // SPR-12624
public void checkRelativeLocation() throws Exception {
String locationUrl= new UrlResource(getClass().getResource("./test/")).getURL().toExternalForm();
Resource location = new UrlResource(locationUrl.replace("/springframework","/../org/springframework"));
@@ -126,15 +131,13 @@ public class PathResourceResolverTests {
assertThat(this.resolver.resolveResource(null, "main.css", Collections.singletonList(location), null)).isNotNull();
}
// SPR-12747
@Test
@Test // SPR-12747
public void checkFileLocation() throws Exception {
Resource resource = getResource("main.css");
assertThat(this.resolver.checkResource(resource, resource)).isTrue();
}
// SPR-13241
@Test
@Test // SPR-13241
public void resolvePathRootResource() {
Resource webjarsLocation = new ClassPathResource("/META-INF/resources/webjars/", PathResourceResolver.class);
String path = this.resolver.resolveUrlPathInternal("", Collections.singletonList(webjarsLocation), null);