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

ContentDisposition trims charset in filename

Browse Source 
Backport of c8bce9686f

Closes gh-24112
This commit is contained in:
Rossen Stoyanchev
2019-12-13 05:46:09 +00:00
parent 3fbe762832
commit 2576aa4063
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
View File

@@ -277,7 +277,7 @@ public final class ContentDisposition {
}
else if (attribute.equals("filename*") ) {
filename = decodeHeaderFieldParam(value);
charset = Charset.forName(value.substring(0, value.indexOf('\'')));
charset = Charset.forName(value.substring(0, value.indexOf('\'')).trim());
Assert.isTrue(UTF_8.equals(charset) || ISO_8859_1.equals(charset),
"Charset should be UTF-8 or ISO-8859-1");
}
@@ -371,7 +371,7 @@ public final class ContentDisposition {
if (firstQuoteIndex == -1 || secondQuoteIndex == -1) {
return input;
}
Charset charset = Charset.forName(input.substring(0, firstQuoteIndex));
Charset charset = Charset.forName(input.substring(0, firstQuoteIndex).trim());
Assert.isTrue(UTF_8.equals(charset) || ISO_8859_1.equals(charset),
"Charset should be UTF-8 or ISO-8859-1");
byte[] value = input.substring(secondQuoteIndex + 1, input.length()).getBytes(charset);