H/Qpack encoding errors

src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs

@@ -189,11 +189,13 @@ public void WriteResponseHeaders(int streamId, int statusCode, Http2HeadersFrame
                     var done = HPackHeaderWriter.BeginEncodeHeaders(statusCode, _hpackEncoder, _headersEnumerator, buffer, out var payloadLength);
                     FinishWritingHeaders(streamId, payloadLength, done);
                 }
-                catch (Exception hex) // Any exception from the HPack encoder can leave the dynamic table in a corrupt state.
+                // Any exception from the HPack encoder can leave the dynamic table in a corrupt state.
+                // Since we allow custom header encoders we don't know what type of exceptions to expect.
+                catch (Exception ex)
                 {
-                    _log.HPackEncodingError(_connectionId, streamId, hex);
-                    _http2Connection.Abort(new ConnectionAbortedException(hex.Message, hex));
-                    throw new InvalidOperationException(hex.Message, hex); // Report the error to the user if this was the first write.
+                    _log.HPackEncodingError(_connectionId, streamId, ex);
+                    _http2Connection.Abort(new ConnectionAbortedException(ex.Message, ex));
+                    throw new InvalidOperationException(ex.Message, ex); // Report the error to the user if this was the first write.
                 }
             }
         }
@@ -215,10 +217,12 @@ public ValueTask<FlushResult> WriteResponseTrailersAsync(int streamId, HttpRespo
                     var done = HPackHeaderWriter.BeginEncodeHeaders(_hpackEncoder, _headersEnumerator, buffer, out var payloadLength);
                     FinishWritingHeaders(streamId, payloadLength, done);
                 }
-                catch (Exception hex)  // Any exception from the HPack encoder can leave the dynamic table in a corrupt state.
+                // Any exception from the HPack encoder can leave the dynamic table in a corrupt state.
+                // Since we allow custom header encoders we don't know what type of exceptions to expect.
+                catch (Exception ex)
                 {
-                    _log.HPackEncodingError(_connectionId, streamId, hex);
-                    _http2Connection.Abort(new ConnectionAbortedException(hex.Message, hex));
+                    _log.HPackEncodingError(_connectionId, streamId, ex);
+                    _http2Connection.Abort(new ConnectionAbortedException(ex.Message, ex));
                 }
 
                 return TimeFlushUnsynchronizedAsync();

src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs

@@ -281,9 +281,12 @@ public ValueTask<FlushResult> WriteResponseTrailersAsync(long streamId, HttpResp
                     var done = QPackHeaderWriter.BeginEncode(_headersEnumerator, buffer, ref _headersTotalSize, out var payloadLength);
                     FinishWritingHeaders(payloadLength, done);
                 }
-                catch (Exception ex) // Any encoding error can corrupt connection state.
+                // Any exception from the QPack encoder can leave the dynamic table in a corrupt state.
+                // Since we allow custom header encoders we don't know what type of exceptions to expect.
+                catch (Exception ex)
                 {
                     _log.QPackEncodingError(_connectionId, streamId, ex);
+                    _connectionContext.Abort(new ConnectionAbortedException(ex.Message, ex));
                     _http3Stream.Abort(new ConnectionAbortedException(ex.Message, ex), Http3ErrorCode.InternalError);
                 }
 
@@ -333,8 +336,12 @@ internal void WriteResponseHeaders(int statusCode, HttpResponseHeaders headers)
                     var done = QPackHeaderWriter.BeginEncode(statusCode, _headersEnumerator, buffer, ref _headersTotalSize, out var payloadLength);
                     FinishWritingHeaders(payloadLength, done);
                 }
-                catch (Exception ex) // Any encoding error can corrupt connection state.
+                // Any exception from the QPack encoder can leave the dynamic table in a corrupt state.
+                // Since we allow custom header encoders we don't know what type of exceptions to expect.
+                catch (Exception ex)
                 {
+                    _log.QPackEncodingError(_connectionId, _http3Stream.StreamId, ex);
+                    _connectionContext.Abort(new ConnectionAbortedException(ex.Message, ex));
                     _http3Stream.Abort(new ConnectionAbortedException(ex.Message, ex), Http3ErrorCode.InternalError);
                     throw new InvalidOperationException(ex.Message, ex); // Report the error to the user if this was the first write.
                 }