Merge pull request #1687 from fl4via/backport-fixes_2.3.x

[UNDERTOW-2412 / 2445 / 2449 / 2446 / 2436 / 2422 / 2444 / 2448] Backport fixes to 2.3.x

Author: fl4via

.github/workflows/ci.yml

@@ -40,11 +40,11 @@ jobs:
       shell: bash
       run: tar -czf maven-repo.tgz -C ~ .m2/repository
     - name: Persist Maven Repo
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: maven-repo
         path: maven-repo.tgz
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: surefire-reports-build
@@ -59,7 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        module: [core, servlet, websockets-jsr]
+        module: [core]
         jdk: [11, 17, 21]
         openjdk_impl: [ temurin ]
     steps:
@@ -85,7 +85,7 @@ jobs:
        hostname || true
     - uses: actions/checkout@v2
     - name: Download Maven Repo
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4
       with:
         name: maven-repo
         path: .
@@ -105,7 +105,7 @@ jobs:
       run: mvn -v
     - name: Run Tests
       run: mvn -U -B -fae test -Pproxy '-DfailIfNoTests=false' -pl ${{ matrix.module }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: surefire-reports-${{ matrix.jdk }}-${{ matrix.module }}-${{ matrix.os }}
@@ -138,7 +138,7 @@ jobs:
        hostname || true
     - uses: actions/checkout@v2
     - name: Download Maven Repo
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4
       with:
         name: maven-repo
         path: .
@@ -157,7 +157,7 @@ jobs:
       run: mvn -v
     - name: Run Tests
       run: mvn -U -B -fae test ${{ matrix.proxy }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: surefire-reports-${{ matrix.jdk }}-ipv6-${{ matrix.module }}${{ matrix.proxy }}-${{ matrix.os }}

core/src/main/java/io/undertow/UndertowMessages.java

@@ -647,4 +647,7 @@ public interface UndertowMessages {
     @Message(id = 208, value = "Failed to allocate resource")
     IOException failedToAllocateResource();
 
+    @Message(id = 209, value = "Protocol string was too large for the buffer. Either provide a smaller message or a bigger buffer. Protocol: %s")
+    IllegalStateException protocolTooLargeForBuffer(String protocolString);
+
 }

core/src/main/java/io/undertow/attribute/StoredResponse.java

@@ -66,6 +66,11 @@ private String extractCharset(HeaderMap headers) {
             if(contentType.startsWith("text/")) {
                 return StandardCharsets.ISO_8859_1.displayName();
             }
+            // json has no charset param: https://www.iana.org/assignments/media-types/application/json
+            // the default is UTF-8: https://www.rfc-editor.org/rfc/rfc7158#section-8.1 & https://www.rfc-editor.org/rfc/rfc8259#section-8.1
+            if(contentType.equals("application/json")) {
+                return StandardCharsets.UTF_8.name();
+            }
             return null;
         }
         return null;

core/src/main/java/io/undertow/protocols/http2/Http2Channel.java

@@ -1225,6 +1225,7 @@ private StreamHolder handleRstStream(int streamId, boolean receivedRst) {
             resetStreamTracker.store(streamId, holder);
             if(streamId % 2 == (isClient() ? 1 : 0)) {
                 sendConcurrentStreamsAtomicUpdater.getAndDecrement(this);
+                holder.sent = true;
             } else {
                 receiveConcurrentStreamsAtomicUpdater.getAndDecrement(this);
             }
@@ -1239,13 +1240,14 @@ private StreamHolder handleRstStream(int streamId, boolean receivedRst) {
                     //Server side originated, no input from client other than RST
                     //this can happen on page refresh when push happens, but client
                     //still has valid cache entry
+                    //NOTE: this is specific case when its set.
                     holder.resetByPeer = receivedRst;
                 } else {
                     handleRstWindow();
                 }
             }
         } else if(receivedRst){
-            final StreamHolder resetStream = resetStreamTracker.find(streamId);
+            final StreamHolder resetStream = resetStreamTracker.find(streamId, true);
             if(resetStream != null && resetStream.resetByPeer) {
                 //This means other side reset stream at some point.
                 //depending on peer or network latency our frames might be late and
@@ -1378,6 +1380,10 @@ private static final class StreamHolder {
          * This flag is set only in case of short lived server push that was reset by remote end.
          */
         boolean resetByPeer = false;
+        /**
+         * flag indicate whether our side originated. This is done for caching purposes, handlng differs.
+         */
+        boolean sent = false;
         Http2StreamSourceChannel sourceChannel;
         Http2StreamSinkChannel sinkChannel;
 
@@ -1388,6 +1394,13 @@ private static final class StreamHolder {
         StreamHolder(Http2StreamSinkChannel sinkChannel) {
             this.sinkChannel = sinkChannel;
         }
+
+        @Override
+        public String toString() {
+            return "StreamHolder [sourceClosed=" + sourceClosed + ", sinkClosed=" + sinkClosed + ", resetByPeer=" + resetByPeer
+                    + ", sent=" + sent + ", sourceChannel=" + sourceChannel + ", sinkChannel=" + sinkChannel + "]";
+        }
+
     }
 
     // cache that keeps track of streams until they can be evicted @see Http2Channel#RST_STREAM_EVICATION_TIME
@@ -1403,12 +1416,27 @@ private void store(int streamId, StreamHolder streamHolder) {
             streamHolders.put(streamId, streamHolder);
             entries.add(new StreamCacheEntry(streamId));
         }
-        private StreamHolder find(int streamId) {
+
+        /**
+         * Method will return only sent
+         * @param streamId
+         * @return
+         */
+        private StreamHolder find(final int streamId) {
+            return find(streamId, false);
+        }
+
+        private StreamHolder find(final int streamId, final boolean all) {
             for (Iterator<StreamCacheEntry> iterator = entries.iterator(); iterator.hasNext();) {
                 StreamCacheEntry entry = iterator.next();
                 if (entry.shouldEvict()) {
                     iterator.remove();
                     StreamHolder holder = streamHolders.remove(entry.streamId);
+                    if(!holder.sent || holder.resetByPeer) {
+                        //if its not our end of chain, its just cached, so we only cache for purpose of
+                        // handling eager RST
+                        continue;
+                    }
                     AbstractHttp2StreamSourceChannel receiver = holder.sourceChannel;
                     if(receiver != null) {
                         IoUtils.safeClose(receiver);
@@ -1422,7 +1450,12 @@ private StreamHolder find(int streamId) {
                     }
                 } else break;
             }
-            return streamHolders.get(streamId);
+            final StreamHolder holder = streamHolders.get(streamId);
+            if(holder != null && (!all && !holder.sent)) {
+                return null;
+            } else {
+                return holder;
+            }
         }
 
         private Map<Integer, StreamHolder> getStreamHolders() {