ContentDisposition trims charset in filename

Closes gh-24112
spring-projects · Dec 10, 2019 · c8bce96 · c8bce96
1 parent f180bf7
commit c8bce96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
@@ -282,7 +282,7 @@ else if (attribute.equals("filename*") ) {
 					int idx1 = value.indexOf('\'');
 					int idx2 = value.indexOf('\'', idx1 + 1);
 					if (idx1 != -1 && idx2 != -1) {
-						charset = Charset.forName(value.substring(0, idx1));
+						charset = Charset.forName(value.substring(0, idx1).trim());
 						Assert.isTrue(UTF_8.equals(charset) || ISO_8859_1.equals(charset),
 								"Charset should be UTF-8 or ISO-8859-1");
 						filename = decodeFilename(value.substring(idx2 + 1), charset);

diff --git a/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java b/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
@@ -70,6 +70,14 @@ public void parseEncodedFilename() {
 						.build());
 	}
 
+	@Test // gh-24112
+	public void parseEncodedFilenameWithPaddedCharset() {
+		assertThat(parse("attachment; filename*= UTF-8''some-file.zip"))
+				.isEqualTo(ContentDisposition.builder("attachment")
+						.filename("some-file.zip", StandardCharsets.UTF_8)
+						.build());
+	}
+
 	@Test
 	public void parseEncodedFilenameWithoutCharset() {
 		assertThat(parse("form-data; name=\"name\"; filename*=test.txt"))