root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Append trailing slash to static location 

Closes gh-33815
This commit is contained in:
rstoyanchev 2024-11-06 11:10:45 +00:00
parent 37243f44e8
commit 59ec871e76
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,8 @@ public abstract class ResourceHandlerUtils {
else { else {
path = location.getURL().getPath(); path = location.getURL().getPath();
} }
assertLocationPath(path); Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR),
"Resource location does not end with slash: " + path);
} }
catch (IOException ex) { catch (IOException ex) {
// ignore // ignore
@ -73,12 +74,18 @@ public abstract class ResourceHandlerUtils {
} }
/** /**
* Assert the given location path is a directory and ends on slash. * Check if the given static resource location path ends with a trailing
* slash, and append it if necessary.
* @param path the location path
* @return the resulting path to use
*/ */
public static void assertLocationPath(@Nullable String path) { public static String initLocationPath(String path) {
Assert.notNull(path, "Resource location path must not be null"); String separator = (path.contains(FOLDER_SEPARATOR) ? FOLDER_SEPARATOR : WINDOWS_FOLDER_SEPARATOR);
Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR), if (!path.endsWith(separator)) {
"Resource location does not end with slash: " + path); path = path.concat(separator);
logger.warn("Appended trailing slash to static resource location: " + path);
}
return path;
} }
/** /**

2
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
View File

@ -379,7 +379,7 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
Assert.isTrue(CollectionUtils.isEmpty(this.locationResources), "Please set " + Assert.isTrue(CollectionUtils.isEmpty(this.locationResources), "Please set " +
"either Resource-based \"locations\" or String-based \"locationValues\", but not both."); "either Resource-based \"locations\" or String-based \"locationValues\", but not both.");
for (String location : this.locationValues) { for (String location : this.locationValues) {
ResourceHandlerUtils.assertLocationPath(location); location = ResourceHandlerUtils.initLocationPath(location);
result.add(this.resourceLoader.getResource(location)); result.add(this.resourceLoader.getResource(location));
} }
} }

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

@ -65,7 +65,8 @@ public abstract class ResourceHandlerUtils {
else { else {
path = location.getURL().getPath(); path = location.getURL().getPath();
} }
assertLocationPath(path); Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR),
"Resource location does not end with slash: " + path);
} }
catch (IOException ex) { catch (IOException ex) {
// ignore // ignore
@ -73,12 +74,18 @@ public abstract class ResourceHandlerUtils {
} }
/** /**
* Assert the given location path is a directory and ends on slash. * Check if the given static resource location path ends with a trailing
* slash, and append it if necessary.
* @param path the location path
* @return the resulting path to use
*/ */
public static void assertLocationPath(@Nullable String path) { public static String initLocationPath(String path) {
Assert.notNull(path, "Resource location path must not be null"); String separator = (path.contains(FOLDER_SEPARATOR) ? FOLDER_SEPARATOR : WINDOWS_FOLDER_SEPARATOR);
Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR), if (!path.endsWith(separator)) {
"Resource location does not end with slash: " + path); path = path.concat(separator);
logger.warn("Appended trailing slash to static resource location: " + path);
}
return path;
} }
/** /**

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@ -496,7 +496,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
charset = Charset.forName(value); charset = Charset.forName(value);
location = location.substring(endIndex + 1); location = location.substring(endIndex + 1);
} }
ResourceHandlerUtils.assertLocationPath(location); location = ResourceHandlerUtils.initLocationPath(location);
Resource resource = applicationContext.getResource(location); Resource resource = applicationContext.getResource(location);
if (location.equals("/") && !(resource instanceof ServletContextResource)) { if (location.equals("/") && !(resource instanceof ServletContextResource)) {
throw new IllegalStateException( throw new IllegalStateException(