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

Issue #11760 fix NPE getRequestURL() for cross context (#11770) 

* Issue #11760 fix NPE getRequestURL() for cross context

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Jan Bartel 2024-05-10 08:34:43 +02:00 committed by GitHub
parent 3632a57f27
commit 0346b0619f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/CrossContextDispatcher.java
View File

@ -154,6 +154,8 @@ class CrossContextDispatcher implements RequestDispatcher
private class ForwardRequest extends ServletCoreRequest
{
private HttpURI _fullyQualifiedURI;
/**
* @param httpServletRequest the request to wrap
*/
@ -198,12 +200,13 @@ class CrossContextDispatcher implements RequestDispatcher
return ATTRIBUTES;
}
});
_fullyQualifiedURI = HttpURI.build(httpServletRequest.getRequestURL().toString()).pathQuery(_uri.getPathQuery()).asImmutable();
}
@Override
public HttpURI getHttpURI()
{
return _uri;
return _fullyQualifiedURI;
}
}

39
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/CrossContextDispatcherTest.java
View File

@ -71,6 +71,7 @@ import org.slf4j.LoggerFactory;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -187,6 +188,7 @@ public class CrossContextDispatcherTest
assertThat(content, containsString("jakarta.servlet.forward.query_string=forward=/verify"));
assertThat(content, containsString("jakarta.servlet.forward.request_uri=/context/dispatch/"));
//verify request values
assertThat(content, containsString("REQUEST_URL=http://localhost/foreign/"));
assertThat(content, containsString("CONTEXT_PATH=/foreign"));
assertThat(content, containsString("SERVLET_PATH=/verify"));
assertThat(content, containsString("PATH_INFO=/pinfo"));
@ -326,6 +328,42 @@ public class CrossContextDispatcherTest
assertTrue(latch.await(5, TimeUnit.SECONDS));
}
@Test
public void testCrossContextForwardAndFilter() throws Exception
{
FilterHolder filterHolder = new FilterHolder(
(request, response, chain) ->
{
// verify that expected RequestURL is still sane during Filter.
HttpServletRequest httpRequest = (HttpServletRequest)request;
HttpServletResponse httpResponse = (HttpServletResponse)response;
StringBuffer requestUrl = httpRequest.getRequestURL();
httpResponse.addHeader("X-Filter-RequestURL", requestUrl.toString());
chain.doFilter(httpRequest, httpResponse);
}
);
_targetServletContextHandler.addFilter(filterHolder, "/*", EnumSet.of(DispatcherType.FORWARD));
_targetServletContextHandler.addServlet(VerifyForwardServlet.class, "/verify/*");
_contextHandler.addServlet(CrossContextDispatchServlet.class, "/dispatch/*");
String rawRequest = """
GET /context/dispatch/?forward=/verify HTTP/1.1\r
Host: localhost\r
Connection: close\r
\r
""";
String rawResponse = _connector.getResponse(rawRequest);
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
String expectedRequestURL = "http://localhost/foreign/verify/pinfo";
assertThat(response.get("X-Filter-RequestURL"), is(expectedRequestURL));
String content = response.getContent();
List<String> contentLines = List.of(content.split("\\n"));
assertThat(contentLines, hasItem("REQUEST_URL=" + expectedRequestURL));
}
@Test
public void testParamsBeforeCrossContextForward() throws Exception
{
@ -868,6 +906,7 @@ public class CrossContextDispatcherTest
res.getWriter().println(RequestDispatcher.FORWARD_REQUEST_URI + "=" + req.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI));
res.getWriter().println("----------- REQUEST");
HttpServletRequest httpServletRequest = (HttpServletRequest)req;
res.getWriter().println("REQUEST_URL=" + httpServletRequest.getRequestURL());
res.getWriter().println("CONTEXT_PATH=" + httpServletRequest.getServletContext().getContextPath());
res.getWriter().println("SERVLET_PATH=" + httpServletRequest.getServletPath());
res.getWriter().println("PATH_INFO=" + httpServletRequest.getPathInfo());

