Remove forbidden HTTP1 headers even if no connection header is present (#311)

Author: fabianfett

Sources/NIOHPACK/HPACKHeader.swift

@@ -33,11 +33,10 @@ public struct HPACKHeaders: ExpressibleByDictionaryLiteral {
             self.headers = httpHeaders.map { HPACKHeader(name: $0.name.lowercased(), value: $0.value) }
 
             let connectionHeaderValue = httpHeaders[canonicalForm: "connection"]
-            if !connectionHeaderValue.isEmpty {
-                self.headers.removeAll { header in
-                    return HPACKHeaders.illegalHeaders.contains(header.name) ||
-                        connectionHeaderValue.contains(header.name[...])
-                }
+            
+            self.headers.removeAll { header in
+                connectionHeaderValue.contains(header.name[...]) ||
+                    HPACKHeaders.illegalHeaders.contains(header.name)
             }
         } else {
             self.headers = httpHeaders.map { HPACKHeader(name: $0.name, value: $0.value) }

Sources/NIOHTTP2/HTTP2ToHTTP1Codec.swift

@@ -225,10 +225,10 @@ public final class HTTP2FramePayloadToHTTP1ClientCodec: ChannelInboundHandler, C
     }
 
     public func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
-        let responsePart = self.unwrapOutboundIn(data)
+        let requestPart = self.unwrapOutboundIn(data)
 
         do {
-            let transformedPayload = try self.baseCodec.processOutboundData(responsePart, allocator: context.channel.allocator)
+            let transformedPayload = try self.baseCodec.processOutboundData(requestPart, allocator: context.channel.allocator)
             context.write(self.wrapOutboundOut(transformedPayload), promise: promise)
         } catch {
             promise?.fail(error)

Tests/NIOHTTP2Tests/HTTP2FramePayloadToHTTP1CodecTests+XCTest.swift

@@ -60,6 +60,7 @@ extension HTTP2FramePayloadToHTTP1CodecTests {
                 ("testWeDoNotNormalizeHeadersIfUserAskedUsNotToForRequests", testWeDoNotNormalizeHeadersIfUserAskedUsNotToForRequests),
                 ("testWeDoNotNormalizeHeadersIfUserAskedUsNotToForResponses", testWeDoNotNormalizeHeadersIfUserAskedUsNotToForResponses),
                 ("testWeStripIllegalHeadersAsWellAsTheHeadersNominatedByTheConnectionHeaderForRequests", testWeStripIllegalHeadersAsWellAsTheHeadersNominatedByTheConnectionHeaderForRequests),
+                ("testWeStripTransferEncodingChunkedHeader", testWeStripTransferEncodingChunkedHeader),
                 ("testWeStripIllegalHeadersAsWellAsTheHeadersNominatedByTheConnectionHeaderForResponses", testWeStripIllegalHeadersAsWellAsTheHeadersNominatedByTheConnectionHeaderForResponses),
                 ("testServerSideWithEmptyFinalPackage", testServerSideWithEmptyFinalPackage),
                 ("testClientSideWithEmptyFinalPackage", testClientSideWithEmptyFinalPackage),

Tests/NIOHTTP2Tests/HTTP2FramePayloadToHTTP1CodecTests.swift

@@ -663,6 +663,27 @@ final class HTTP2FramePayloadToHTTP1CodecTests: XCTestCase {
                                                                  headers: expectedRequestHeaders,
                                                                  type: .request)
     }
+    
+    func testWeStripTransferEncodingChunkedHeader() {
+        let writeRecorder = FramePayloadWriteRecorder()
+        XCTAssertNoThrow(try self.channel.pipeline.addHandler(writeRecorder).wait())
+        XCTAssertNoThrow(try self.channel.pipeline.addHandler(HTTP2FramePayloadToHTTP1ClientCodec(httpProtocol: .https)).wait())
+
+        // A basic request.
+        var requestHead = HTTPRequestHead(version: .init(major: 1, minor: 1), method: .POST, uri: "/post")
+        requestHead.headers = HTTPHeaders([
+            ("host", "example.org"),
+            ("Transfer-Encoding", "chunked"),
+        ])
+        self.channel.writeAndFlush(HTTPClientRequestPart.head(requestHead), promise: nil)
+
+        let expectedRequestHeaders = HPACKHeaders([(":path", "/post"), (":method", "POST"), (":scheme", "https"),
+                                                   (":authority", "example.org")])
+        XCTAssertEqual(writeRecorder.flushedWrites.count, 1)
+        writeRecorder.flushedWrites[0].assertHeadersFramePayload(endStream: false,
+                                                                 headers: expectedRequestHeaders,
+                                                                 type: .request)
+    }
 
     func testWeStripIllegalHeadersAsWellAsTheHeadersNominatedByTheConnectionHeaderForResponses() throws {
         let writeRecorder = FramePayloadWriteRecorder()