Skip to content

Reject truncated percent-encoding in RFC2231Utils.decodeText #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 1 commit into from
Jul 11, 2026
+8 −1
Merged

Reject truncated percent-encoding in RFC2231Utils.decodeText #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/RFC2231Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ private static byte[] fromHex(final String text) {
final var c = text.charAt(i++);
if (c == '%') {
if (i > text.length() - 2) {
break; // unterminated sequence
// A '%' that is not followed by two hex digits is a truncated escape sequence.
throw new IllegalArgumentException();
}
final var c1 = text.charAt(i++);
final var c2 = text.charAt(i++);
Expand Down
6 changes: 6 additions & 0 deletions ...pload2-core/src/test/java/org/apache/commons/fileupload2/core/RFC2231UtilityTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ void testDecodeInvalidPercentEncoded() throws Exception {
assertThrows(IllegalArgumentException.class, () -> RFC2231Utils.decodeText("ISO-8859-1''hello%3\u8a35"));
}

@Test
void testDecodeTruncatedPercentEncoded() throws Exception {
assertThrows(IllegalArgumentException.class, () -> RFC2231Utils.decodeText("ISO-8859-1''hello%"));
assertThrows(IllegalArgumentException.class, () -> RFC2231Utils.decodeText("ISO-8859-1''hello%3"));
}

@Test
void testDecodeIso88591() throws Exception {
assertEncoded("\u00A3 rate", "iso-8859-1'en'%A3%20rate"); // "£ rate"
Expand Down
Loading