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

Process URL path for filename extraction if URI does not expose path 

Closes gh-31718
This commit is contained in:
Juergen Hoeller 2023-11-29 17:08:59 +01:00
parent df00aafdff
commit f3b1f37000
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-core/src/main/java/org/springframework/core/io/UrlResource.java
View File

@ -332,13 +332,15 @@ public class UrlResource extends AbstractFileResolvingResource {
@Nullable
public String getFilename() {
if (this.uri != null) {
// URI path is decoded and has standard separators
return StringUtils.getFilename(this.uri.getPath());
}
else {
String filename = StringUtils.getFilename(StringUtils.cleanPath(this.url.getPath()));
return (filename != null ? URLDecoder.decode(filename, StandardCharsets.UTF_8) : null);
String path = this.uri.getPath();
if (path != null) {
// Prefer URI path: decoded and has standard separators
return StringUtils.getFilename(this.uri.getPath());
}
}
// Otherwise, process URL path
String filename = StringUtils.getFilename(StringUtils.cleanPath(this.url.getPath()));
return (filename != null ? URLDecoder.decode(filename, StandardCharsets.UTF_8) : null);
}
/**

17
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@ -302,11 +302,28 @@ class ResourceTests {
@Test
void filenameIsExtractedFromFilePath() throws Exception {
assertThat(new UrlResource("file:test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:/test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:/test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:/dir/test?argh").getFilename()).isEqualTo("test");
assertThat(new UrlResource("file:/dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:\\dir\\test.txt?argh").getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource("file:\\dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
}
@Test
void filenameIsExtractedFromURL() throws Exception {
assertThat(new UrlResource(new URL("file:test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:/test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:/test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:/dir/test?argh")).getFilename()).isEqualTo("test");
assertThat(new UrlResource(new URL("file:/dir/test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:\\dir\\test.txt?argh")).getFilename()).isEqualTo("test.txt");
assertThat(new UrlResource(new URL("file:\\dir/test.txt?argh")).getFilename()).isEqualTo("test.txt");
}
@Test
void filenameContainingHashTagIsExtractedFromFilePathUnencoded() throws Exception {
String unencodedPath = "/dir/test#1.txt";