root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Handle trailing semicolon in Accept-Language 

Closes gh-32259
This commit is contained in:
Arjen Poutsma 2024-06-12 12:28:26 +02:00
parent 1d0af7e5d3
commit 099d016857
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/http/HttpHeaders.java
View File

@ -509,7 +509,20 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
*/ */
public List<Locale.LanguageRange> getAcceptLanguage() { public List<Locale.LanguageRange> getAcceptLanguage() {
String value = getFirst(ACCEPT_LANGUAGE); String value = getFirst(ACCEPT_LANGUAGE);
return (StringUtils.hasText(value) ? Locale.LanguageRange.parse(value) : Collections.emptyList()); if (StringUtils.hasText(value)) {
try {
return Locale.LanguageRange.parse(value);
}
catch (IllegalArgumentException ignored) {
String[] tokens = StringUtils.tokenizeToStringArray(value, ",");
for (int i = 0; i < tokens.length; i++) {
tokens[i] = StringUtils.trimTrailingCharacter(tokens[i], ';');
}
value = StringUtils.arrayToCommaDelimitedString(tokens);
return Locale.LanguageRange.parse(value);
}
}
return Collections.emptyList();
} }
/** /**

14
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@ -517,6 +517,20 @@ class HttpHeadersTests {
assertThat(headers.getAcceptLanguageAsLocales()).first().isEqualTo(Locale.FRANCE); assertThat(headers.getAcceptLanguageAsLocales()).first().isEqualTo(Locale.FRANCE);
} }
@Test // gh-32259
void acceptLanguageTrailingSemicolon() {
String headerValue = "en-us,en;,nl;";
headers.set(HttpHeaders.ACCEPT_LANGUAGE, headerValue);
assertThat(headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE)).isEqualTo(headerValue);
List<Locale.LanguageRange> expectedRanges = Arrays.asList(
new Locale.LanguageRange("en-us"),
new Locale.LanguageRange("en"),
new Locale.LanguageRange("nl")
);
assertThat(headers.getAcceptLanguage()).isEqualTo(expectedRanges);
}
@Test // SPR-15603 @Test // SPR-15603
void acceptLanguageWithEmptyValue() { void acceptLanguageWithEmptyValue() {
this.headers.set(HttpHeaders.ACCEPT_LANGUAGE, ""); this.headers.set(HttpHeaders.ACCEPT_LANGUAGE, "");