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 2026/09/11 09:43:44 UTC

(httpcomponents-core) 04/04: #parseElementList in MessageSupport to tolerate trailing whitespace; #parseElementListStrict to disallow malformed / unparsed elements

This is an automated email from the ASF dual-hosted git repository.

ok2c pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git

commit 4021b98e8e942ccbce8cdf54ec910302821fa740
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Tue Sep 8 14:59:19 2026 +0200

    #parseElementList in MessageSupport to tolerate trailing whitespace; #parseElementListStrict to disallow malformed / unparsed elements
---
 .../hc/core5/http/message/MessageSupport.java      |  7 +++
 .../hc/core5/http/message/TestMessageSupport.java  | 58 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
index 6fbc8082d..71640401e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
@@ -66,6 +66,8 @@
  */
 public class MessageSupport {
 
+    private static final Tokenizer TK = Tokenizer.INSTANCE;
+
     private MessageSupport() {
         // Do not allow utility class to be instantiated.
     }
@@ -265,6 +267,7 @@ public static void parseElementList(final CharSequence src,
         Args.notNull(consumer, "Consumer");
         while (!cursor.atEnd()) {
             consumer.accept(src, cursor);
+            TK.skipWhiteSpace(src, cursor);
             if (!cursor.atEnd()) {
                 final char ch = src.charAt(cursor.getPos());
                 if (ch == ',') {
@@ -327,10 +330,14 @@ public static void parseElementListStrict(final CharSequence src,
         Args.notNull(consumer, "Consumer");
         while (!cursor.atEnd()) {
             consumer.accept(src, cursor);
+            TK.skipWhiteSpace(src, cursor);
             if (!cursor.atEnd()) {
                 final char ch = src.charAt(cursor.getPos());
                 if (ch == ',') {
                     cursor.updatePos(cursor.getPos() + 1);
+                } else {
+                    throw new ParseException("Invalid header element",
+                            src, cursor.getLowerBound(), cursor.getUpperBound(), cursor.getPos());
                 }
             }
         }
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestMessageSupport.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestMessageSupport.java
index a43235fc1..d30d4e769 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestMessageSupport.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestMessageSupport.java
@@ -45,10 +45,12 @@
 import org.apache.hc.core5.http.HttpMessage;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.io.entity.HttpEntities;
 import org.apache.hc.core5.http.support.BasicResponseBuilder;
 import org.apache.hc.core5.util.CharArrayBuffer;
@@ -393,6 +395,27 @@ void testParseHeaders() {
         Assertions.assertEquals(Arrays.asList("this", "that", "this", "that", "what not"), tokens);
     }
 
+    @Test
+    void testParseHeadersElementWhitespace() throws Exception {
+        final HttpMessage message = new BasicHttpRequest(Method.GET, "/");
+        message.addHeader("Some-Header", "HTTP/1.0");
+        message.addHeader("Some-Header", "   HTTP/1.1  ");
+        message.addHeader("Some-Header", " HTTP/2   , HTTP/2.0   , HTTP/0.9  ");
+
+        final List<String> versions = new LinkedList<>();
+        MessageSupport.parseElementList(message, "Some-header", (charSequence, cursor) -> {
+            final String ver = copyToken(charSequence, cursor);
+            versions.add(ver);
+        });
+        Assertions.assertEquals(Arrays.asList(
+                        "HTTP/1.0",
+                        "HTTP/1.1",
+                        "HTTP/2",
+                        "HTTP/2.0",
+                        "HTTP/0.9"),
+                versions);
+    }
+
     @Test
     void testParseHeadersStrict() throws Exception {
         final HttpMessage message = new BasicHttpRequest(Method.GET, "/");
@@ -426,6 +449,41 @@ void testParseHeadersStrict() throws Exception {
                 }));
     }
 
+    @Test
+    void testParseHeadersStrictElementWhitespace() throws Exception {
+        final HttpMessage message = new BasicHttpRequest(Method.GET, "/");
+        message.addHeader("Some-Header", "HTTP/1.0");
+        message.addHeader("Some-Header", "   HTTP/1.1  ");
+        message.addHeader("Some-Header", " HTTP/2   , HTTP/2.0   , HTTP/0.9  ");
+
+        final List<ProtocolVersion> versions = new LinkedList<>();
+        MessageSupport.parseElementListStrict(message, "Some-header", (charSequence, cursor) -> {
+            final ProtocolVersion ver = HttpVersion.parse(charSequence, cursor, Tokenizer.delimiters(','));
+            versions.add(ver);
+        });
+        Assertions.assertEquals(Arrays.asList(
+                HttpVersion.HTTP_1_0,
+                HttpVersion.HTTP_1_1,
+                HttpVersion.HTTP_2_0,
+                HttpVersion.HTTP_2_0,
+                HttpVersion.HTTP_0_9),
+                versions);
+    }
+
+    @Test
+    void testParseHeadersStrictInvalidElement() throws Exception {
+        final HttpMessage message = new BasicHttpRequest(Method.GET, "/");
+        message.addHeader("Some-Header", "HTTP/1.0");
+        message.addHeader("Some-Header", "   HTTP/1.1  HTTP/1.1");
+
+        Assertions.assertThrows(ProtocolException.class, () -> {
+                    MessageSupport.parseElementListStrict(message, "Some-header", (charSequence, cursor) -> {
+                        HttpVersion.parse(charSequence, cursor, Tokenizer.delimiters(','));
+                    });
+                }
+        );
+    }
+
     @Test
     void testAddContentHeaders() {
         final HttpEntity entity = HttpEntities.create("some stuff with trailers", StandardCharsets.US_ASCII,