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 2025/12/16 20:09:06 UTC
(httpcomponents-client) branch 5.6.x updated (1cd14660f -> 11ea8e52b)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch 5.6.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
discard 1cd14660f Updated release notes for HttpClient 5.6 release
new 77fa61aae Limit the length of content codec list that can be processed automatically
new 11ea8e52b Updated release notes for HttpClient 5.6 release
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 (1cd14660f)
\
N -- N -- N refs/heads/5.6.x (11ea8e52b)
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 2 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:
RELEASE_NOTES.txt | 3 +++
.../hc/client5/http/impl/ContentCodingSupport.java | 10 +++++++
.../impl/async/ContentCompressionAsyncExec.java | 16 ++++++++---
.../http/impl/async/HttpAsyncClientBuilder.java | 2 +-
.../http/impl/classic/ContentCompressionExec.java | 19 +++++++++++--
.../methods/InflatingAsyncEntityConsumerTest.java | 2 +-
.../methods/InflatingBrotliDataConsumerTest.java | 2 +-
.../async/TestContentCompressionAsyncExec.java | 2 +-
.../impl/classic/TestContentCompressionExec.java | 31 ++++++++++++++++++++++
9 files changed, 78 insertions(+), 9 deletions(-)
(httpcomponents-client) 01/02: Limit the length of content codec list that can be processed automatically
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.6.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 77fa61aae9fe492eb81e321073441646856775e1
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Dec 15 10:23:19 2025 +0100
Limit the length of content codec list that can be processed automatically
---
.../hc/client5/http/impl/ContentCodingSupport.java | 10 +++++++
.../impl/async/ContentCompressionAsyncExec.java | 16 ++++++++---
.../http/impl/async/HttpAsyncClientBuilder.java | 2 +-
.../http/impl/classic/ContentCompressionExec.java | 19 +++++++++++--
.../methods/InflatingAsyncEntityConsumerTest.java | 2 +-
.../methods/InflatingBrotliDataConsumerTest.java | 2 +-
.../async/TestContentCompressionAsyncExec.java | 2 +-
.../impl/classic/TestContentCompressionExec.java | 31 ++++++++++++++++++++++
8 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ContentCodingSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ContentCodingSupport.java
index 441c0d329..5d794b9f3 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ContentCodingSupport.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ContentCodingSupport.java
@@ -28,12 +28,14 @@
package org.apache.hc.client5.http.impl;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import org.apache.hc.core5.annotation.Internal;
import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.message.MessageSupport;
import org.apache.hc.core5.http.message.ParserCursor;
@@ -43,6 +45,8 @@
@Internal
public final class ContentCodingSupport {
+ public static final int MAX_CODEC_LIST_LEN = 5;
+
private ContentCodingSupport() {
}
@@ -62,4 +66,10 @@ public static List<String> parseContentCodecs(final EntityDetails entityDetails)
return codecs;
}
+ public static void validate(final Collection<String> codecList, final int maxCodecListLen) throws ProtocolException {
+ if (maxCodecListLen > 0 && codecList.size() > maxCodecListLen) {
+ throw new ProtocolException("Codec list exceeds maximum of " + maxCodecListLen + " elements");
+ }
+ }
+
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/ContentCompressionAsyncExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/ContentCompressionAsyncExec.java
index d8c9a6aa4..04d5ed796 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/ContentCompressionAsyncExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/ContentCompressionAsyncExec.java
@@ -67,23 +67,29 @@ public final class ContentCompressionAsyncExec implements AsyncExecChainHandler
private final Lookup<UnaryOperator<AsyncDataConsumer>> decoders;
private final List<String> acceptTokens;
+ private final int maxCodecListLen;
public ContentCompressionAsyncExec(
final LinkedHashMap<String, UnaryOperator<AsyncDataConsumer>> decoderMap,
- final boolean ignoreUnknown) {
-
+ final int maxCodecListLen) {
Args.notEmpty(decoderMap, "Decoder map");
final RegistryBuilder<UnaryOperator<AsyncDataConsumer>> rb = RegistryBuilder.create();
decoderMap.forEach(rb::register);
this.decoders = rb.build();
this.acceptTokens = new ArrayList<>(decoderMap.keySet());
+ this.maxCodecListLen = maxCodecListLen;
+ }
+
+ public ContentCompressionAsyncExec(
+ final LinkedHashMap<String, UnaryOperator<AsyncDataConsumer>> decoderMap) {
+ this(decoderMap, ContentCodingSupport.MAX_CODEC_LIST_LEN);
}
/**
* Default: DEFLATE + GZIP (plus <code>x-gzip</code> alias).
*/
- public ContentCompressionAsyncExec() {
+ public ContentCompressionAsyncExec(final int maxCodecListLen) {
final LinkedHashMap<String, UnaryOperator<AsyncDataConsumer>> map = new LinkedHashMap<>();
map.put(ContentCoding.DEFLATE.token(), d -> new InflatingAsyncDataConsumer(d, null));
map.put(ContentCoding.GZIP.token(), InflatingGzipDataConsumer::new);
@@ -109,8 +115,12 @@ public ContentCompressionAsyncExec() {
this.decoders = rb.build();
this.acceptTokens = tokens;
+ this.maxCodecListLen = maxCodecListLen;
}
+ public ContentCompressionAsyncExec() {
+ this(ContentCodingSupport.MAX_CODEC_LIST_LEN);
+ }
@Override
public void execute(
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
index b2f55bba7..d2968a5bf 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
@@ -1100,7 +1100,7 @@ public CloseableHttpAsyncClient build() {
if (!contentCompressionDisabled) {
if (contentDecoderMap != null && !contentDecoderMap.isEmpty()) {
execChainDefinition.addFirst(
- new ContentCompressionAsyncExec(contentDecoderMap, true),
+ new ContentCompressionAsyncExec(contentDecoderMap),
ChainElement.COMPRESS.name());
} else {
execChainDefinition.addFirst(
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java
index f4da426ec..fc7ed56c0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java
@@ -72,16 +72,25 @@ public final class ContentCompressionExec implements ExecChainHandler {
private final Header acceptEncoding;
private final Lookup<UnaryOperator<HttpEntity>> decoderRegistry;
+ private final int maxCodecListLen;
public ContentCompressionExec(
final List<String> acceptEncoding,
- final Lookup<UnaryOperator<HttpEntity>> decoderRegistry) {
+ final Lookup<UnaryOperator<HttpEntity>> decoderRegistry,
+ final int maxCodecListLen) {
this.acceptEncoding = MessageSupport.headerOfTokens(HttpHeaders.ACCEPT_ENCODING,
Args.notEmpty(acceptEncoding, "Encoding list"));
this.decoderRegistry = Args.notNull(decoderRegistry, "Decoder register");
+ this.maxCodecListLen = maxCodecListLen;
}
- public ContentCompressionExec() {
+ public ContentCompressionExec(
+ final List<String> acceptEncoding,
+ final Lookup<UnaryOperator<HttpEntity>> decoderRegistry) {
+ this(acceptEncoding, decoderRegistry, ContentCodingSupport.MAX_CODEC_LIST_LEN);
+ }
+
+ public ContentCompressionExec(final int maxCodecListLen) {
final Map<ContentCoding, UnaryOperator<HttpEntity>> decoderMap = new EnumMap<>(ContentCoding.class);
for (final ContentCoding c : ContentCoding.values()) {
final UnaryOperator<HttpEntity> d = ContentCodecRegistry.decoder(c);
@@ -103,6 +112,11 @@ public ContentCompressionExec() {
}
this.acceptEncoding = MessageSupport.headerOfTokens(HttpHeaders.ACCEPT_ENCODING, acceptList);
this.decoderRegistry = builder.build();
+ this.maxCodecListLen = maxCodecListLen;
+ }
+
+ public ContentCompressionExec() {
+ this(ContentCodingSupport.MAX_CODEC_LIST_LEN);
}
@Override
@@ -128,6 +142,7 @@ public ClassicHttpResponse execute(
// check for zero length entity.
if (requestConfig.isContentCompressionEnabled() && entity != null && entity.getContentLength() != 0) {
final List<String> codecs = ContentCodingSupport.parseContentCodecs(entity);
+ ContentCodingSupport.validate(codecs, maxCodecListLen);
if (!codecs.isEmpty()) {
for (int i = codecs.size() - 1; i >= 0; i--) {
final String codec = codecs.get(i);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingAsyncEntityConsumerTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingAsyncEntityConsumerTest.java
index fca30dc82..308bfe4cf 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingAsyncEntityConsumerTest.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingAsyncEntityConsumerTest.java
@@ -204,7 +204,7 @@ public Set<String> getTrailerNames() {
void unknownEncodingMapFlag() throws Exception {
final LinkedHashMap<String, UnaryOperator<AsyncDataConsumer>> map = new LinkedHashMap<>();
map.put("deflate", d -> new InflatingAsyncDataConsumer(d, null));
- final ContentCompressionAsyncExec exec = new ContentCompressionAsyncExec(map, false);
+ final ContentCompressionAsyncExec exec = new ContentCompressionAsyncExec(map);
assertNotNull(exec);
}
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingBrotliDataConsumerTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingBrotliDataConsumerTest.java
index 8446d2830..230e0936e 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingBrotliDataConsumerTest.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/InflatingBrotliDataConsumerTest.java
@@ -195,7 +195,7 @@ public Set<String> getTrailerNames() {
void registerInExec() {
final LinkedHashMap<String, UnaryOperator<AsyncDataConsumer>> map = new LinkedHashMap<>();
map.put("br", InflatingBrotliDataConsumer::new);
- final ContentCompressionAsyncExec exec = new ContentCompressionAsyncExec(map, false);
+ final ContentCompressionAsyncExec exec = new ContentCompressionAsyncExec(map);
assertNotNull(exec);
}
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/TestContentCompressionAsyncExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/TestContentCompressionAsyncExec.java
index a02ddb45d..8cf3a181d 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/TestContentCompressionAsyncExec.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/TestContentCompressionAsyncExec.java
@@ -163,7 +163,7 @@ public AsyncDataConsumer apply(final AsyncDataConsumer d) {
return new InflatingAsyncDataConsumer(d, null);
}
});
- impl = new ContentCompressionAsyncExec(map, /*ignoreUnknown*/ false);
+ impl = new ContentCompressionAsyncExec(map);
final HttpRequest request = new BasicHttpRequest(Method.GET, "/");
final AsyncExecCallback cb = executeAndCapture(request);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java
index d9c5151d6..44711e82f 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java
@@ -40,6 +40,7 @@
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.Method;
+import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
@@ -236,4 +237,34 @@ void testContentEncodingRequestParameter() throws Exception {
Assertions.assertFalse(entity instanceof GzipDecompressingEntity);
}
+ @Test
+ void testContentEncodingExceedsCodecListLenMax() throws Exception {
+ impl = new ContentCompressionExec(5);
+
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, host, "/");
+ final ClassicHttpResponse response1 = new BasicClassicHttpResponse(200, "OK");
+ final HttpEntity original1 = EntityBuilder.create()
+ .setText("encoded stuff")
+ .setContentEncoding("gzip,gzip,gzip,gzip,gzip")
+ .build();
+ response1.setEntity(original1);
+
+ Mockito.when(execChain.proceed(request, scope)).thenReturn(response1);
+
+ final HttpEntity entity = response1.getEntity();
+ Assertions.assertNotNull(entity);
+
+ final ClassicHttpResponse response2 = new BasicClassicHttpResponse(200, "OK");
+ final HttpEntity original2 = EntityBuilder.create()
+ .setText("encoded stuff")
+ .setContentEncoding("gzip,gzip,gzip,gzip,gzip,gzip")
+ .build();
+ response2.setEntity(original2);
+
+ Mockito.when(execChain.proceed(request, scope)).thenReturn(response2);
+
+ final ProtocolException exception = Assertions.assertThrows(ProtocolException.class, () -> impl.execute(request, scope, execChain));
+ Assertions.assertEquals("Codec list exceeds maximum of 5 elements", exception.getMessage());
+ }
+
}
(httpcomponents-client) 02/02: Updated release notes for HttpClient 5.6 release
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.6.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 11ea8e52b7e970871bfbbb53e8c601b111ae2be6
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sun Dec 14 16:25:19 2025 +0100
Updated release notes for HttpClient 5.6 release
---
RELEASE_NOTES.txt | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 2f343a482..8dc4d71a6 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,10 +1,10 @@
-Release 5.6 ALPHA1
+Release 5.6
------------------
-This is the first ALPHA release in the 5.6 release series. It adds several features
-such as transport content decompression and content compression for the async transport,
-support for Unix sockets, experimental support for SCRAM-SHA-256 authentication scheme,
-and Micrometer/OTel observations & metrics.
+This is the first GA release in the 5.6 release series. It adds several features such as
+transport content decompression and content compression for the async transport, support
+for Unix sockets, experimental support for SCRAM-SHA-256 authentication scheme, and
+Micrometer/OTel observations & metrics.
Commons Compress, Brotli codec, and ZStd codec are optional dependencies and get
wired into the execution pipeline only if present on the classpath.
@@ -28,6 +28,8 @@ Notable changes and features included in the 5.6 series:
* Request Priority support (RFC 9218). Experimental.
+* OFFLOCK connection pool concurrency policy. Experimental.
+
Compatibility notes:
@@ -40,6 +42,31 @@ Compatibility notes:
Change Log
-------------------
+* Limit the length of the content codec list that can be processed automatically.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Upgraded HttpCore to version 5.4
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* OFFLOCK connection pool concurrency policy backed by RouteSegmentedConnPool (#765).
+ Contributed by Arturo Bernal <abernal at apache.org>
+
+
+
+Release 5.6 ALPHA1
+------------------
+
+This is the first ALPHA release in the 5.6 release series. It adds several features
+such as transport content decompression and content compression for the async transport,
+support for Unix sockets, experimental support for SCRAM-SHA-256 authentication scheme,
+and Micrometer/OTel observations & metrics.
+
+Commons Compress, Brotli codec, and ZStd codec are optional dependencies and get
+wired into the execution pipeline only if present on the classpath.
+
+Change Log
+-------------------
+
* RequestConfig: Un-deprecate #setProxy.
Contributed by Ryan Schmitt <rschmitt at apache.org>