Use case-insensitive check for request conditions

This commit ensures that the ConsumesRequestCondition and ProducesRequestCondition use a case insensitive check when comparing parameters. Closes gh-29416
spring-projects · Nov 2, 2022 · 9e30615 · 9e30615
1 parent 481389f
commit 9e30615
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/...n/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java b/...n/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
@@ -85,7 +85,7 @@ protected boolean matchParameters(MediaType contentType) {
 		for (Map.Entry<String, String> entry : getMediaType().getParameters().entrySet()) {
 			if (StringUtils.hasText(entry.getValue())) {
 				String value = contentType.getParameter(entry.getKey());
-				if (StringUtils.hasText(value) && !entry.getValue().equals(value)) {
+				if (StringUtils.hasText(value) && !entry.getValue().equalsIgnoreCase(value)) {
 					return false;
 				}
 			}

diff --git a/...java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java b/...java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java
@@ -98,6 +98,10 @@ public void matchWithParameters() {
 		condition = new ConsumesRequestCondition(base);
 		exchange = postExchange(base + ";profile=\"a\"");
 		assertThat(condition.getMatchingCondition(exchange)).isNotNull();
+
+		condition = new ConsumesRequestCondition(base + ";profile=\"a\"");
+		exchange = postExchange(base + ";profile=\"A\"");
+		assertThat(condition.getMatchingCondition(exchange)).isNotNull();
 	}
 
 	@Test

diff --git a/.../main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/.../main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
@@ -85,7 +85,7 @@ protected boolean matchParameters(MediaType contentType) {
 		for (Map.Entry<String, String> entry : getMediaType().getParameters().entrySet()) {
 			if (StringUtils.hasText(entry.getValue())) {
 				String value = contentType.getParameter(entry.getKey());
-				if (StringUtils.hasText(value) && !entry.getValue().equals(value)) {
+				if (StringUtils.hasText(value) && !entry.getValue().equalsIgnoreCase(value)) {
 					return false;
 				}
 			}

diff --git a/...est/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java b/...est/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java
@@ -107,6 +107,10 @@ public void matchWithParameters() {
 		condition = new ConsumesRequestCondition(base);
 		request.setContentType(base + ";profile=\"a\"");
 		assertThat(condition.getMatchingCondition(request)).isNotNull();
+
+		condition = new ConsumesRequestCondition(base + ";profile=\"a\"");
+		request.setContentType(base + ";profile=\"A\"");
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test