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

Merged branch 'jetty-9.2.x' into 'master'.

This commit is contained in:
Simone Bordet 2015-07-28 16:48:54 +02:00
parent 25ed10d205 837d1a74bb
commit 67f155bcf9
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java
View File

@ -705,12 +705,22 @@ public abstract class AbstractProxyServlet extends HttpServlet
if (_proxyTo.endsWith("/"))
uri.setLength(uri.length() - 1);
String rest = path.substring(_prefix.length());
if (!rest.startsWith("/"))
uri.append("/");
uri.append(rest);
if (!rest.isEmpty())
{
if (!rest.startsWith("/"))
uri.append("/");
uri.append(rest);
}
String query = request.getQueryString();
if (query != null)
{
// Is there at least one path segment ?
String separator = "://";
if (uri.indexOf("/", uri.indexOf(separator) + separator.length()) < 0)
uri.append("/");
uri.append("?").append(query);
}
URI rewrittenURI = URI.create(uri.toString()).normalize();
if (!proxyServlet.validateDestination(rewrittenURI.getHost(), rewrittenURI.getPort()))

36
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
View File

@ -141,7 +141,7 @@ public class ProxyServletTest
private void startProxy() throws Exception
{
startProxy(new HashMap<String, String>());
startProxy(new HashMap<>());
}
private void startProxy(Map<String, String> initParams) throws Exception
@ -651,7 +651,29 @@ public class ProxyServletTest
@Test
public void testTransparentProxyWithQuery() throws Exception
{
final String target = "/test";
testTransparentProxyWithQuery("/foo", "/proxy", "/test");
}
@Test
public void testTransparentProxyEmptyContextWithQuery() throws Exception
{
testTransparentProxyWithQuery("", "/proxy", "/test");
}
@Test
public void testTransparentProxyEmptyTargetWithQuery() throws Exception
{
testTransparentProxyWithQuery("/bar", "/proxy", "");
}
@Test
public void testTransparentProxyEmptyContextEmptyTargetWithQuery() throws Exception
{
testTransparentProxyWithQuery("", "/proxy", "");
}
private void testTransparentProxyWithQuery(String proxyToContext, String prefix, String target) throws Exception
{
final String query = "a=1&b=2";
startServer(new HttpServlet()
{
@ -661,7 +683,10 @@ public class ProxyServletTest
if (req.getHeader("Via") != null)
resp.addHeader(PROXIED_HEADER, "true");
if (target.equals(req.getRequestURI()))
String expectedURI = proxyToContext + target;
if (expectedURI.isEmpty())
expectedURI = "/";
if (expectedURI.equals(req.getRequestURI()))
{
if (query.equals(req.getQueryString()))
{
@ -672,8 +697,7 @@ public class ProxyServletTest
resp.setStatus(404);
}
});
String proxyTo = "http://localhost:" + serverConnector.getLocalPort();
String prefix = "/proxy";
String proxyTo = "http://localhost:" + serverConnector.getLocalPort() + proxyToContext;
proxyServlet = new ProxyServlet.Transparent();
Map<String, String> params = new HashMap<>();
params.put("proxyTo", proxyTo);
@ -689,7 +713,7 @@ public class ProxyServletTest
Assert.assertEquals(200, response.getStatus());
Assert.assertTrue(response.getHeaders().containsKey(PROXIED_HEADER));
}
@Test
public void testTransparentProxyWithQueryWithSpaces() throws Exception
{