Ignore malformed language ranges when resolving locales for validation

(cherry picked from commit 557058a)
quarkusio · May 9, 2023 · 7b415fe · 7b415fe
1 parent 9481932
commit 7b415fe
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/...e/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java b/...e/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java
@@ -7,20 +7,23 @@
 
 import org.hibernate.validator.spi.messageinterpolation.LocaleResolver;
 import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext;
+import org.jboss.logging.Logger;
 
 abstract class AbstractLocaleResolver implements LocaleResolver {
 
+    private static final Logger log = Logger.getLogger(AbstractLocaleResolver.class);
+    private static final String ACCEPT_HEADER = "Accept-Language";
+
     protected abstract Map<String, List<String>> getHeaders();
 
     @Override
     public Locale resolve(LocaleResolverContext context) {
         Optional<List<Locale.LanguageRange>> localePriorities = getAcceptableLanguages();
-        if (!localePriorities.isPresent()) {
+        if (localePriorities.isEmpty()) {
             return null;
         }
-
         List<Locale> resolvedLocales = Locale.filter(localePriorities.get(), context.getSupportedLocales());
-        if (resolvedLocales.size() > 0) {
+        if (!resolvedLocales.isEmpty()) {
             return resolvedLocales.get(0);
         }
 
@@ -30,9 +33,17 @@ public Locale resolve(LocaleResolverContext context) {
     private Optional<List<Locale.LanguageRange>> getAcceptableLanguages() {
         Map<String, List<String>> httpHeaders = getHeaders();
         if (httpHeaders != null) {
-            List<String> acceptLanguageList = httpHeaders.get("Accept-Language");
+            List<String> acceptLanguageList = httpHeaders.get(ACCEPT_HEADER);
             if (acceptLanguageList != null && !acceptLanguageList.isEmpty()) {
-                return Optional.of(Locale.LanguageRange.parse(acceptLanguageList.get(0)));
+                try {
+                    return Optional.of(Locale.LanguageRange.parse(acceptLanguageList.get(0)));
+                } catch (IllegalArgumentException e) {
+                    // this can happen when parsing malformed locale range string
+                    if (log.isDebugEnabled()) {
+                        log.debug("Unable to parse the \"Accept-Language\" header. \"" + acceptLanguageList.get(0)
+                                + "\" is not a valid language range string.", e);
+                    }
+                }
             }
         }
 

diff --git a/...time/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java b/...time/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java
@@ -9,6 +9,7 @@
 
 import org.hibernate.validator.spi.messageinterpolation.LocaleResolver;
 import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext;
+import org.jboss.logging.Logger;
 
 import graphql.schema.DataFetchingEnvironment;
 import io.smallrye.graphql.execution.context.SmallRyeContext;
@@ -20,12 +21,13 @@
 @Singleton
 public class SmallRyeGraphQLLocaleResolver implements LocaleResolver {
 
+    private static final Logger log = Logger.getLogger(SmallRyeGraphQLLocaleResolver.class);
     private static final String ACCEPT_HEADER = "Accept-Language";
 
     @Override
     public Locale resolve(LocaleResolverContext context) {
         Optional<List<Locale.LanguageRange>> localePriorities = getAcceptableLanguages();
-        if (!localePriorities.isPresent()) {
+        if (localePriorities.isEmpty()) {
             return null;
         }
         List<Locale> resolvedLocales = Locale.filter(localePriorities.get(), context.getSupportedLocales());
@@ -41,7 +43,15 @@ private Optional<List<Locale.LanguageRange>> getAcceptableLanguages() {
         if (httpHeaders != null) {
             List<String> acceptLanguageList = httpHeaders.get(ACCEPT_HEADER);
             if (acceptLanguageList != null && !acceptLanguageList.isEmpty()) {
-                return Optional.of(Locale.LanguageRange.parse(acceptLanguageList.get(0)));
+                try {
+                    return Optional.of(Locale.LanguageRange.parse(acceptLanguageList.get(0)));
+                } catch (IllegalArgumentException e) {
+                    // this can happen when parsing malformed locale range string
+                    if (log.isDebugEnabled()) {
+                        log.debug("Unable to parse the \"Accept-Language\" header. \"" + acceptLanguageList.get(0)
+                                + "\" is not a valid language range string.", e);
+                    }
+                }
             }
         }
         return Optional.empty();

diff --git a/.../src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/.../src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
@@ -367,6 +367,16 @@ public void testValidationMessageLocale() {
                 .body(containsString("Vrijednost ne zadovoljava uzorak"));
     }
 
+    @Test
+    public void testValidationMessageInvalidAcceptLanguageHeaderLeadsToDefaultLocaleBeingUsed() {
+        RestAssured.given()
+                .header("Accept-Language", "invalid string")
+                .when()
+                .get("/hibernate-validator/test/test-validation-message-locale/1")
+                .then()
+                .body(containsString("Value is not in line with the pattern"));
+    }
+
     @Test
     public void testValidationMessageDefaultLocale() {
         RestAssured.given()