Close #526 - Headers set from RequestDispatcher.include() not showing up in response
+ Adding 2 testcases to verify behavior
This commit is contained in:
Joakim Erdfelt
parent
8cc041bb04
commit
f1c34cb10f
|
|
@ -0,0 +1,174 @@
|
||||||
|
//
|
||||||
|
// ========================================================================
|
||||||
|
// Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// All rights reserved. This program and the accompanying materials
|
||||||
|
// are made available under the terms of the Eclipse Public License v1.0
|
||||||
|
// and Apache License v2.0 which accompanies this distribution.
|
||||||
|
//
|
||||||
|
// The Eclipse Public License is available at
|
||||||
|
// http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
//
|
||||||
|
// The Apache License v2.0 is available at
|
||||||
|
// http://www.opensource.org/licenses/apache2.0.php
|
||||||
|
//
|
||||||
|
// You may elect to redistribute this code under either of these licenses.
|
||||||
|
// ========================================================================
|
||||||
|
//
|
||||||
|
|
||||||
|
package org.eclipse.jetty.jstl;
|
||||||
|
|
||||||
|
import static org.hamcrest.Matchers.containsString;
|
||||||
|
import static org.hamcrest.Matchers.is;
|
||||||
|
import static org.junit.Assert.assertThat;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URI;
|
||||||
|
|
||||||
|
import org.eclipse.jetty.server.Server;
|
||||||
|
import org.eclipse.jetty.server.ServerConnector;
|
||||||
|
import org.eclipse.jetty.toolchain.test.FS;
|
||||||
|
import org.eclipse.jetty.toolchain.test.IO;
|
||||||
|
import org.eclipse.jetty.toolchain.test.JAR;
|
||||||
|
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
|
||||||
|
import org.eclipse.jetty.webapp.Configuration;
|
||||||
|
import org.eclipse.jetty.webapp.WebAppContext;
|
||||||
|
import org.junit.AfterClass;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class JspIncludeTest
|
||||||
|
{
|
||||||
|
private static Server server;
|
||||||
|
private static URI baseUri;
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void startServer() throws Exception
|
||||||
|
{
|
||||||
|
// Setup Server
|
||||||
|
server = new Server();
|
||||||
|
ServerConnector connector = new ServerConnector(server);
|
||||||
|
connector.setPort(0);
|
||||||
|
server.addConnector(connector);
|
||||||
|
|
||||||
|
// Setup WebAppContext
|
||||||
|
File testWebAppDir = MavenTestingUtils.getProjectDir("src/test/webapp");
|
||||||
|
|
||||||
|
// Prepare WebApp libs
|
||||||
|
File libDir = new File(testWebAppDir, "WEB-INF/lib");
|
||||||
|
FS.ensureDirExists(libDir);
|
||||||
|
File testTagLibDir = MavenTestingUtils.getProjectDir("src/test/taglibjar");
|
||||||
|
JAR.create(testTagLibDir, new File(libDir, "testtaglib.jar"));
|
||||||
|
|
||||||
|
// Configure WebAppContext
|
||||||
|
|
||||||
|
Configuration.ClassList classlist = Configuration.ClassList
|
||||||
|
.setServerDefault(server);
|
||||||
|
|
||||||
|
classlist.addBefore(
|
||||||
|
"org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
|
||||||
|
"org.eclipse.jetty.annotations.AnnotationConfiguration");
|
||||||
|
|
||||||
|
WebAppContext context = new WebAppContext();
|
||||||
|
context.setContextPath("/");
|
||||||
|
|
||||||
|
File scratchDir = MavenTestingUtils.getTargetFile("tests/" + JspIncludeTest.class.getSimpleName() + "-scratch");
|
||||||
|
FS.ensureEmpty(scratchDir);
|
||||||
|
JspConfig.init(context, testWebAppDir.toURI(), scratchDir);
|
||||||
|
|
||||||
|
server.setHandler(context);
|
||||||
|
|
||||||
|
// Start Server
|
||||||
|
server.start();
|
||||||
|
|
||||||
|
// Figure out Base URI
|
||||||
|
String host = connector.getHost();
|
||||||
|
if (host == null)
|
||||||
|
{
|
||||||
|
host = "localhost";
|
||||||
|
}
|
||||||
|
int port = connector.getLocalPort();
|
||||||
|
baseUri = new URI(String.format("http://%s:%d/", host, port));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterClass
|
||||||
|
public static void stopServer() throws Exception
|
||||||
|
{
|
||||||
|
server.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testTopWithIncluded() throws IOException
|
||||||
|
{
|
||||||
|
URI uri = baseUri.resolve("/top.jsp");
|
||||||
|
// System.out.println("GET (String): " + uri.toASCIIString());
|
||||||
|
|
||||||
|
InputStream in = null;
|
||||||
|
InputStreamReader reader = null;
|
||||||
|
HttpURLConnection connection = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
connection = (HttpURLConnection) uri.toURL().openConnection();
|
||||||
|
connection.connect();
|
||||||
|
if (HttpURLConnection.HTTP_OK != connection.getResponseCode())
|
||||||
|
{
|
||||||
|
String body = getPotentialBody(connection);
|
||||||
|
String err = String.format("GET request failed (%d %s) %s%n%s", connection.getResponseCode(), connection.getResponseMessage(),
|
||||||
|
uri.toASCIIString(), body);
|
||||||
|
throw new IOException(err);
|
||||||
|
}
|
||||||
|
in = connection.getInputStream();
|
||||||
|
reader = new InputStreamReader(in);
|
||||||
|
StringWriter writer = new StringWriter();
|
||||||
|
IO.copy(reader, writer);
|
||||||
|
|
||||||
|
String response = writer.toString();
|
||||||
|
// System.out.printf("Response%n%s",response);
|
||||||
|
assertThat("Response", response, containsString("<h2> Hello, this is the top page."));
|
||||||
|
assertThat("Response", response, containsString("<h3> This is the included page"));
|
||||||
|
|
||||||
|
assertThat("Response Header[main-page-key]", connection.getHeaderField("main-page-key"), is("main-page-value"));
|
||||||
|
assertThat("Response Header[included-page-key]", connection.getHeaderField("included-page-key"), is("included-page-value"));
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
IO.close(reader);
|
||||||
|
IO.close(in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempt to obtain the body text if available. Do not throw an exception if body is unable to be fetched.
|
||||||
|
*
|
||||||
|
* @param connection the connection to fetch the body content from.
|
||||||
|
* @return the body content, if present.
|
||||||
|
*/
|
||||||
|
private String getPotentialBody(HttpURLConnection connection)
|
||||||
|
{
|
||||||
|
InputStream in = null;
|
||||||
|
InputStreamReader reader = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
in = connection.getInputStream();
|
||||||
|
reader = new InputStreamReader(in);
|
||||||
|
StringWriter writer = new StringWriter();
|
||||||
|
IO.copy(reader, writer);
|
||||||
|
return writer.toString();
|
||||||
|
}
|
||||||
|
catch (IOException e)
|
||||||
|
{
|
||||||
|
return "<no body:" + e.getMessage() + ">";
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
IO.close(reader);
|
||||||
|
IO.close(in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -76,16 +76,6 @@ public class JstlTest
|
||||||
WebAppContext context = new WebAppContext();
|
WebAppContext context = new WebAppContext();
|
||||||
context.setContextPath("/");
|
context.setContextPath("/");
|
||||||
|
|
||||||
/* TODO: Bug #486530 - sub-handler on WebAppContext prevents startup
|
|
||||||
context.setHandler(new AbstractHandler()
|
|
||||||
{
|
|
||||||
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
|
|
||||||
throws IOException, ServletException
|
|
||||||
{
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
File scratchDir = MavenTestingUtils.getTargetFile("tests/" + JstlTest.class.getSimpleName() + "-scratch");
|
File scratchDir = MavenTestingUtils.getTargetFile("tests/" + JstlTest.class.getSimpleName() + "-scratch");
|
||||||
FS.ensureEmpty(scratchDir);
|
FS.ensureEmpty(scratchDir);
|
||||||
JspConfig.init(context,testWebAppDir.toURI(),scratchDir);
|
JspConfig.init(context,testWebAppDir.toURI(),scratchDir);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<%
|
||||||
|
String headerPrefix = "";
|
||||||
|
if(request.getDispatcherType() == DispatcherType.INCLUDE)
|
||||||
|
headerPrefix = "org.eclipse.jetty.server.include.";
|
||||||
|
|
||||||
|
response.setHeader(headerPrefix + "included-page-key","included-page-value");
|
||||||
|
%>
|
||||||
|
<h3> This is the included page
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<%
|
||||||
|
application.getRequestDispatcher("/included.jsp").include(request,response);
|
||||||
|
response.setHeader("main-page-key", "main-page-value");
|
||||||
|
%>
|
||||||
|
<h2> Hello, this is the top page.
|
||||||
|
|
@ -0,0 +1,177 @@
|
||||||
|
//
|
||||||
|
// ========================================================================
|
||||||
|
// Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// All rights reserved. This program and the accompanying materials
|
||||||
|
// are made available under the terms of the Eclipse Public License v1.0
|
||||||
|
// and Apache License v2.0 which accompanies this distribution.
|
||||||
|
//
|
||||||
|
// The Eclipse Public License is available at
|
||||||
|
// http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
//
|
||||||
|
// The Apache License v2.0 is available at
|
||||||
|
// http://www.opensource.org/licenses/apache2.0.php
|
||||||
|
//
|
||||||
|
// You may elect to redistribute this code under either of these licenses.
|
||||||
|
// ========================================================================
|
||||||
|
//
|
||||||
|
|
||||||
|
package org.eclipse.jetty.servlet;
|
||||||
|
|
||||||
|
import static org.hamcrest.Matchers.containsString;
|
||||||
|
import static org.hamcrest.Matchers.is;
|
||||||
|
import static org.junit.Assert.assertThat;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.PrintWriter;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URI;
|
||||||
|
|
||||||
|
import javax.servlet.DispatcherType;
|
||||||
|
import javax.servlet.ServletException;
|
||||||
|
import javax.servlet.http.HttpServlet;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.eclipse.jetty.server.Server;
|
||||||
|
import org.eclipse.jetty.server.ServerConnector;
|
||||||
|
import org.eclipse.jetty.toolchain.test.IO;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class IncludedServletTest
|
||||||
|
{
|
||||||
|
public static class TopServlet extends HttpServlet
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
|
||||||
|
{
|
||||||
|
req.getRequestDispatcher("/included").include(req, resp);
|
||||||
|
resp.setHeader("main-page-key", "main-page-value");
|
||||||
|
|
||||||
|
PrintWriter out = resp.getWriter();
|
||||||
|
out.println("<h2> Hello, this is the top page.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class IncludedServlet extends HttpServlet
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
|
||||||
|
{
|
||||||
|
String headerPrefix = "";
|
||||||
|
if (req.getDispatcherType() == DispatcherType.INCLUDE)
|
||||||
|
headerPrefix = "org.eclipse.jetty.server.include.";
|
||||||
|
|
||||||
|
resp.setHeader(headerPrefix + "included-page-key", "included-page-value");
|
||||||
|
resp.getWriter().println("<h3> This is the included page");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Server server;
|
||||||
|
private URI baseUri;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void startServer() throws Exception
|
||||||
|
{
|
||||||
|
this.server = new Server();
|
||||||
|
ServerConnector connector = new ServerConnector(server);
|
||||||
|
connector.setHost("localhost");
|
||||||
|
connector.setPort(0);
|
||||||
|
server.addConnector(connector);
|
||||||
|
|
||||||
|
ServletContextHandler context = new ServletContextHandler();
|
||||||
|
context.setContextPath("/");
|
||||||
|
context.addServlet(TopServlet.class, "/top");
|
||||||
|
context.addServlet(IncludedServlet.class, "/included");
|
||||||
|
|
||||||
|
server.setHandler(context);
|
||||||
|
|
||||||
|
server.start();
|
||||||
|
|
||||||
|
int port = connector.getLocalPort();
|
||||||
|
String host = connector.getHost();
|
||||||
|
|
||||||
|
baseUri = URI.create("http://" + host + ":" + port + "/");
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void stopServer() throws Exception
|
||||||
|
{
|
||||||
|
this.server.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testTopWithIncludedHeader() throws IOException
|
||||||
|
{
|
||||||
|
URI uri = baseUri.resolve("/top");
|
||||||
|
System.out.println("GET (String): " + uri.toASCIIString());
|
||||||
|
|
||||||
|
InputStream in = null;
|
||||||
|
InputStreamReader reader = null;
|
||||||
|
HttpURLConnection connection = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
connection = (HttpURLConnection) uri.toURL().openConnection();
|
||||||
|
connection.connect();
|
||||||
|
if (HttpURLConnection.HTTP_OK != connection.getResponseCode())
|
||||||
|
{
|
||||||
|
String body = getPotentialBody(connection);
|
||||||
|
String err = String.format("GET request failed (%d %s) %s%n%s", connection.getResponseCode(), connection.getResponseMessage(),
|
||||||
|
uri.toASCIIString(), body);
|
||||||
|
throw new IOException(err);
|
||||||
|
}
|
||||||
|
in = connection.getInputStream();
|
||||||
|
reader = new InputStreamReader(in);
|
||||||
|
StringWriter writer = new StringWriter();
|
||||||
|
IO.copy(reader, writer);
|
||||||
|
|
||||||
|
String response = writer.toString();
|
||||||
|
// System.out.printf("Response%n%s",response);
|
||||||
|
assertThat("Response", response, containsString("<h2> Hello, this is the top page."));
|
||||||
|
assertThat("Response", response, containsString("<h3> This is the included page"));
|
||||||
|
|
||||||
|
assertThat("Response Header[main-page-key]", connection.getHeaderField("main-page-key"), is("main-page-value"));
|
||||||
|
assertThat("Response Header[included-page-key]", connection.getHeaderField("included-page-key"), is("included-page-value"));
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
IO.close(reader);
|
||||||
|
IO.close(in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempt to obtain the body text if available. Do not throw an exception if body is unable to be fetched.
|
||||||
|
*
|
||||||
|
* @param connection the connection to fetch the body content from.
|
||||||
|
* @return the body content, if present.
|
||||||
|
*/
|
||||||
|
private String getPotentialBody(HttpURLConnection connection)
|
||||||
|
{
|
||||||
|
InputStream in = null;
|
||||||
|
InputStreamReader reader = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
in = connection.getInputStream();
|
||||||
|
reader = new InputStreamReader(in);
|
||||||
|
StringWriter writer = new StringWriter();
|
||||||
|
IO.copy(reader, writer);
|
||||||
|
return writer.toString();
|
||||||
|
}
|
||||||
|
catch (IOException e)
|
||||||
|
{
|
||||||
|
return "<no body:" + e.getMessage() + ">";
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
IO.close(reader);
|
||||||
|
IO.close(in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue