Merge branch 'main' into ratelimiting_exact_policy

apache · Dec 16, 2024 · 29c58d0 · 29c58d0
2 parents d0748d6 + f73db90
commit 29c58d0
Show file tree

Hide file tree

Showing 28 changed files with 1,046 additions and 167 deletions.
diff --git a/build.properties.default b/build.properties.default
@@ -84,8 +84,13 @@ java.net.preferIPv4Stack=false
 # MacOS requires non-default settings to test FFM with OpenSSL. Eg:
 #openssl.ffm.1=-Dorg.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY=true
 #openssl.ffm.2=-Dorg.apache.tomcat.util.openssl.LIBRARY_NAME=ssl
+# Allows loading the crypto library using the JVM and the given name
+# if using org.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY
+# (otherwise it is loaded later by ssl)
+#openssl.ffm.3=-Dorg.apache.tomcat.util.openssl.CRYPTO_LIBRARY_NAME=crypto
 openssl.ffm.1=-DNoop1
 openssl.ffm.2=-DNoop2
+openssl.ffm.3=-DNoop3
 
 
 # ----- Release build settings -----

diff --git a/build.xml b/build.xml
@@ -2059,6 +2059,7 @@
           <!-- These are managed as jvmargs rather than sysproperty because the default varies by OS -->
           <jvmarg value="${openssl.ffm.1}" />
           <jvmarg value="${openssl.ffm.2}" />
+          <jvmarg value="${openssl.ffm.3}" />
 
           <classpath refid="tomcat.test.classpath" />
 

diff --git a/conf/web.xml b/conf/web.xml
@@ -108,11 +108,11 @@
   <!--                       listings is enabled? [true]                    -->
   <!--                                                                      -->
   <!--   allowPartialPut     Should the server treat an HTTP PUT request    -->
-  <!--                       with a Range header as a partial PUT? Note     -->
-  <!--                       that while RFC 7233 clarified that Range       -->
-  <!--                       headers only valid for GET requests, RFC 9110  -->
-  <!--                       (which obsoletes RFC 7233) now allows partial  -->
-  <!--                       puts. [true]                                   -->
+  <!--                       with a Content-Range header as a partial PUT?  -->
+  <!--                       Note that while RFC 7231 clarified that such a -->
+  <!--                       PUT with a Content-Range header field is a bad -->
+  <!--                       request, RFC 9110 (which obsoletes RFC 7231)   -->
+  <!--                       now allows partial PUT. [true]                 -->
   <!--                                                                      -->
   <!--   directoryRedirectStatusCode                                        -->
   <!--                       Status code to use for directory redirects.    -->

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
diff --git a/java/org/apache/catalina/startup/ExpandWar.java b/java/org/apache/catalina/startup/ExpandWar.java
@@ -83,7 +83,8 @@ public static String expand(Host host, URL war, String pathname) throws IOExcept
         File warTracker = new File(host.getAppBaseFile(), pathname + Constants.WarTracker);
         long warLastModified = -1;
 