4
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/CrossContextDispatcher.java
View File

@ -159,6 +159,7 @@ class CrossContextDispatcher implements RequestDispatcher
private class ForwardRequest extends ServletCoreRequest
{
private Request _baseRequest;
private HttpURI _fullyQualifiedURI;
public ForwardRequest(ContextHandler.CoreContextRequest coreContextRequest, Request request, HttpServletRequest httpServletRequest)
{
@ -209,6 +210,7 @@ class CrossContextDispatcher implements RequestDispatcher
}
});
_baseRequest = request;
_fullyQualifiedURI = HttpURI.build(request.getRootURL().toString()).pathQuery(_uri.getPathQuery()).asImmutable();
}
@Override
@ -222,7 +224,7 @@ class CrossContextDispatcher implements RequestDispatcher
@Override
public HttpURI getHttpURI()
{
return _uri;
return _fullyQualifiedURI;
}
}

39
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/CrossContextDispatcherTest.java
View File

@ -71,6 +71,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -187,6 +188,7 @@ public class CrossContextDispatcherTest
assertThat(content, containsString("jakarta.servlet.forward.query_string=forward=/verify"));
assertThat(content, containsString("jakarta.servlet.forward.request_uri=/context/dispatch/"));
//verify request values
assertThat(content, containsString("REQUEST_URL=http://localhost/foreign/"));
assertThat(content, containsString("CONTEXT_PATH=/foreign"));
assertThat(content, containsString("SERVLET_PATH=/verify"));
assertThat(content, containsString("PATH_INFO=/pinfo"));
@ -371,6 +373,42 @@ public class CrossContextDispatcherTest
assertTrue(latch.await(5, TimeUnit.SECONDS));
}
@Test
public void testCrossContextForwardAndFilter() throws Exception
{
FilterHolder filterHolder = new FilterHolder(
(request, response, chain) ->
{
// verify that expected RequestURL is still sane during Filter.
HttpServletRequest httpRequest = (HttpServletRequest)request;
HttpServletResponse httpResponse = (HttpServletResponse)response;
StringBuffer requestUrl = httpRequest.getRequestURL();
httpResponse.addHeader("X-Filter-RequestURL", requestUrl.toString());
chain.doFilter(httpRequest, httpResponse);
}
);
_targetServletContextHandler.addFilter(filterHolder, "/*", EnumSet.of(DispatcherType.FORWARD));
_targetServletContextHandler.addServlet(VerifyForwardServlet.class, "/verify/*");
_contextHandler.addServlet(CrossContextDispatchServlet.class, "/dispatch/*");
String rawRequest = """
GET /context/dispatch/?forward=/verify HTTP/1.1\r
Host: localhost\r
Connection: close\r
\r
""";
String rawResponse = _connector.getResponse(rawRequest);
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
String expectedRequestURL = "http://localhost/foreign/verify/pinfo";
assertThat(response.get("X-Filter-RequestURL"), is(expectedRequestURL));
String content = response.getContent();
List<String> contentLines = List.of(content.split("\\n"));
assertThat(contentLines, hasItem("REQUEST_URL=" + expectedRequestURL));
}
@Test
public void testParamsBeforeCrossContextForward() throws Exception
{
@ -914,6 +952,7 @@ public class CrossContextDispatcherTest
res.getWriter().println(RequestDispatcher.FORWARD_REQUEST_URI + "=" + req.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI));
res.getWriter().println("----------- REQUEST");
HttpServletRequest httpServletRequest = (HttpServletRequest)req;
res.getWriter().println("REQUEST_URL=" + httpServletRequest.getRequestURL());
res.getWriter().println("CONTEXT_PATH=" + httpServletRequest.getServletContext().getContextPath());
res.getWriter().println("SERVLET_PATH=" + httpServletRequest.getServletPath());
res.getWriter().println("PATH_INFO=" + httpServletRequest.getPathInfo());