spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source 
Closes gh-36753
This commit is contained in:
Brian Clozel
2026-05-05 11:59:37 +02:00
parent 051b09694e 628261d5bb
commit e6590aa1a8
4 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
-3
View File
@@ -74,9 +74,6 @@ public abstract class ResourceHandlerUtils {
}
else if (location instanceof ContextResource contextResource) {
path = contextResource.getPathWithinContext();
Assert.isTrue(!"/".equals(path),
() -> "Resource location '" + location + "' is considered unsafe " +
"and cannot be used as it provides access to the root servlet context.");
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceHandlerUtilsTests.java
-7
View File
@@ -82,13 +82,6 @@ class ResourceHandlerUtilsTests {
.withMessageContaining("is considered unsafe");
}
@Test
void assertResourceLocationShouldRejectUnsafeContextResource() {
assertThatIllegalArgumentException().isThrownBy(() ->
ResourceHandlerUtils.assertResourceLocation(new TestContextResource("/")))
.withMessageContaining("is considered unsafe");
}
private static class TestContextResource implements ContextResource {
private final String path;
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
-3
View File
@@ -75,9 +75,6 @@ public abstract class ResourceHandlerUtils {
}
else if (location instanceof ContextResource contextResource) {
path = contextResource.getPathWithinContext();
Assert.isTrue(!"/".equals(path),
() -> "Resource location '" + location + "' is considered unsafe " +
"and cannot be used as it provides access to the root servlet context.");
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHandlerUtilsTests.java
-7
View File
@@ -77,11 +77,4 @@ class ResourceHandlerUtilsTests {
.withMessageContaining("is considered unsafe");
}
@Test
void assertResourceLocationShouldRejectUnsafeContextResource() {
assertThatIllegalArgumentException().isThrownBy(() ->
ResourceHandlerUtils.assertResourceLocation(new ServletContextResource(new MockServletContext(), "/")))
.withMessageContaining("is considered unsafe");
}
}