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

419904 - Data corruption on proxy PUT requests. 

Fixed InputStreamContentProvider to not reuse the byte[] to read from
the stream.
This commit is contained in:
Simone Bordet 2013-10-22 12:40:32 +02:00
parent 25f2fcc691
commit 41eed8f836
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java
View File

@ -112,8 +112,7 @@ public class InputStreamContentProvider implements ContentProvider
*/
private class InputStreamIterator implements Iterator<ByteBuffer>
{
private final byte[] bytes = new byte[bufferSize];
private Exception failure;
private Throwable failure;
private ByteBuffer buffer;
private Boolean hasNext;
@ -125,6 +124,7 @@ public class InputStreamContentProvider implements ContentProvider
if (hasNext != null)
return hasNext;
byte[] bytes = new byte[bufferSize];
int read = stream.read(bytes);
LOG.debug("Read {} bytes from {}", read, stream);
if (read > 0)
@ -145,7 +145,7 @@ public class InputStreamContentProvider implements ContentProvider
return true;
}
}
catch (Exception x)
catch (Throwable x)
{
LOG.debug(x);
if (failure == null)

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

@ -28,10 +28,10 @@ import java.net.HttpCookie;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@ -246,7 +246,7 @@ public class ProxyServletTest
ContentResponse[] responses = new ContentResponse[10];
final byte[] content = new byte[1024];
Arrays.fill(content, (byte)'A');
new Random().nextBytes(content);
prepareServer(new HttpServlet()
{
@Override
@ -291,7 +291,7 @@ public class ProxyServletTest
});
byte[] content = new byte[1024];
Arrays.fill(content, (byte)'A');
new Random().nextBytes(content);
ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
.method(HttpMethod.POST)
.content(new BytesContentProvider(content))
@ -331,6 +331,9 @@ public class ProxyServletTest
@Test
public void testProxyWithBigRequestContentConsumed() throws Exception
{
final byte[] content = new byte[128 * 1024];
new Random().nextBytes(content);
prepareProxy(new ProxyServlet());
prepareServer(new HttpServlet()
{
@ -340,13 +343,18 @@ public class ProxyServletTest
if (req.getHeader("Via") != null)
resp.addHeader(PROXIED_HEADER, "true");
InputStream input = req.getInputStream();
int index = 0;
while (true)
if (input.read() < 0)
{
int value = input.read();
if (value < 0)
break;
Assert.assertEquals("Content mismatch at index=" + index, content[index] & 0xFF, value);
++index;
}
}
});
byte[] content = new byte[128 * 1024];
ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
.method(HttpMethod.POST)
.content(new BytesContentProvider(content))
@ -369,7 +377,7 @@ public class ProxyServletTest
Files.createDirectories(targetTestsDir);
final Path temp = Files.createTempFile(targetTestsDir, "test_", null);
byte[] kb = new byte[1024];
Arrays.fill(kb, (byte)'X');
new Random().nextBytes(kb);
try (OutputStream output = Files.newOutputStream(temp, CREATE))
{
for (int i = 0; i < length; ++i)