Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10132 from eclipse/fix/12.0.0/error-dispatch-query-string 

Issue #10131 - revert changes to `ErrorRequest.getQueryString()` and `AsyncServletTest`
This commit is contained in:
Joakim Erdfelt 2023-07-20 07:26:33 -05:00 committed by GitHub
parent 16f0a6e41c 5d6173f776
commit 408f6a7127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/Dispatcher.java
View File

@ -645,7 +645,13 @@ public class Dispatcher implements RequestDispatcher
@Override
public String getQueryString()
{
return _uri.getQuery();
if (_uri != null)
{
String targetQuery = _uri.getQuery();
if (StringUtil.isNotBlank(targetQuery))
return targetQuery;
}
return _httpServletRequest.getQueryString();
}
@Override

18
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/AsyncServletTest.java
View File

@ -203,7 +203,7 @@ public class AsyncServletTest
assertThat(_history, contains(
"REQUEST /ctx/noasync/info?start=1000",
"initial",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=1000",
"wrapped REQ",
"!initial"
));
@ -224,7 +224,7 @@ public class AsyncServletTest
"initial",
"start",
"onTimeout",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=1000",
"wrapped REQ",
"!initial",
"onComplete"));
@ -263,7 +263,7 @@ public class AsyncServletTest
"start",
"onTimeout",
"error",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=200&timeout=error",
"wrapped REQ",
"!initial",
"onComplete"));
@ -331,7 +331,7 @@ public class AsyncServletTest
"initial",
"start",
"onError",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=1000&throw=1",
"wrapped REQ",
"!initial",
"onComplete"));
@ -430,7 +430,7 @@ public class AsyncServletTest
"onStartAsync",
"start",
"onTimeout",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=1000&dispatch=10&start2=10",
"wrapped REQ",
"!initial",
"onComplete"));
@ -447,7 +447,7 @@ public class AsyncServletTest
"initial",
"start",
"onTimeout",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=10&start2=1000&dispatch2=10",
"wrapped REQ",
"!initial",
"onStartAsync",
@ -470,7 +470,7 @@ public class AsyncServletTest
"initial",
"start",
"onTimeout",
"ERROR /ctx/error/custom",
"ERROR /ctx/error/custom?start=10&start2=1000&complete2=10",
"wrapped REQ",
"!initial",
"onStartAsync",
@ -492,13 +492,13 @@ public class AsyncServletTest
"initial",
"start",
"onTimeout",
"ERROR /ctx/path/error",
"ERROR /ctx/path/error?start=10&start2=10",
"wrapped REQ",
"!initial",
"onStartAsync",
"start",
"onTimeout",
"ERROR /ctx/path/error",
"ERROR /ctx/path/error?start=10&start2=10",
"wrapped REQ",
"!initial",
"onComplete")); // Error Page Loop!

83
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ErrorPageTest.java
View File

@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.EnumSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
@ -632,6 +633,55 @@ public class ErrorPageTest
assertThat(responseBody, Matchers.containsString("Response committed"));
}
@Test
public void testErrorCodeWithWhiteSpaceOnlyQuery() throws Exception
{
ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
contextHandler.setContextPath("/");
HttpServlet failServlet = new HttpServlet()
{
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException
{
response.sendError(599);
}
};
contextHandler.addServlet(failServlet, "/fail/599");
contextHandler.addServlet(ErrorDumpServlet.class, "/error/*");
ErrorPageErrorHandler errorPageErrorHandler = new ErrorPageErrorHandler();
errorPageErrorHandler.addErrorPage(599, "/error/599");
contextHandler.setErrorHandler(errorPageErrorHandler);
startServer(contextHandler);
StringBuilder rawRequest = new StringBuilder();
rawRequest.append("GET /fail/599?++++ HTTP/1.1\r\n");
rawRequest.append("Host: test\r\n");
rawRequest.append("Connection: close\r\n");
rawRequest.append("\r\n");
String rawResponse = _connector.getResponse(rawRequest.toString());
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(599));
assertThat(response.get(HttpHeader.DATE), notNullValue());
String responseBody = response.getContent();
assertThat(responseBody, Matchers.containsString("ERROR_PAGE: /599"));
assertThat(responseBody, Matchers.containsString("ERROR_CODE: 599"));
assertThat(responseBody, Matchers.containsString("ERROR_EXCEPTION: null"));
assertThat(responseBody, Matchers.containsString("ERROR_EXCEPTION_TYPE: null"));
assertThat(responseBody, Matchers.containsString("ERROR_SERVLET: " + failServlet.getClass().getName()));
assertThat(responseBody, Matchers.containsString("ERROR_REQUEST_URI: /fail/599"));
assertThat(responseBody, Matchers.containsString("getQueryString()=[++++]"));
assertThat(responseBody, Matchers.containsString("getParameterMap().size=1"));
assertThat(responseBody, Matchers.containsString("getParameterMap()[ ]=[]"));
}
@Test
public void testErrorCode() throws Exception
{
@ -1015,7 +1065,8 @@ public class ErrorPageTest
assertThat(responseBody, Matchers.containsString("ERROR_EXCEPTION_TYPE: class org.eclipse.jetty.http.BadMessageException"));
assertThat(responseBody, Matchers.containsString("ERROR_SERVLET: " + appServlet.getClass().getName()));
assertThat(responseBody, Matchers.containsString("ERROR_REQUEST_URI: /app"));
assertThat(responseBody, Matchers.containsString("getParameterMap()= {}"));
assertThat(responseBody, Matchers.containsString("getQueryString()=[baa=%88%A4]"));
assertThat(responseBody, Matchers.containsString("getParameterMap().size=0"));
}
}
@ -1535,7 +1586,35 @@ public class ErrorPageTest
writer.println("ERROR_EXCEPTION_TYPE: " + request.getAttribute(Dispatcher.ERROR_EXCEPTION_TYPE));
writer.println("ERROR_SERVLET: " + request.getAttribute(Dispatcher.ERROR_SERVLET_NAME));
writer.println("ERROR_REQUEST_URI: " + request.getAttribute(Dispatcher.ERROR_REQUEST_URI));
writer.println("getParameterMap()= " + request.getParameterMap());
writer.printf("getRequestURI()=%s%n", valueOf(request.getRequestURI()));
writer.printf("getRequestURL()=%s%n", valueOf(request.getRequestURL()));
writer.printf("getQueryString()=%s%n", valueOf(request.getQueryString()));
Map<String, String[]> params = request.getParameterMap();
writer.printf("getParameterMap().size=%d%n", params.size());
for (Map.Entry<String, String[]> entry : params.entrySet())
{
String value = null;
if (entry.getValue() != null)
{
value = String.join(", ", entry.getValue());
}
writer.printf("getParameterMap()[%s]=%s%n", entry.getKey(), valueOf(value));
}
}
private String valueOf(Object obj)
{
if (obj == null)
return "null";
return valueOf(obj.toString());
}
private String valueOf(String str)
{
if (str == null)
return "null";
return String.format("[%s]", str);
}
}