Exception in Jersey Jetty handler's Host header parsing bubbles up to the top #5189

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java

@@ -238,13 +238,9 @@ public String getAuthenticationScheme() {
     }
 
 
-    private URI getBaseUri(final Request request) {
-        try {
-            return new URI(request.getScheme(), null, request.getServerName(),
-                    request.getServerPort(), getBasePath(request), null, null);
-        } catch (final URISyntaxException ex) {
-            throw new IllegalArgumentException(ex);
-        }
+    private URI getBaseUri(final Request request) throws URISyntaxException {
+        return new URI(request.getScheme(), null, request.getServerName(),
+                request.getServerPort(), getBasePath(request), null, null);
     }
 
     private String getBasePath(final Request request) {

containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/ExceptionTest.java

@@ -65,6 +65,19 @@ public void test400StatusCodeForIllegalSymbolsInURI() throws IOException {
         assertEquals(400, response.getStatusLine().getStatusCode());
     }
 
+    @Test
+    public void test400StatusCodeForIllegalHeaderValue() throws IOException {
+        startServer(ExceptionResource.class);
+        URI testUri = getUri().build();
+        BasicHttpRequest request = new BasicHttpRequest("GET", testUri.toString() + "/400");
+        request.addHeader("X-Forwarded-Host", "_foo.com");
+        CloseableHttpClient client = HttpClientBuilder.create().build();
+
+        CloseableHttpResponse response = client.execute(new HttpHost(testUri.getHost(), testUri.getPort()), request);
+
+        assertEquals(400, response.getStatusLine().getStatusCode());
+    }
+
     @Test
     public void test400StatusCode() throws IOException {
         startServer(ExceptionResource.class);