Merge branch '7.0.x'

Closes gh-36753

Author: bclozel

spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java

@@ -74,9 +74,6 @@ else if (location instanceof ClassPathResource classPathResource) {
 			}
 			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

@@ -82,13 +82,6 @@ void assertResourceLocationShouldRejectUnsafeClassPathResource() {
 				.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

@@ -75,9 +75,6 @@ else if (location instanceof ClassPathResource classPathResource) {
 			}
 			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

@@ -77,11 +77,4 @@ void assertResourceLocationShouldRejectUnsafeClassPathResource() {
 				.withMessageContaining("is considered unsafe");
 	}
 
-	@Test
-	void assertResourceLocationShouldRejectUnsafeContextResource() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResourceHandlerUtils.assertResourceLocation(new ServletContextResource(new MockServletContext(), "/")))
-				.withMessageContaining("is considered unsafe");
-	}
-
 }