don't fail on bad Accept-Language header fix #374

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue374.java

@@ -0,0 +1,35 @@
+package org.jooby.issues;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class Issue374 extends ServerFeature {
+
+  {
+    use(ConfigFactory.empty()
+        .withValue("application.lang", ConfigValueFactory.fromAnyRef("en-us, es-ar")));
+
+    get("/374", req -> req.locale().toString().toLowerCase());
+  }
+
+  @Test
+  public void shouldRestoreIllFormed() throws Exception {
+    request()
+        .get("/374")
+        .header("Accept-Language", "es-ar;")
+        .expect("es_ar");
+  }
+
+  @Test
+  public void dontFailOnBadAcceptLanguage() throws Exception {
+
+    request()
+        .get("/374")
+        .header("Accept-Language", "xx^x")
+        .expect("en_us");
+  }
+
+}

jooby/src/main/java/org/jooby/internal/LocaleUtils.java

@@ -50,7 +50,8 @@ public static Locale parseOne(final String value) {
   }
 
   public static List<Locale.LanguageRange> range(final String value) {
-    List<Locale.LanguageRange> range = Locale.LanguageRange.parse(value);
+    // replace ';' by ',' well-formed vs ill-formed
+    List<Locale.LanguageRange> range = Locale.LanguageRange.parse(value.replace(';', ','));
     return range.stream()
         .sorted(Comparator.comparing(Locale.LanguageRange::getWeight).reversed())
         .collect(Collectors.toList());

jooby/src/main/java/org/jooby/internal/RequestImpl.java

@@ -34,6 +34,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.jooby.Cookie;
@@ -285,8 +286,10 @@ public List<Locale> locales(
 
   @Override
   public Locale locale(final BiFunction<List<LanguageRange>, List<Locale>, Locale> filter) {
-    return lang.map(h -> filter.apply(LocaleUtils.range(h), locales))
-        .orElseGet(() -> filter.apply(ImmutableList.of(), locales));
+    Supplier<Locale> def = () -> filter.apply(ImmutableList.of(), locales);
+    // don't fail on bad Accept-Language header, just fallback to default locale.
+    return lang.map(h -> Try.of(() -> filter.apply(LocaleUtils.range(h), locales)).getOrElse(def))
+        .orElseGet(def);
   }
 
   @Override