diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-09-14 09:23:13 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
commit | 6b87de95891565354f87d7051e5a075834eb7ca2 (patch) | |
tree | 1d82ee272e3916b5dacd611e6ab13593b3fa28f4 /jdisc_http_service/src | |
parent | b48b717506c2d40958b5b627863be90aca81cf51 (diff) |
Remove deprecated escaping
Diffstat (limited to 'jdisc_http_service/src')
2 files changed, 1 insertions, 59 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 95f26e8bc1b..617e081bd24 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 @@ -38,7 +38,7 @@ class HttpRequestFactory { } public static URI getUri(HttpServletRequest servletRequest) { - String query = extraQuote(servletRequest.getQueryString()); + String query = servletRequest.getQueryString(); try { return URI.create(servletRequest.getRequestURL() + (query != null ? '?' + query : "")); } catch (IllegalArgumentException e) { @@ -59,54 +59,6 @@ class HttpRequestFactory { } } - // TODO Remove this ugly, non-complete escaping in Vespa 7 - private static String extraQuote(String queryString) { - // TODO: Use an URI builder - if (queryString == null) return null; - - int toAndIncluding = -1; - for (int i = 0; i < queryString.length(); ++i) { - if (quote(queryString.charAt(i)) != null) { - break; - } - toAndIncluding = i; - } - - String washed; - if (toAndIncluding != (queryString.length() - 1)) { - StringBuilder w = new StringBuilder(queryString.substring(0, toAndIncluding + 1)); - for (int i = toAndIncluding + 1; i < queryString.length(); ++i) { - String s = quote(queryString.charAt(i)); - if (s == null) { - w.append(queryString.charAt(i)); - } else { - w.append(s); - } - } - washed = w.toString(); - } else { - washed = queryString; - } - return washed; - } - - private static String quote(char c) { - switch(c) { - case '\\': - return "%5C"; - case '^': - return "%5E"; - case '{': - return "%7B"; - case '|': - return "%7C"; - case '}': - return "%7D"; - default: - return null; - } - } - private static X509Certificate[] getCertChain(HttpServletRequest servletRequest) { return (X509Certificate[]) servletRequest.getAttribute("javax.servlet.request.X509Certificate"); } diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java index a15bf4c117a..6a2e35b617c 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java @@ -492,16 +492,6 @@ public class HttpRequestFactoryTest { } @Test - public final void test() { - String noise = "query=a" + "\\" + "^{|}&other=madeit"; - HttpServletRequest servletRequest = new MockRequest( - "http://yahoo.com/search?" + noise); - HttpRequest request = HttpRequestFactory.newJDiscRequest( - new MockContainer(), servletRequest); - assertThat(request.getUri().getQuery(), equalTo(noise)); - } - - @Test public final void testIllegalQuery() { try { HttpRequestFactory.newJDiscRequest( |