Skip to content

Reject MIME type parameters differing only in case #37008

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

Open
junhyeong9812 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

Reject MIME type parameters differing only in case #37008

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
6 changes: 4 additions & 2 deletions spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.function.BiPredicate;
Expand Down Expand Up @@ -246,7 +246,9 @@ else if (ch == '"' && (nextIndex == 0 || mimeType.charAt(nextIndex - 1) != '\\')
String parameter = mimeType.substring(index + 1, nextIndex).trim();
if (parameter.length() > 0) {
if (parameters == null) {
parameters = new LinkedHashMap<>(4);
// Parameter names are case-insensitive, so use a case-insensitive
// map in order to reject duplicates that differ only in case.
parameters = new LinkedCaseInsensitiveMap<>(4, Locale.ROOT);
}
int eqIndex = parameter.indexOf('=');
if (eqIndex >= 0) {
Expand Down
7 changes: 7 additions & 0 deletions spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ void rejectsDuplicateParameter() {
.hasMessageContaining("Invalid mime type \"text/plain;dupe=\"1\";dupe=\"2\"\": duplicate parameter 'dupe=\"2\"'");
}

@Test
void rejectsDuplicateParameterWithDifferentCase() {
String s = "text/plain;dupe=\"1\";DUPE=\"2\"";
assertThatThrownBy(() -> MimeType.valueOf(s)).isInstanceOf(InvalidMimeTypeException.class)
.hasMessageContaining("Invalid mime type \"text/plain;dupe=\"1\";DUPE=\"2\"\": duplicate parameter 'DUPE=\"2\"'");
}

@Test
void withConversionService() {
ConversionService conversionService = new DefaultConversionService();
Expand Down