This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch HTTPCLIENT-2201
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.
at 87a3f86 HTTPCLIENT-2201: protocol exception thrown while consuming pushed headers can leave the pushed stream on the client side in an inconsistent state
This branch includes the following new commits:
new 87a3f86 HTTPCLIENT-2201: protocol exception thrown while consuming pushed headers can leave the pushed stream on the client side in an inconsistent state
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.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch HTTPCLIENT-2201
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 87a3f867491a63a619c0394109e9b746d3615d34
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Wed Feb 9 19:46:42 2022 +0100
HTTPCLIENT-2201: protocol exception thrown while consuming pushed headers can leave the pushed stream on the client side in an inconsistent state
---
.../http2/impl/nio/ClientPushH2StreamHandler.java | 9 ++-
.../core5/http2/impl/nio/NoopAsyncPushHandler.java | 72 ++++++++++++++++++++++
2 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java
index 46c3e8c..1c9c1ae 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java
@@ -103,17 +103,16 @@ class ClientPushH2StreamHandler implements H2StreamHandler {
if (requestState == MessageState.HEADERS) {
request = DefaultH2RequestConverter.INSTANCE.convert(headers);
-
- final AsyncPushConsumer handler;
try {
- handler = pushHandlerFactory != null ? pushHandlerFactory.create(request, context) : null;
+ exchangeHandler = pushHandlerFactory != null ? pushHandlerFactory.create(request, context) : null;
} catch (final ProtocolException ex) {
+ exchangeHandler = new NoopAsyncPushHandler();
throw new H2StreamResetException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
- if (handler == null) {
+ if (exchangeHandler == null) {
+ exchangeHandler = new NoopAsyncPushHandler();
throw new H2StreamResetException(H2Error.REFUSED_STREAM, "Stream refused");
}
- exchangeHandler = handler;
context.setProtocolVersion(HttpVersion.HTTP_2);
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/NoopAsyncPushHandler.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/NoopAsyncPushHandler.java
new file mode 100644
index 0000000..dc0d80b
--- /dev/null
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/NoopAsyncPushHandler.java
@@ -0,0 +1,72 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.core5.http2.impl.nio;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.AsyncPushConsumer;
+import org.apache.hc.core5.http.nio.CapacityChannel;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
+class NoopAsyncPushHandler implements AsyncPushConsumer {
+
+ @Override
+ public void consumePromise(final HttpRequest promise,
+ final HttpResponse response,
+ final EntityDetails entityDetails,
+ final HttpContext context) throws HttpException, IOException {
+ }
+
+ @Override
+ public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
+ capacityChannel.update(Integer.MAX_VALUE);
+ }
+
+ @Override
+ public void consume(final ByteBuffer src) throws IOException {
+ }
+
+ @Override
+ public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
+ }
+
+ @Override
+ public void failed(final Exception cause) {
+ }
+
+ @Override
+ public void releaseResources() {
+ }
+
+}