You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2022/01/01 16:41:29 UTC
[httpcomponents-core] branch HTTPCORE-707 updated (cf2ad36 -> e1c2e70)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch HTTPCORE-707
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.
discard cf2ad36 HTTPCORE-707: H2 connections incorrectly enforce the frame size max limit based on local settings instead of remote ones
new e1c2e70 HTTPCORE-707: H2 connections incorrectly enforce the frame size max limit based on local settings instead of remote ones
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cf2ad36)
\
N -- N -- N refs/heads/HTTPCORE-707 (e1c2e70)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/hc/core5/http2/impl/nio/FrameOutputBuffer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[httpcomponents-core] 01/01: HTTPCORE-707: H2 connections incorrectly enforce the frame size max limit based on local settings instead of remote ones
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch HTTPCORE-707
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit e1c2e70810fb2f92a10efa63329a5a6c73b6a165
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Fri Dec 31 15:00:42 2021 +0100
HTTPCORE-707: H2 connections incorrectly enforce the frame size max limit based on local settings instead of remote ones
---
.../http2/impl/nio/AbstractH2StreamMultiplexer.java | 5 +++++
.../hc/core5/http2/impl/nio/FrameOutputBuffer.java | 21 +++++++++++++--------
.../core5/http2/impl/nio/TestFrameInOutBuffers.java | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
index 2222f52..89976ef 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
@@ -1226,6 +1226,11 @@ abstract class AbstractH2StreamMultiplexer implements Identifiable, HttpConnecti
final int delta = remoteConfig.getInitialWindowSize() - initOutputWinSize;
initOutputWinSize = remoteConfig.getInitialWindowSize();
+ final int maxFrameSize = remoteConfig.getMaxFrameSize();
+ if (maxFrameSize > localConfig.getMaxFrameSize()) {
+ outputBuffer.expand(maxFrameSize);
+ }
+
if (delta != 0) {
if (!streamMap.isEmpty()) {
for (final Iterator<Map.Entry<Integer, H2Stream>> it = streamMap.entrySet().iterator(); it.hasNext(); ) {
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/FrameOutputBuffer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/FrameOutputBuffer.java
index aa76a13..f20edfb 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/FrameOutputBuffer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/FrameOutputBuffer.java
@@ -31,8 +31,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.GatheringByteChannel;
import java.nio.channels.WritableByteChannel;
-import org.apache.hc.core5.http2.H2ConnectionException;
-import org.apache.hc.core5.http2.H2Error;
import org.apache.hc.core5.http2.H2TransportMetrics;
import org.apache.hc.core5.http2.frame.FrameConsts;
import org.apache.hc.core5.http2.frame.RawFrame;
@@ -47,8 +45,8 @@ import org.apache.hc.core5.util.Args;
public final class FrameOutputBuffer {
private final BasicH2TransportMetrics metrics;
- private final int maxFramePayloadSize;
- private final ByteBuffer buffer;
+ private volatile int maxFramePayloadSize;
+ private volatile ByteBuffer buffer;
public FrameOutputBuffer(final BasicH2TransportMetrics metrics, final int maxFramePayloadSize) {
Args.notNull(metrics, "HTTP2 transport metrics");
@@ -62,14 +60,21 @@ public final class FrameOutputBuffer {
this(new BasicH2TransportMetrics(), maxFramePayloadSize);
}
+ public void expand(final int maxFramePayloadSize) {
+ this.maxFramePayloadSize = maxFramePayloadSize;
+ final ByteBuffer newBuffer = ByteBuffer.allocate(FrameConsts.HEAD_LEN + maxFramePayloadSize);
+ if (buffer.position() > 0) {
+ buffer.flip();
+ newBuffer.put(buffer);
+ }
+ buffer = newBuffer;
+ }
+
public void write(final RawFrame frame, final WritableByteChannel channel) throws IOException {
Args.notNull(frame, "Frame");
final ByteBuffer payload = frame.getPayload();
- if (payload != null && payload.remaining() > maxFramePayloadSize) {
- throw new H2ConnectionException(H2Error.FRAME_SIZE_ERROR, "Frame size exceeds maximum");
- }
-
+ Args.check(payload == null || payload.remaining() <= maxFramePayloadSize, "Frame size exceeds maximum");
buffer.putInt((payload != null ? payload.remaining() << 8 : 0) | (frame.getType() & 0xff));
buffer.put((byte) (frame.getFlags() & 0xff));
buffer.putInt(frame.getStreamId());
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestFrameInOutBuffers.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestFrameInOutBuffers.java
index c9e8603..2d9cea9 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestFrameInOutBuffers.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestFrameInOutBuffers.java
@@ -251,7 +251,7 @@ public class TestFrameInOutBuffers {
inBuffer.read(readableChannel);
}
- @Test(expected = H2ConnectionException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testWriteFrameExceedingLimit() throws Exception {
final WritableByteChannelMock writableChannel = new WritableByteChannelMock(1024);
final FrameOutputBuffer outbuffer = new FrameOutputBuffer(1024);