Apply request-decompression-enabled config to HTTP/2 (#12334)

Author: yawkat

http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java

@@ -474,6 +474,7 @@ private Http2FrameCodec createHttp2FrameCodec() {
 
         private Http2ConnectionHandler createHttp2ServerHandler(boolean ssl) {
             Http2ServerHandler.ConnectionHandlerBuilder builder = new Http2ServerHandler.ConnectionHandlerBuilder(makeRequestHandler(embeddedServices.getWebSocketUpgradeHandler(server), ssl))
+                .decompress(server.getServerConfiguration().isRequestDecompressionEnabled())
                 .compressor(embeddedServices.getHttpCompressionStrategy())
                 .bodySizeLimits(bodySizeLimits())
                 .accessLogManagerFactory(accessLogManagerFactory)

http-server-netty/src/main/java/io/micronaut/http/server/netty/handler/Http2ServerHandler.java

@@ -289,6 +289,7 @@ public static final class ConnectionHandlerBuilder extends AbstractHttp2Connecti
         private final Http2ServerHandler frameListener;
         private Http2AccessLogManager.Factory accessLogManagerFactory;
         private Http2AccessLogManager accessLogManager;
+        private boolean decompress = true;
 
         public ConnectionHandlerBuilder(RequestHandler requestHandler) {
             frameListener = new Http2ServerHandler(requestHandler);
@@ -326,10 +327,15 @@ public ConnectionHandlerBuilder bodySizeLimits(BodySizeLimits bodySizeLimits) {
             return this;
         }
 
+        public ConnectionHandlerBuilder decompress(boolean decompress) {
+            this.decompress = decompress;
+            return this;
+        }
+
         @Override
         public ConnectionHandler build() {
             connection(new DefaultHttp2Connection(isServer(), maxReservedStreams()));
-            Http2FrameListener fl = new DelegatingDecompressorFrameListener(connection(), frameListener, false);
+            Http2FrameListener fl = decompress ? new DelegatingDecompressorFrameListener(connection(), frameListener, false) : frameListener;
             if (accessLogManagerFactory != null) {
                 accessLogManager = new Http2AccessLogManager(accessLogManagerFactory, connection());
                 fl = new Http2AccessLogFrameListener(fl, accessLogManager);

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/RequestDecompressionConfigSpec.groovy

@@ -23,11 +23,15 @@ import java.util.concurrent.ThreadLocalRandom
 
 class RequestDecompressionConfigSpec extends Specification {
 
-    def 'server request decompression can be disabled'(CharSequence contentEncoding, Object compressor) {
+    def 'server request decompression can be disabled'(CharSequence contentEncoding, Object compressor, boolean http2) {
         given: 'an embedded server with request decompression disabled'
         Map<String, Object> cfg = [
-            'spec.name'                                           : 'RequestDecompressionConfigSpec',
-            'micronaut.server.netty.request-decompression-enabled': false
+                'spec.name'                                                : 'RequestDecompressionConfigSpec',
+                'micronaut.server.netty.request-decompression-enabled'     : false,
+                'micronaut.server.ssl.port'                                : 0,
+                'micronaut.http.client.http-version'                       : http2 ? '2.0' : '1.1',
+                'micronaut.server.http-version'                            : http2 ? '2.0' : '1.1',
+                'micronaut.http.client.ssl.insecure-trust-all-certificates': true,
         ]
         EmbeddedServer server = ApplicationContext.run(EmbeddedServer, cfg)
         def client = server.applicationContext.createBean(HttpClient, server.URI).toBlocking()
@@ -67,15 +71,23 @@ class RequestDecompressionConfigSpec extends Specification {
         server.stop()
 
         where:
-        contentEncoding            | compressor
-        HttpHeaderValues.GZIP      | ZlibWrapper.GZIP
-        HttpHeaderValues.X_GZIP    | ZlibWrapper.GZIP
+        contentEncoding            | compressor               | http2
+        HttpHeaderValues.GZIP      | ZlibWrapper.GZIP         | false
+        HttpHeaderValues.X_GZIP    | ZlibWrapper.GZIP         | false
         // deflate can mean raw (NONE) or zlib wrapper; ensure both do not get decompressed by server
-        HttpHeaderValues.DEFLATE   | ZlibWrapper.NONE
-        HttpHeaderValues.X_DEFLATE | ZlibWrapper.NONE
-        HttpHeaderValues.DEFLATE   | ZlibWrapper.ZLIB
-        HttpHeaderValues.X_DEFLATE | ZlibWrapper.ZLIB
-        HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder()
+        HttpHeaderValues.DEFLATE   | ZlibWrapper.NONE         | false
+        HttpHeaderValues.X_DEFLATE | ZlibWrapper.NONE         | false
+        HttpHeaderValues.DEFLATE   | ZlibWrapper.ZLIB         | false
+        HttpHeaderValues.X_DEFLATE | ZlibWrapper.ZLIB         | false
+        HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder() | false
+        HttpHeaderValues.GZIP      | ZlibWrapper.GZIP         | true
+        HttpHeaderValues.X_GZIP    | ZlibWrapper.GZIP         | true
+        // deflate can mean raw (NONE) or zlib wrapper; ensure both do not get decompressed by server
+        HttpHeaderValues.DEFLATE   | ZlibWrapper.NONE         | true
+        HttpHeaderValues.X_DEFLATE | ZlibWrapper.NONE         | true
+        HttpHeaderValues.DEFLATE   | ZlibWrapper.ZLIB         | true
+        HttpHeaderValues.X_DEFLATE | ZlibWrapper.ZLIB         | true
+        HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder() | true
     }
 
     @Requires(property = "spec.name", value = "RequestDecompressionConfigSpec")