Add negotiation tests

Author: Long9725

java/org/apache/coyote/http11/Http11Processor.java

@@ -47,6 +47,7 @@
 import org.apache.coyote.http11.filters.SavedRequestInputFilter;
 import org.apache.coyote.http11.filters.VoidInputFilter;
 import org.apache.coyote.http11.filters.VoidOutputFilter;
+import org.apache.coyote.http11.filters.OutputFilterFactory;
 import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
 import org.apache.coyote.http11.upgrade.UpgradeApplicationBufferHandler;
 import org.apache.juli.logging.Log;
@@ -881,9 +882,9 @@ protected final void prepareResponse() throws IOException {
         }
 
         // Check for compression
-        boolean useCompression = false;
+        OutputFilterFactory compressionFactory = null;
         if (entityBody && sendfileData == null) {
-            useCompression = protocol.useCompression(request, response);
+            compressionFactory = protocol.useCompression(request, response);
         }
 
         MimeHeaders headers = response.getMimeHeaders();
@@ -929,8 +930,9 @@ protected final void prepareResponse() throws IOException {
             }
         }
 
-        if (useCompression) {
-            outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]);
+        if (compressionFactory != null) {
+            // Add the negotiated compression filter
+            outputBuffer.addActiveFilter(compressionFactory.createFilter());
         }
 
         // Add date header unless application has already set one (e.g. in a

test/org/apache/coyote/TestCompressionConfig.java

@@ -153,20 +153,6 @@ public void testGzipOutputFilterFactoryJavaBeanProperties() {
         Assert.assertTrue(filter instanceof GzipOutputFilter);
     }
 
