diff options
Diffstat (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java index 9b1b1e087db..86aa9b994f9 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java @@ -55,14 +55,24 @@ class HttpRequestFactory { builder.append('?').append(query); } URI uri = URI.create(builder.toString()); - if ( ! scheme.equals(uri.getScheme()) || ! host.equals(uri.getHost()) || port != uri.getPort()) - throw new IllegalArgumentException("Bad scheme, host or port"); + validateSchemeHostPort(scheme, host, port, uri); return uri; } catch (IllegalArgumentException e) { throw createBadQueryException(e); } } + private static void validateSchemeHostPort(String scheme, String host, int port, URI uri) { + if ( ! scheme.equals(uri.getScheme())) + throw new IllegalArgumentException("Bad scheme: " + scheme); + + if ( ! host.equals(uri.getHost())) + throw new IllegalArgumentException("Bad host: " + host); + + if (port != uri.getPort() && ! (port == 80 && scheme.equals("http")) && ! (port == 443 && scheme.equals("https"))) + throw new IllegalArgumentException("Bad port: " + port); + } + private static RequestException createBadQueryException(IllegalArgumentException e) { return new RequestException(Response.Status.BAD_REQUEST, "Query violates RFC 2396: " + e.getMessage(), e); } |