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

434578 - Complete listener not called if redirected to an invalid URI. 

Fixed by catching the exception and failing properly the redirect.
This commit is contained in:
Simone Bordet 2014-05-11 11:22:39 +02:00
parent d92ac8062b
commit 20dbde165e
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java
View File

@ -271,7 +271,7 @@ public class HttpRedirector
}
}
private Request redirect(final Request request, Response response, Response.CompleteListener listener, URI location, String method)
private Request redirect(Request request, Response response, Response.CompleteListener listener, URI location, String method)
{
HttpRequest httpRequest = (HttpRequest)request;
HttpConversation conversation = httpRequest.getConversation();
@ -281,9 +281,20 @@ public class HttpRedirector
if (redirects < client.getMaxRedirects())
{
++redirects;
if (conversation != null)
conversation.setAttribute(ATTRIBUTE, redirects);
conversation.setAttribute(ATTRIBUTE, redirects);
return sendRedirect(httpRequest, response, listener, location, method);
}
else
{
fail(request, response, new HttpResponseException("Max redirects exceeded " + redirects, response));
return null;
}
}
private Request sendRedirect(final HttpRequest httpRequest, Response response, Response.CompleteListener listener, URI location, String method)
{
try
{
Request redirect = client.copyRequest(httpRequest, location);
// Use given method
@ -294,7 +305,7 @@ public class HttpRedirector
@Override
public void onBegin(Request redirect)
{
Throwable cause = request.getAbortCause();
Throwable cause = httpRequest.getAbortCause();
if (cause != null)
redirect.abort(cause);
}
@ -303,9 +314,9 @@ public class HttpRedirector
redirect.send(listener);
return redirect;
}
else
catch (Throwable x)
{
fail(request, response, new HttpResponseException("Max redirects exceeded " + redirects, response));
fail(httpRequest, response, x);
return null;
}
}

33
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java
View File

@ -26,7 +26,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -244,6 +243,38 @@ public class HttpClientRedirectTest extends AbstractHttpClientServerTest
Assert.assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
}
@Test
public void testRedirectWithWrongScheme() throws Exception
{
dispose();
start(new AbstractHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
baseRequest.setHandled(true);
response.setStatus(303);
response.setHeader("Location", "ssh://localhost/path");
}
});
final CountDownLatch latch = new CountDownLatch(1);
client.newRequest("localhost", connector.getLocalPort())
.scheme(scheme)
.path("/path")
.timeout(5, TimeUnit.SECONDS)
.send(new Response.CompleteListener()
{
@Override
public void onComplete(Result result)
{
Assert.assertTrue(result.isFailed());
latch.countDown();
}
});
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
}
@Test
@Ignore
public void testRedirectFailed() throws Exception