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

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Lachlan Roberts 2023-06-16 08:00:26 +10:00
parent 6b3d9ecd97 5b1e7bd549
commit ed56972056
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java
View File

@ -464,16 +464,23 @@ public class PerMessageDeflateExtension extends AbstractExtension implements Dem
chunk.setPayload(payload);
chunk.setFin(frame.isFin() && complete);
boolean succeedCallback = complete;
// If we are complete we return true, then DemandingFlusher.process() will null out the Frame and Callback.
// The application may decide to hold onto the buffer and delay completing the callback, so we need to capture
// references to these in the payloadCallback and not rely on state of the flusher which may have moved on.
// This flusher could be failed while the application already has the payloadCallback, so we need protection against
// the flusher failing and the application completing the callback, that's why we use the payload AtomicReference.
boolean completeCallback = complete;
AtomicReference<ByteBuffer> payloadRef = _payloadRef;
Callback payloadCallback = Callback.from(() ->
{
getBufferPool().release(payloadRef.getAndSet(null));
if (succeedCallback)
if (completeCallback)
callback.succeeded();
}, t ->
{
getBufferPool().release(payloadRef.getAndSet(null));
if (completeCallback)
callback.failed(t);
failFlusher(t);
});

22
jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/LargeDeflateTest.java
View File

@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -92,6 +93,27 @@ public class LargeDeflateTest
assertThat(message, is(sentMessage));
}
@Test
void testDeflateLargerThanMaxMessage() throws Exception
{
ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest();
upgradeRequest.addExtensions("permessage-deflate");
EventSocket clientSocket = new EventSocket();
ByteBuffer message = largePayloads();
Session session = _client.connect(clientSocket, URI.create("ws://localhost:" + _connector.getLocalPort() + "/ws"), upgradeRequest).get();
// Set the maxBinaryMessageSize on the server to be lower than the size of the message.
assertTrue(_serverSocket.openLatch.await(5, TimeUnit.SECONDS));
_serverSocket.session.setMaxBinaryMessageSize(message.remaining() - 1024);
session.getRemote().sendBytes(message);
assertTrue(clientSocket.closeLatch.await(5, TimeUnit.SECONDS));
assertTrue(_serverSocket.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(_serverSocket.closeCode, is(StatusCode.MESSAGE_TOO_LARGE));
assertThat(_serverSocket.closeReason, containsString("Binary message too large"));
}
private static ByteBuffer largePayloads()
{
var bytes = new byte[4 * 1024 * 1024];