Feature/hc5 serverbootstrap convenience methods

.github/workflows/codeql-analysis.yml

@@ -84,7 +84,7 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
-    - run: mvn clean package -DskipTests -Drat.skip=true -Dcheckstyle.skip
+    - run: ./mvnw clean package -DskipTests -Drat.skip=true -Dcheckstyle.skip
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -49,4 +49,4 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains
+      run: ./mvnw -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains,docker

.gitignore

@@ -9,3 +9,6 @@ maven-eclipse.xml
 *.iml
 **/log4j2-debug.xml
 **/.checkstyle
+/test-CA/newcerts/
+/test-CA/serial.txt*
+/test-CA/index.txt*

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,20 @@
+# 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.
+distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+wrapperVersion=3.3.2

README.md

@@ -35,6 +35,16 @@ Dependencies
 
 HttpCore requires Java 1.8 compatible runtime.
 
+Protocol conformance
+--------------------
+- 
+- [RFC 9110](https://datatracker.ietf.org/doc/html/rfc9110) - HTTP Semantics
+- [RFC 9112](https://datatracker.ietf.org/doc/html/rfc9112) - Hypertext Transfer Protocol Version 1.1 (HTTP/1.1)
+- [RFC 7540](https://datatracker.ietf.org/doc/html/rfc7540) - Hypertext Transfer Protocol Version 2 (HTTP/2)
+- [RFC 7541](https://datatracker.ietf.org/doc/html/rfc7541) - HPACK: Header Compression for HTTP/2
+- [RFC 1945](https://datatracker.ietf.org/doc/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
+- [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986) - Uniform Resource Identifier (URI): Generic Syntax
+
 Licensing
 ---------
 

RELEASE_NOTES.txt

@@ -1,3 +1,30 @@
+Release 5.4-alpha1
+------------------
+
+This is the first release in the 5.4 release series.
+
+
+Change Log
+-------------------
+
+* Add ContentType.APPLICATION_ZIP_COMPRESSED.
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+* Bump io.reactivex.rxjava3:rxjava from 3.1.9 to 3.1.10 #509
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+* Bump org.junit:junit-bom from 5.11.0 to 5.13.3 #501, #528, #533
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+* Bump testcontainers.version from 1.20.2 to 1.20.4 #505
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+* Bump testcontainers.version from 1.21.1 to 1.21.3 #530, #534 
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+* Bump log4j.version from 2.24.3 to 2.25.0 #529 
+  Contributed by Gary Gregory <ggregory at apache.org>
+
 Release 5.3
 ------------------
 

SECURITY.md

@@ -17,7 +17,8 @@
     under the License.
 -->
 
-# Reporting a vulnerability
+# HttpComponents Security
 
-If you believe you found a vulnerability in Apache HttpClient,
-please contact [the Apache Security Team](https://www.apache.org/security/).
+The HttpComponents Security process and model are on our website's [Security](https://hc.apache.org/security.html) page.
+
+If you believe you found a vulnerability in Apache HttpClient, please contact the [Apache Security Team](https://www.apache.org/security/).

httpcore5-h2/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents.core5</groupId>
     <artifactId>httpcore5-parent</artifactId>
-    <version>5.3.1-SNAPSHOT</version>
+    <version>5.4-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore5-h2</artifactId>
   <name>Apache HttpComponents Core HTTP/2</name>

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2PseudoRequestHeaders.java

@@ -34,9 +34,9 @@
  */
 public final class H2PseudoRequestHeaders {
 
-    public static final String METHOD    = ":method";
-    public static final String SCHEME    = ":scheme";
+    public static final String METHOD = ":method";
+    public static final String SCHEME = ":scheme";
     public static final String AUTHORITY = ":authority";
-    public static final String PATH      = ":path";
+    public static final String PATH = ":path";
 
 }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2PseudoResponseHeaders.java

@@ -34,6 +34,6 @@
  */
 public final class H2PseudoResponseHeaders {
 
-    public static final String STATUS    = ":status";
+    public static final String STATUS = ":status";
 
 }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Config.java

@@ -50,10 +50,11 @@ public class H2Config {
     private final int maxFrameSize;
     private final int maxHeaderListSize;
     private final boolean compressionEnabled;
+    private final int maxContinuations;
 
     H2Config(final int headerTableSize, final boolean pushEnabled, final int maxConcurrentStreams,
              final int initialWindowSize, final int maxFrameSize, final int maxHeaderListSize,
-             final boolean compressionEnabled) {
+             final boolean compressionEnabled, final int maxContinuations) {
         super();
         this.headerTableSize = headerTableSize;
         this.pushEnabled = pushEnabled;
@@ -62,6 +63,7 @@ public class H2Config {
         this.maxFrameSize = maxFrameSize;
         this.maxHeaderListSize = maxHeaderListSize;
         this.compressionEnabled = compressionEnabled;
+        this.maxContinuations = maxContinuations;
     }
 
     public int getHeaderTableSize() {
@@ -92,6 +94,10 @@ public boolean isCompressionEnabled() {
         return compressionEnabled;
     }
 
+    public int getMaxContinuations() {
+        return maxContinuations;
+    }
+
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
@@ -102,6 +108,7 @@ public String toString() {
                 .append(", maxFrameSize=").append(this.maxFrameSize)
                 .append(", maxHeaderListSize=").append(this.maxHeaderListSize)
                 .append(", compressionEnabled=").append(this.compressionEnabled)
+                .append(", maxContinuations=").append(this.maxContinuations)
                 .append("]");
         return builder.toString();
     }
@@ -110,11 +117,11 @@ public static H2Config.Builder custom() {
         return new Builder();
     }
 
-    private static final int      INIT_HEADER_TABLE_SIZE   = 4096;
-    private static final boolean  INIT_ENABLE_PUSH         = true;
-    private static final int      INIT_MAX_FRAME_SIZE      = FrameConsts.MIN_FRAME_SIZE;
-    private static final int      INIT_WINDOW_SIZE         = 65535;
-    private static final int      INIT_CONCURRENT_STREAM   = 250;
+    private static final int INIT_HEADER_TABLE_SIZE = 4096;
+    private static final boolean INIT_ENABLE_PUSH = true;
+    private static final int INIT_MAX_FRAME_SIZE = FrameConsts.MIN_FRAME_SIZE;
+    private static final int INIT_WINDOW_SIZE = 65535;
+    private static final int INIT_CONCURRENT_STREAM = 250;
 
     public static H2Config.Builder initial() {
         return new Builder()
@@ -147,15 +154,17 @@ public static class Builder {
         private int maxFrameSize;
         private int maxHeaderListSize;
         private boolean compressionEnabled;
+        private int maxContinuations;
 
         Builder() {
             this.headerTableSize = INIT_HEADER_TABLE_SIZE * 2;
             this.pushEnabled = INIT_ENABLE_PUSH;
             this.maxConcurrentStreams = INIT_CONCURRENT_STREAM;
             this.initialWindowSize = INIT_WINDOW_SIZE;
-            this.maxFrameSize  = FrameConsts.MIN_FRAME_SIZE * 4;
+            this.maxFrameSize = FrameConsts.MIN_FRAME_SIZE * 4;
             this.maxHeaderListSize = FrameConsts.MAX_FRAME_SIZE;
             this.compressionEnabled = true;
+            this.maxContinuations = 100;
         }
 
         public Builder setHeaderTableSize(final int headerTableSize) {
@@ -198,6 +207,18 @@ public Builder setCompressionEnabled(final boolean compressionEnabled) {
             return this;
         }
 
+        /**
+         * Sets max limit on number of continuations.
+         * <p>value zero represents no limit</p>
+         *
+         * @since 5,4
+         */
+        public Builder setMaxContinuations(final int maxContinuations) {
+            Args.positive(maxContinuations, "Max continuations");
+            this.maxContinuations = maxContinuations;
+            return this;
+        }
+
         public H2Config build() {
             return new H2Config(
                     headerTableSize,
@@ -206,7 +227,8 @@ public H2Config build() {
                     initialWindowSize,
                     maxFrameSize,
                     maxHeaderListSize,
-                    compressionEnabled);
+                    compressionEnabled,
+                    maxContinuations);
         }
 
     }

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java

@@ -33,12 +33,12 @@
  */
 public enum H2Param {
 
-    HEADER_TABLE_SIZE      (0x1),
-    ENABLE_PUSH            (0x2),
-    MAX_CONCURRENT_STREAMS (0x3),
-    INITIAL_WINDOW_SIZE    (0x4),
-    MAX_FRAME_SIZE         (0x5),
-    MAX_HEADER_LIST_SIZE   (0x6);
+    HEADER_TABLE_SIZE(0x1),
+    ENABLE_PUSH(0x2),
+    MAX_CONCURRENT_STREAMS(0x3),
+    INITIAL_WINDOW_SIZE(0x4),
+    MAX_FRAME_SIZE(0x5),
+    MAX_HEADER_LIST_SIZE(0x6);
 
     int code;
 

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java

@@ -50,21 +50,21 @@ public RawFrame createHeaders(final int streamId, final ByteBuffer payload, fina
     @Override
     public RawFrame createContinuation(final int streamId, final ByteBuffer payload, final boolean endHeaders) {
         Args.positive(streamId, "Stream id");
-        final int flags = (endHeaders ? FrameFlag.END_HEADERS.value : 0);
+        final int flags = endHeaders ? FrameFlag.END_HEADERS.value : 0;
         return new RawFrame(FrameType.CONTINUATION.getValue(), flags, streamId, payload);
     }
 
     @Override
     public RawFrame createPushPromise(final int streamId, final ByteBuffer payload, final boolean endHeaders) {
         Args.positive(streamId, "Stream id");
-        final int flags = (endHeaders ? FrameFlag.END_HEADERS.value : 0);
+        final int flags = endHeaders ? FrameFlag.END_HEADERS.value : 0;
         return new RawFrame(FrameType.PUSH_PROMISE.getValue(), flags, streamId, payload);
     }
 
     @Override
     public RawFrame createData(final int streamId, final ByteBuffer payload, final boolean endStream) {
         Args.positive(streamId, "Stream id");
-        final int flags = (endStream ? FrameFlag.END_STREAM.value : 0);
+        final int flags = endStream ? FrameFlag.END_STREAM.value : 0;
         return new RawFrame(FrameType.DATA.getValue(), flags, streamId, payload);
     }
 

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFlag.java

@@ -33,11 +33,11 @@
  */
 public enum FrameFlag {
 
-    END_STREAM    (0x01),
-    ACK           (0x01),
-    END_HEADERS   (0x04),
-    PADDED        (0x08),
-    PRIORITY      (0x20);
+    END_STREAM(0x01),
+    ACK(0x01),
+    END_HEADERS(0x04),
+    PADDED(0x08),
+    PRIORITY(0x20);
 
     final int value;
 

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java

@@ -33,16 +33,16 @@
  */
 public enum FrameType {
 
-    DATA          (0x00),
-    HEADERS       (0x01),
-    PRIORITY      (0x02),
-    RST_STREAM    (0x03),
-    SETTINGS      (0x04),
-    PUSH_PROMISE  (0x05),
-    PING          (0x06),
-    GOAWAY        (0x07),
-    WINDOW_UPDATE (0x08),
-    CONTINUATION  (0x09);
+    DATA(0x00),
+    HEADERS(0x01),
+    PRIORITY(0x02),
+    RST_STREAM(0x03),
+    SETTINGS(0x04),
+    PUSH_PROMISE(0x05),
+    PING(0x06),
+    GOAWAY(0x07),
+    WINDOW_UPDATE(0x08),
+    CONTINUATION(0x09);
 
     int value;