Quote question marks in content-disposition

Closes gh-30252
spring-projects · Mar 31, 2023 · 84117e8 · 84117e8
1 parent d451d6a
commit 84117e8
Show file tree

Hide file tree

Showing 2 changed files with 17 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
@@ -599,7 +599,7 @@ private static String encodeQuotedPrintableFilename(String filename, Charset cha
 	}
 
 	private static boolean isPrintable(byte c) {
-		return (c >= '!' && c <= '<') || (c >= '>' && c <= '~');
+		return (c >= '!' && c <= '<') || (c >= '@' && c <= '~') || c == '>';
 	}
 
 	private static String encodeQuotedPairs(String filename) {

diff --git a/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java b/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
@@ -325,4 +325,20 @@ void parseFormatted() {
 		assertThat(parsed.toString()).isEqualTo(cd.toString());
 	}
 
+	@Test // gh-30252
+	void parseFormattedWithQuestionMark() {
+		String filename = "filename with ?问号.txt";
+		ContentDisposition cd = ContentDisposition.attachment()
+				.filename(filename, StandardCharsets.UTF_8)
+				.build();
+		String[] parts = cd.toString().split("; ");
+
+		String quotedPrintableFilename = parts[0] + "; " + parts[1];
+		assertThat(ContentDisposition.parse(quotedPrintableFilename).getFilename())
+				.isEqualTo(filename);
+
+		String rfc5987Filename = parts[0] + "; " + parts[2];
+		assertThat(ContentDisposition.parse(rfc5987Filename).getFilename())
+				.isEqualTo(filename);
+	}
 }