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

Add explicit FileSystemResource path check for trailing slash

Browse Source 
Closes gh-34509
This commit is contained in:
Juergen Hoeller
2025-03-04 18:44:25 +01:00
parent e421104cf3
commit 534f123fe8
4 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
View File

@@ -24,7 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.PathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils;
@@ -58,15 +58,18 @@ public abstract class ResourceHandlerUtils {
Assert.notNull(location, "Resource location must not be null");
try {
String path;
if (location instanceof PathResource) {
if (location instanceof org.springframework.core.io.PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
else if (location instanceof FileSystemResource fileSystemResource) {
path = fileSystemResource.getPath();
}
else if (location instanceof ClassPathResource classPathResource) {
path = classPathResource.getPath();
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
}
else {
path = location.getURL().getPath();
}

16
spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@@ -24,6 +24,7 @@ import java.util.function.Function;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.web.servlet.handler.PathPatternsTestUtils;
@@ -102,4 +103,17 @@ class PathResourceLookupFunctionTests {
Collections.emptyList());
}
@Test
@SuppressWarnings("removal")
void withPathResource() {
org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
}
@Test
void withFileSystemResource() {
FileSystemResource location = new FileSystemResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
}
}