-        try (InputStream is = jfuc.getInputStream()) {
+        try (@SuppressWarnings("unused")
+        InputStream is = jfuc.getInputStream()) {
             // Get the last modified time for the WAR
             warLastModified = jfuc.getLastModified();
         }

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
@@ -1655,7 +1655,7 @@ protected void check() {
      */
     public void check(String name) {
         synchronized (host) {
-            if (!((Lifecycle) host).getState().isAvailable()) {
+            if (!host.getState().isAvailable()) {
                 return;
             }
             if (tryAddServiced(name)) {

diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -92,6 +92,10 @@ final void set(Setting setting, long value) throws T {
             case NO_RFC7540_PRIORITIES:
                 validateNoRfc7540Priorities(value);
                 break;
+            case ENABLE_CONNECT_PROTOCOL:
+            case TLS_RENEG_PERMITTED:
+                // Not supported. Ignore it.
+                return;
             case UNKNOWN:
                 // Unrecognised. Ignore it.
                 return;

diff --git a/java/org/apache/coyote/http2/Setting.java b/java/org/apache/coyote/http2/Setting.java
@@ -23,7 +23,9 @@ enum Setting {
     INITIAL_WINDOW_SIZE(4),
     MAX_FRAME_SIZE(5),
     MAX_HEADER_LIST_SIZE(6),
+    ENABLE_CONNECT_PROTOCOL(8),
     NO_RFC7540_PRIORITIES(9),
+    TLS_RENEG_PERMITTED(10),
     UNKNOWN(Integer.MAX_VALUE);
 
     private final int id;
@@ -61,9 +63,15 @@ static Setting valueOf(int i) {
             case 6: {
                 return MAX_HEADER_LIST_SIZE;
             }
+            case 8: {
+                return ENABLE_CONNECT_PROTOCOL;
+            }
             case 9: {
                 return NO_RFC7540_PRIORITIES;
             }
+            case 10: {
+                return TLS_RENEG_PERMITTED;
+            }
             default: {
                 return UNKNOWN;
             }

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -334,7 +334,8 @@ public URL getResource(String path) throws MalformedURLException {
         try {
             URI uri = new URI(myResourceBaseURL.toExternalForm() + path);
             url = uri.toURL();
-            try (InputStream is = url.openStream()) {
+            try (@SuppressWarnings("unused")
+            InputStream is = url.openStream()) {
             }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);

diff --git a/java/org/apache/juli/OneLineFormatter.java b/java/org/apache/juli/OneLineFormatter.java
@@ -24,7 +24,6 @@
 import java.lang.management.ThreadMXBean;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.logging.Formatter;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -253,7 +252,7 @@ private static class ThreadNameCache extends LinkedHashMap<Long, String> {
         }
 
         @Override
-        protected boolean removeEldestEntry(Entry<Long, String> eldest) {
+        protected boolean removeEldestEntry(Map.Entry<Long, String> eldest) {
             return (size() > cacheSize);
         }
     }

diff --git a/java/org/apache/tomcat/util/buf/ByteBufferUtils.java b/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
@@ -94,6 +94,10 @@ public static ByteBuffer expand(ByteBuffer in, int newSize) {
         return out;
     }
 
+    /**
+     * Clean specified direct buffer. This will cause an unavoidable warning on Java 24 and newer.
+     * @param buf the buffer to clean
+     */
     public static void cleanDirectBuffer(ByteBuffer buf) {
         if (invokeCleanerMethod != null) {
             try {

diff --git a/java/org/apache/tomcat/util/http/parser/EntityTag.java b/java/org/apache/tomcat/util/http/parser/EntityTag.java
@@ -35,17 +35,20 @@ public class EntityTag {
      */
     public static Boolean compareEntityTag(StringReader input, boolean compareWeak, String resourceETag)
             throws IOException {
+
+        Boolean result = Boolean.FALSE;
+
         // The resourceETag may be weak so to do weak comparison remove /W
         // before comparison
         String comparisonETag;
-        if (compareWeak && resourceETag.startsWith("W/")) {
+        if (resourceETag == null) {
+            comparisonETag = null;
+        } else if (compareWeak && resourceETag.startsWith("W/")) {
             comparisonETag = resourceETag.substring(2);
         } else {
             comparisonETag = resourceETag;
         }
 
-        Boolean result = Boolean.FALSE;
-
         while (true) {
             boolean strong = false;
             HttpParser.skipLws(input);
@@ -71,7 +74,7 @@ public static Boolean compareEntityTag(StringReader input, boolean compareWeak,
             }
 
             if (strong || compareWeak) {
-                if (comparisonETag.equals(value)) {
+                if (value.equals(comparisonETag)) {
                     result = Boolean.TRUE;
                 }
             }

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1702,7 +1702,7 @@ protected void doRun() {
             } catch (Throwable t) {
                 log.error(sm.getString("endpoint.processing.fail"), t);
                 if (socketWrapper != null) {
-                    ((Nio2SocketWrapper) socketWrapper).close();
+                    socketWrapper.close();
                 }
             } finally {
                 if (launch) {

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java b/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -35,8 +35,10 @@ public class openssl_h {
     /*
      * On Mac OS SymbolLookup.libraryLookup() appears to ignore java.library.path which means the LibreSSL
      * library will be found which will then fail. Therefore, skip that lookup on Mac OS.
+     * On other platforms this can also be used to give more flexibility when testing.
      */
     public static final boolean USE_SYSTEM_LOAD_LIBRARY = Boolean.getBoolean("org.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY");
+    public static final String CRYPTO_LIBRARY_NAME = System.getProperty("org.apache.tomcat.util.openssl.CRYPTO_LIBRARY_NAME");
     public static final String LIBRARY_NAME = System.getProperty("org.apache.tomcat.util.openssl.LIBRARY_NAME",
             (JrePlatform.IS_MAC_OS) ? "ssl.48" : "ssl");
 
@@ -61,6 +63,9 @@ public class openssl_h {
     static final SymbolLookup SYMBOL_LOOKUP;
     static {
         if (USE_SYSTEM_LOAD_LIBRARY) {
+            if (CRYPTO_LIBRARY_NAME != null) {
+                System.loadLibrary(CRYPTO_LIBRARY_NAME);
+            }
             System.loadLibrary(LIBRARY_NAME);
             SYMBOL_LOOKUP = SymbolLookup.loaderLookup().or(Linker.nativeLinker().defaultLookup());
         } else {

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
     <name>Apache CXF for Apache Tomcat CDI</name>
     <description>Apache CXF packaged for Apache Tomcat CDI</description>
     <!-- This is the Apache CXF version -->
-    <version>4.0.4</version>
+    <version>4.1.0</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -146,6 +146,12 @@
                                         <exclude>META-INF/services/jakarta.enterprise.inject.spi.Extension</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    <artifact>org.apache.cxf:cxf-integration-cdi</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/beans.xml</exclude>
+                                    </excludes>
+                                </filter>
                                 <filter>
 						            <artifact>*:*</artifact>
 						            <excludes>

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
@@ -108,7 +108,8 @@ public void run() {
                 @Override
                 public void run() {
                     // Expected to fail
-                    try (Connection c = ds.getConnection()) {
+                    try (@SuppressWarnings("unused")
+                    Connection c = ds.getConnection()) {
                     } catch (Exception e) {
                         System.err.println("Step 2:"+e.getMessage());
                     }

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
@@ -34,7 +34,8 @@ public void testDefaultAbandon() throws Exception {
         this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
         this.datasource.getPoolProperties().setRemoveAbandoned(true);
         this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
-        try (Connection con = datasource.getConnection()) {
+        try (@SuppressWarnings("unused")
+        Connection con = datasource.getConnection()) {
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());
             Thread.sleep(2000);
             Assert.assertEquals("Number of connections active/busy should be 0",0,datasource.getPool().getActive());
@@ -51,7 +52,8 @@ public void testMaxedOutAbandon() throws Exception {
         this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
         this.datasource.getPoolProperties().setRemoveAbandoned(true);
         this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
-        try (Connection con = datasource.getConnection()) {
+        try (@SuppressWarnings("unused")
+        Connection con = datasource.getConnection()) {
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());
             Thread.sleep(2000);
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
@@ -22,8 +22,6 @@
 
 import org.junit.Test;
 
-import org.apache.tomcat.jdbc.pool.DataSourceProxy;
-
 public class Async0IdleTestBug50477 extends DefaultTestCase {
 
     @Test
@@ -33,7 +31,7 @@ public void testAsync0Idle0Size() throws Exception {
         this.datasource.getPoolProperties().setFairQueue(true);
         this.datasource.getPoolProperties().setInitialSize(0);
         try {
-            Future<Connection> cf = ((DataSourceProxy)datasource).getConnectionAsync();
+            Future<Connection> cf = datasource.getConnectionAsync();
             cf.get(5, TimeUnit.SECONDS);
         }finally {
             tearDown();

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
@@ -32,7 +32,8 @@ public class TestException extends DefaultTestCase {
     public void testException() throws Exception {
         datasource.getPoolProperties().setJdbcInterceptors(TestInterceptor.class.getName());
         Connection con = datasource.getConnection();
-        try (Statement s = con.createStatement()){
+        try (@SuppressWarnings("unused")
+        Statement s = con.createStatement()){
         } catch (Exception x) {
             Assert.fail();
         }

diff --git a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
@@ -97,9 +97,9 @@ public static Collection<Object[]> parameters() {
         // Valid
         parameterSets.add(new Object[] {
                 "bytes=0-9", lastModified, Integer.valueOf(206), "10", "0-9/" + len });
-        // Nonsense date (return whole entity)
+        // Nonsense data (request rejected)
         parameterSets.add(new Object[] {
-                "bytes=0-9", "a-b-c", Integer.valueOf(200), strLen, ""});
+                "bytes=0-9", "a-b-c", Integer.valueOf(400), null, ""});
         // Different date (return whole entity)
         parameterSets.add(new Object[] {
                 "bytes=0-9", FastHttpDateFormat.formatDate(1000), Integer.valueOf(200), strLen, ""});