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

VERSION.txt

@@ -33,7 +33,7 @@ jetty-11.0.1 - 19 February 2021
  + 5855 HttpClient may not send queued requests
  + 5859 Classloader leaks from ShutdownThread and QueuedThreadPool
  + 5866 Support Programmatic WebSocket upgrade in Jetty 10
- + 5868 Cleaning up request attributes after websocket upgrade in Jetty 10 
+ + 5868 Cleaning up request attributes after websocket upgrade in Jetty 10
  + 5870 jetty-maven-plugin fails to run ServletContainerInitializer on Windows
    due to URI case comparison bug
  + 5872 Improve JMX support for Jetty logging
@@ -333,6 +333,14 @@ jetty-10.0.0.beta3 - 21 October 2020
  + 5475 Update to spifly 1.3.2 and asm 9
  + 5480 NPE from WebInfConfiguration.deconfigure during WebAppContext shutdown
 
+jetty-9.4.38.v20210224 - 24 February 2021
+ + 4275 Path Normalization/Traversal - Context Matching
+ + 5977 Cache-Control header set by a filter is override by the value from
+   DefaultServlet configuration
+ + 5994 QueuedThreadPool "free" threads
+ + 5999 HttpURI ArrayIndexOutOfBounds
+ + 6001 Ambiguous URI legacy compliance mode
+
 jetty-9.4.37.v20210219 - 19 February 2021
  + 4275 Path Normalization/Traversal - Context Matching
  + 5492 Add ability to manage start modules by java feature

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

@@ -416,10 +416,10 @@ public class PerMessageDeflateExtension extends AbstractExtension
             Inflater inflater = getInflater();
             while (true)
             {
-                int read = inflater.inflate(payload.array(), payload.arrayOffset() + payload.position(), bufferSize - payload.position());
-                payload.limit(payload.limit() + read);
+                int decompressed = inflater.inflate(payload.array(), payload.arrayOffset() + payload.position(), bufferSize - payload.position());
+                payload.limit(payload.limit() + decompressed);
                 if (LOG.isDebugEnabled())
-                    LOG.debug("Decompress: read {} {}", read, toDetail(inflater));
+                    LOG.debug("Decompress: read {} {}", decompressed, toDetail(inflater));
 
                 if (payload.limit() == bufferSize)
                 {
@@ -429,7 +429,7 @@ public class PerMessageDeflateExtension extends AbstractExtension
                     break;
                 }
 
-                if (read == 0)
+                if (decompressed == 0)
                 {
                     if (!_tailBytes && _frame.isFin())
                     {

jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/PermessageDeflateBufferTest.java

@@ -0,0 +1,128 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.websocket.tests;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.WebSocket;
+import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PermessageDeflateBufferTest
+{
+    private Server server;
+    private ServerConnector connector;
+    private WebSocketClient client;
+
+    // @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck
+    private static final List<String> DICT = Arrays.asList(
+        "\uD83C\uDF09",
+        "\uD83C\uDF0A",
+        "\uD83C\uDF0B",
+        "\uD83C\uDF0C",
+        "\uD83C\uDF0D",
+        "\uD83C\uDF0F",
+        "\uD83C\uDFC0",
+        "\uD83C\uDFC1",
+        "\uD83C\uDFC2",
+        "\uD83C\uDFC3",
+        "\uD83C\uDFC4",
+        "\uD83C\uDFC5"
+    );
+
+    private static String randomText()
+    {
+        Random rnd = new Random();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 15000; i++)
+        {
+            sb.append(DICT.get(rnd.nextInt(DICT.size())));
+        }
+        return sb.toString();
+    }
+
+    @BeforeEach
+    public void before() throws Exception
+    {
+        server = new Server();
+        connector = new ServerConnector(server);
+        server.addConnector(connector);
+
+        ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        contextHandler.setContextPath("/");
+        server.setHandler(contextHandler);
+        JettyWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
+        {
+            container.setMaxTextMessageSize(65535);
+            container.setInputBufferSize(16384);
+            container.addMapping("/", ServerSocket.class);
+        });
+
+        server.start();
+        client = new WebSocketClient();
+        client.start();
+    }
+
+    @AfterEach
+    public void after() throws Exception
+    {
+        client.stop();
+        server.stop();
+    }
+
+    @WebSocket
+    public static class ServerSocket extends EchoSocket
+    {
+        @Override
+        public void onError(Throwable cause)
+        {
+            cause.printStackTrace();
+            super.onError(cause);
+        }
+    }
+
+    @Test
+    public void testPermessageDeflateAggregation() throws Exception
+    {
+        EventSocket socket = new EventSocket();
+        ClientUpgradeRequest clientUpgradeRequest = new ClientUpgradeRequest();
+        clientUpgradeRequest.addExtensions("permessage-deflate");
+
+        URI uri = URI.create("ws://localhost:" + connector.getLocalPort());
+        Session session = client.connect(socket, uri, clientUpgradeRequest).get(5, TimeUnit.SECONDS);
+
+        String s = randomText();
+        session.getRemote().sendString(s);
+        assertThat(socket.textMessages.poll(5, TimeUnit.SECONDS), is(s));
+
+        session.close();
+        assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS));
+    }
+}