Skip to content

Commit

Permalink
Fix #10805 zero dynamic table (#11445)
Browse files Browse the repository at this point in the history 
* Added test for #10805 Zero Dynamic Table

* fixed file header

* Added test for #10805 Zero Dynamic Table

* Fix for #10805 Zero Dynamic Table

Set the correct default size for the table.
Always send the max table size on the first encode
  • Loading branch information
@gregw
gregw committed Feb 27, 2024
1 parent 62cb2c3 commit dc205ff
Show file tree
Hide file tree
Showing 2 changed files with 196 additions and 2 deletions.
190 changes: 190 additions & 0 deletions jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/DynamicTableTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
//
// ========================================================================
// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

package org.eclipse.jetty.http2.client;

import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http2.api.Session;
import org.eclipse.jetty.http2.api.Stream;
import org.eclipse.jetty.http2.frames.HeadersFrame;
import org.eclipse.jetty.http2.frames.SettingsFrame;
import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory;
import org.eclipse.jetty.util.Promise;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class DynamicTableTest extends AbstractTest
{
@ParameterizedTest
@CsvSource({"0,-1", "-1,0", "0,0"})
public void testMaxEncoderTableCapacityZero(int clientMaxCapacity, int serverMaxCapacity) throws Exception
{
start(new HttpServlet()
{
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
{
resp.setStatus(200);
resp.getOutputStream().close();
}
});

if (clientMaxCapacity >= 0)
client.setMaxEncoderTableCapacity(clientMaxCapacity);
if (serverMaxCapacity >= 0)
connector.getConnectionFactory(AbstractHTTP2ServerConnectionFactory.class).setMaxEncoderTableCapacity(serverMaxCapacity);

CountDownLatch serverPreface = new CountDownLatch(1);
Session session = newClient(new Session.Listener.Adapter()
{
@Override
public void onSettings(Session session, SettingsFrame frame)
{
serverPreface.countDown();
}
});
assertTrue(serverPreface.await(5, TimeUnit.SECONDS));

MetaData.Request metaData = newRequest("GET", new HttpFields());
HeadersFrame frame = new HeadersFrame(metaData, null, true);
CountDownLatch latch = new CountDownLatch(1);
session.newStream(frame, new Promise.Adapter<>(), new Stream.Listener.Adapter()
{
@Override
public void onHeaders(Stream stream, HeadersFrame frame)
{
MetaData.Response response = (MetaData.Response)frame.getMetaData();
assertEquals(200, response.getStatus());
latch.countDown();
}
});

assertTrue(latch.await(5, TimeUnit.SECONDS));
}

@ParameterizedTest
@CsvSource({"0,-1", "-1,0", "0,0"})
public void testMaxDecoderTableCapacityZero(int clientMaxCapacity, int serverMaxCapacity) throws Exception
{
start(new HttpServlet()
{
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
{
resp.setStatus(200);
resp.getOutputStream().close();
}
});

if (clientMaxCapacity >= 0)
client.setMaxDecoderTableCapacity(clientMaxCapacity);
if (serverMaxCapacity >= 0)
connector.getConnectionFactory(AbstractHTTP2ServerConnectionFactory.class).setMaxDecoderTableCapacity(serverMaxCapacity);

CountDownLatch serverPreface = new CountDownLatch(1);
Session session = newClient(new Session.Listener.Adapter()
{
@Override
public void onSettings(Session session, SettingsFrame frame)
{
serverPreface.countDown();
}
});
assertTrue(serverPreface.await(5, TimeUnit.SECONDS));

MetaData.Request metaData = newRequest("GET", new HttpFields());
HeadersFrame frame = new HeadersFrame(metaData, null, true);
CountDownLatch latch = new CountDownLatch(1);
session.newStream(frame, new Promise.Adapter<>(), new Stream.Listener.Adapter()
{
@Override
public void onHeaders(Stream stream, HeadersFrame frame)
{
MetaData.Response response = (MetaData.Response)frame.getMetaData();
assertEquals(200, response.getStatus());
latch.countDown();
}
});

assertTrue(latch.await(5, TimeUnit.SECONDS));
}

@ParameterizedTest
@CsvSource({"0,-1", "-1,0", "0,0"})
public void testMaxTableCapacityZero(int clientMaxCapacity, int serverMaxCapacity) throws Exception
{
start(new HttpServlet()
{
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
{
resp.setStatus(200);
resp.getOutputStream().close();
}
});

if (clientMaxCapacity >= 0)
{
client.setMaxDecoderTableCapacity(clientMaxCapacity);
client.setMaxEncoderTableCapacity(clientMaxCapacity);
}
if (serverMaxCapacity >= 0)
{
connector.getConnectionFactory(AbstractHTTP2ServerConnectionFactory.class).setMaxEncoderTableCapacity(serverMaxCapacity);
connector.getConnectionFactory(AbstractHTTP2ServerConnectionFactory.class).setMaxDecoderTableCapacity(serverMaxCapacity);
}

CountDownLatch serverPreface = new CountDownLatch(1);
Session session = newClient(new Session.Listener.Adapter()
{
@Override
public void onSettings(Session session, SettingsFrame frame)
{
serverPreface.countDown();
}
});
assertTrue(serverPreface.await(5, TimeUnit.SECONDS));

MetaData.Request metaData = newRequest("GET", new HttpFields());
HeadersFrame frame = new HeadersFrame(metaData, null, true);
CountDownLatch latch = new CountDownLatch(1);
session.newStream(frame, new Promise.Adapter<>(), new Stream.Listener.Adapter()
{
@Override
public void onHeaders(Stream stream, HeadersFrame frame)
{
MetaData.Response response = (MetaData.Response)frame.getMetaData();
assertEquals(200, response.getStatus());
latch.countDown();
}
});

assertTrue(latch.await(5, TimeUnit.SECONDS));
}
}
8 changes: 6 additions & 2 deletions jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ public class HpackEncoder
private int _maxHeaderListSize;
private int _headerListSize;
private boolean _validateEncoding = true;
private boolean _maxDynamicTableSizeSent = false;

public HpackEncoder()
{
_context = new HpackContext(0);
_context = new HpackContext(HpackContext.DEFAULT_MAX_TABLE_CAPACITY);
_debug = LOG.isDebugEnabled();
setMaxTableCapacity(HpackContext.DEFAULT_MAX_TABLE_CAPACITY);
setTableCapacity(HpackContext.DEFAULT_MAX_TABLE_CAPACITY);
Expand Down Expand Up @@ -209,8 +210,11 @@ public void encode(ByteBuffer buffer, MetaData metadata) throws HpackException

// If max table size changed, send the correspondent instruction.
int tableCapacity = getTableCapacity();
if (tableCapacity != _context.getMaxDynamicTableSize())
if (!_maxDynamicTableSizeSent || tableCapacity != _context.getMaxDynamicTableSize())
{
_maxDynamicTableSizeSent = true;
encodeMaxDynamicTableSize(buffer, tableCapacity);
}

// Add Request/response meta fields
if (metadata.isRequest())
Expand Down

0 comments on commit dc205ff

Please sign in to comment.