fixed reading the data from the stream and fixed the size of chunks (#10409)

joerg1985 · web-flow · commit 7e8c43001ed9 · 2022-03-11T23:47:34.000+01:00
InputStream.read may read less bytes than actually are in the stream,
this might corrupt the forwarded data. Also fixed the size of the chunks
send after the initial chunk.

[skip ci]
diff --git a/java/src/org/openqa/selenium/netty/server/ResponseConverter.java b/java/src/org/openqa/selenium/netty/server/ResponseConverter.java
@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.netty.server;
 
+import com.google.common.io.ByteStreams;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
@@ -59,7 +60,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
     // We may not know how large the response is, but figure it out if we can.
     byte[] ary = new byte[CHUNK_SIZE];
     InputStream is = seResponse.getContent().get();
-    int byteCount = is.read(ary);
+    int byteCount = ByteStreams.read(is, ary, 0, ary.length);
     // If there are no bytes left to read, then -1 is returned by read, and this is bad.
     byteCount = byteCount == -1 ? 0 : byteCount;
 
@@ -84,7 +85,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
       // We need to write the first response.
       ctx.write(new DefaultHttpContent(Unpooled.wrappedBuffer(ary)));
 
-      HttpChunkedInput writer = new HttpChunkedInput(new ChunkedStream(is));
+      HttpChunkedInput writer = new HttpChunkedInput(new ChunkedStream(is, CHUNK_SIZE));
       ChannelFuture future = ctx.write(writer);
       future.addListener(ignored -> {
         is.close();
