#10759 fix client setting MAX_FIELD_SECTION_SIZE to check its max val…

…ue against H3 config setting maxRequestHeadersSize Signed-off-by: Ludovic Orban <[email protected]>
jetty · Oct 20, 2023 · 59105be · 59105be
1 parent 33e35df
commit 59105be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...ttp3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java b/...ttp3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java
@@ -184,7 +184,7 @@ public void onSettings(SettingsFrame frame)
             else if (key == SettingsFrame.MAX_FIELD_SECTION_SIZE)
             {
                 // Must cap the maxHeaderSize to avoid large allocations.
-                int maxHeadersSize = (int)Math.min(value, configuration.getMaxResponseHeadersSize());
+                int maxHeadersSize = (int)Math.min(value, configuration.getMaxRequestHeadersSize());
                 encoder.setMaxHeadersSize(maxHeadersSize);
             }
             else if (key == SettingsFrame.MAX_BLOCKED_STREAMS)

diff --git a/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java b/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java
@@ -373,13 +373,22 @@ public Stream.Server.Listener onRequest(Stream.Server stream, HeadersFrame frame
             }
         });
 
-        int maxRequestHeadersSize = 128;
+        int maxRequestHeadersSize = 256;
         HTTP3Configuration http3Configuration = http3Client.getHTTP3Configuration();
         http3Configuration.setMaxRequestHeadersSize(maxRequestHeadersSize);
         // Disable the dynamic table, otherwise the large header
-        // is sent as string literal on the encoder stream.
+        // is sent as string literal on the encoder stream, rather than the message stream.
         http3Configuration.setMaxEncoderTableCapacity(0);
-        Session.Client clientSession = newSession(new Session.Client.Listener() {});
+        CountDownLatch settingsLatch = new CountDownLatch(1);
+        Session.Client clientSession = newSession(new Session.Client.Listener()
+        {
+            @Override
+            public void onSettings(Session session, SettingsFrame frame)
+            {
+                settingsLatch.countDown();
+            }
+        });
+        assertTrue(settingsLatch.await(5, TimeUnit.SECONDS));
 
         CountDownLatch requestFailureLatch = new CountDownLatch(1);
         HttpFields largeHeaders = HttpFields.build().put("too-large", "x".repeat(2 * maxRequestHeadersSize));
@@ -413,7 +422,7 @@ public void onResponse(Stream.Client stream, HeadersFrame frame)
     @Test
     public void testResponseHeadersTooLarge() throws Exception
     {
-        int maxResponseHeadersSize = 128;
+        int maxResponseHeadersSize = 256;
         CountDownLatch settingsLatch = new CountDownLatch(2);
         AtomicReference<Session> serverSessionRef = new AtomicReference<>();
         CountDownLatch responseFailureLatch = new CountDownLatch(1);
@@ -458,7 +467,7 @@ public Stream.Server.Listener onRequest(Stream.Server stream, HeadersFrame frame
         assertNotNull(h3);
         HTTP3Configuration http3Configuration = h3.getHTTP3Configuration();
         // Disable the dynamic table, otherwise the large header
-        // is sent as string literal on the encoder stream.
+        // is sent as string literal on the encoder stream, rather than the message stream.
         http3Configuration.setMaxEncoderTableCapacity(0);
         http3Configuration.setMaxResponseHeadersSize(maxResponseHeadersSize);