-    @Test
-    public void testNoCompressionEncodings() {
-        CompressionConfig config = new CompressionConfig();
-        String encodings = config.getNoCompressionEncodings();
-        Assert.assertTrue(Arrays.asList("br", "compress", "dcb", "dcz", "deflate", "gzip", "pack200-gzip", "zstd")
-            .stream()
-            .anyMatch(encodings::contains));
-
-        config.setNoCompressionEncodings("br");
-        String newEncodings = config.getNoCompressionEncodings();
-        Assert.assertTrue(newEncodings.contains("br"));
-        Assert.assertFalse(newEncodings.contains("gzip"));
-    }
-
     @Test
     public void testNegotiationQualityFactor() {
         CompressionConfig config = new CompressionConfig();
@@ -190,7 +176,7 @@ public String getEncodingName() {
         // Client prefers deflate over gzip
         Request request = new Request();
         Response response = new Response();
-        request.getMimeHeaders().addValue("accept-encoding").setString("gzip;q=0.5, defalte;q=1.0");
+        request.getMimeHeaders().addValue("accept-encoding").setString("gzip;q=0.5, deflate;q=1.0");
 
         OutputFilterFactory result = config.useCompression(request, response, factories);
         Assert.assertNotNull(result);
@@ -281,4 +267,69 @@ public void testNegotiationQZero() {
         OutputFilterFactory result = config.useCompression(request, response, factories);
         Assert.assertNull(result);
     }
+
+    @Test
+    public void testCompressionOff() {
+        CompressionConfig config = new CompressionConfig();
+        // Default compression is "off"
+
+        Request request = new Request();
+        Response response = new Response();
+        request.getMimeHeaders().addValue("accept-encoding").setString("gzip");
+
+        List<OutputFilterFactory> factories = new ArrayList<>();
+        factories.add(new GzipOutputFilterFactory());
+        OutputFilterFactory result = config.useCompression(request, response, factories);
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testAlreadyCompressedContentEncoding() {
+        CompressionConfig config = new CompressionConfig();
+        config.setCompression("force");
+
+        Request request = new Request();
+        Response response = new Response();
+        request.getMimeHeaders().addValue("accept-encoding").setString("gzip");
+        // Response already has gzip Content-Encoding - should skip compression
+        response.getMimeHeaders().addValue("content-encoding").setString("gzip");
+
+        List<OutputFilterFactory> factories = new ArrayList<>();
+        factories.add(new GzipOutputFilterFactory());
+        OutputFilterFactory result = config.useCompression(request, response, factories);
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testTENegotiationWithFactories() {
+        CompressionConfig config = new CompressionConfig();
+        config.setCompression("force");
+
+        OutputFilterFactory deflateFactory = new OutputFilterFactory() {
+
+            public OutputFilter createFilter() {
+                return new GzipOutputFilter();
+            }
+
+            public String getEncodingName() {
+                return "deflate";
+            }
+        };
+
+        List<OutputFilterFactory> factories = new ArrayList<>();
+        factories.add(new GzipOutputFilterFactory());
+        factories.add(deflateFactory);
+
+        // TE header should use Transfer-Encoding, not Content-Encoding
+        Request request = new Request();
+        Response response = new Response();
+        request.getMimeHeaders().addValue("TE").setString("deflate;q=1.0, gzip;q=0.5");
+
+        OutputFilterFactory result = config.useCompression(request, response, factories);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("deflate", result.getEncodingName());
+        // TE negotiation sets Transfer-Encoding, not Content-Encoding
+        Assert.assertEquals("deflate", response.getMimeHeaders().getHeader("Transfer-Encoding"));
+        Assert.assertNull(response.getMimeHeaders().getValue("Content-Encoding"));
+    }
 }

test/org/apache/coyote/http11/TestHttp11Processor.java

@@ -2152,81 +2152,6 @@ public void testEarlyHintsSendErrorWithMessage() throws Exception {
         Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
     }
 
-    @Test
-    public void testGzipLevel() {
-        Http11NioProtocol protocol = new Http11NioProtocol();
-
-        Assert.assertEquals(-1, protocol.getGzipLevel());
-
-        protocol.setGzipLevel(Deflater.BEST_SPEED);
-        Assert.assertEquals(Deflater.BEST_SPEED, protocol.getGzipLevel());
-
-        protocol.setGzipLevel(Deflater.BEST_COMPRESSION);
-        Assert.assertEquals(Deflater.BEST_COMPRESSION, protocol.getGzipLevel());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testInvalidGzipLevelLow() {
-        new Http11NioProtocol().setGzipLevel(-2);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testInvalidGzipLevelHigh() {
-        new Http11NioProtocol().setGzipLevel(10);
-    }
-
-    @Test
-    public void testGzipBufferSize() {
-        Http11NioProtocol protocol = new Http11NioProtocol();
-
-        Assert.assertEquals(512, protocol.getGzipBufferSize());
-
-        protocol.setGzipBufferSize(1024);
-        Assert.assertEquals(1024, protocol.getGzipBufferSize());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testInvalidGzipBufferSize() {
-        new Http11NioProtocol().setGzipBufferSize(0);
-    }
-
-    @Test
-    public void testOutputFilterFactory() {
-        Http11NioProtocol protocol = new Http11NioProtocol();
-
-        // Test default factory is GzipOutputFilterFactory
-        Assert.assertNotNull(protocol.getOutputFilterFactory());
-        Assert.assertTrue(protocol.getOutputFilterFactory() instanceof GzipOutputFilterFactory);
-
-        protocol.setOutputFilterFactory(new MockOutputFilterFactory());
-        Assert.assertNotNull(protocol.getOutputFilterFactory());
-        Assert.assertTrue(protocol.getOutputFilterFactory() instanceof MockOutputFilterFactory);
-    }
-
-    @Test
-    public void testOutputFilterFactoryClassName() {
-        Http11NioProtocol protocol = new Http11NioProtocol();
-
-        protocol.setOutputFilterFactory(MockOutputFilterFactory.class.getName());
-        Assert.assertNotNull(protocol.getOutputFilterFactory());
-        Assert.assertTrue(protocol.getOutputFilterFactory() instanceof MockOutputFilterFactory);
-    }
-
-    @Test
-    public void testNoCompressionEncodings() {
-        Http11NioProtocol protocol = new Http11NioProtocol();
-        String encodings = protocol.getNoCompressionEncodings();
-        Assert.assertTrue(Arrays.asList("br", "compress", "dcb", "dcz", "deflate", "gzip", "pack200-gzip", "zstd")
-            .stream()
-            .anyMatch(encodings::contains));
-
-        protocol.setNoCompressionEncodings("br");
-
-        String newEncodings = protocol.getNoCompressionEncodings();
-        Assert.assertTrue(newEncodings.contains("br"));
-        Assert.assertFalse(newEncodings.contains("gzip"));
-    }
-
     @Test
     public void testDefaultAutoRegistration() {
         Http11NioProtocol protocol = new Http11NioProtocol();