Browse Source

Handle trailing semicolon in Accept-Language

Closes gh-32259
pull/33017/head
Arjen Poutsma 2 years ago
parent
commit
099d016857
  1. 15
      spring-web/src/main/java/org/springframework/http/HttpHeaders.java
  2. 14
      spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java

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

@ -509,7 +509,20 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable @@ -509,7 +509,20 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
*/
public List<Locale.LanguageRange> getAcceptLanguage() {
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

@ -517,6 +517,20 @@ class HttpHeadersTests { @@ -517,6 +517,20 @@ class HttpHeadersTests {
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
void acceptLanguageWithEmptyValue() {
this.headers.set(HttpHeaders.ACCEPT_LANGUAGE, "");

Loading…
Cancel
Save