This is an automated email from the ASF dual-hosted git repository.
csutherl pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e900745ed0 Add tests to verify Tomcat functions without clustering
JARs (#1038)
e900745ed0 is described below
commit e900745ed04ce81c462d14931c9009519a90448b
Author: Coty Sutherland <[email protected]>
AuthorDate: Wed Aug 12 08:49:31 2026 -0400
Add tests to verify Tomcat functions without clustering JARs (#1038)
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../catalina/startup/TestWithoutClustering.java | 447 +++++++++++++++++++++
1 file changed, 447 insertions(+)
diff --git a/test/org/apache/catalina/startup/TestWithoutClustering.java
b/test/org/apache/catalina/startup/TestWithoutClustering.java
new file mode 100644
index 0000000000..9d09502030
--- /dev/null
+++ b/test/org/apache/catalina/startup/TestWithoutClustering.java
@@ -0,0 +1,447 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.startup;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+import org.apache.catalina.Context;
+import org.apache.catalina.authenticator.TestBasicAuthParser.BasicAuthHeader;
+import org.apache.catalina.filters.Constants;
+
+/**
+ * Tests that verify Tomcat functions correctly without clustering JARs
+ * (catalina-ha.jar and catalina-tribes.jar). Uses a filtering classloader
+ * on the webapp/engine to hide clustering packages from the components
+ * under test.
+ */
+public class TestWithoutClustering extends TomcatBaseTest {
+
+ private static void assertClusteringNotAvailable(ClassLoader cl) {
+ Assert.assertThrows(ClassNotFoundException.class,
+ () -> cl.loadClass(
+ "org.apache.catalina.ha.CatalinaCluster"));
+ Assert.assertThrows(ClassNotFoundException.class,
+ () -> cl.loadClass(
+ "org.apache.catalina.tribes.Channel"));
+ }
+
+ /**
+ * Verify that Tomcat starts up and serves requests when clustering
+ * classes are not available.
+ */
+ @Test
+ public void testTomcatStartsWithoutClustering() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+ tomcat.setAddDefaultWebXmlToWebapp(false);
+ ClassLoader noClusteringCL =
+ new NoClusteringClassLoader(getClass().getClassLoader());
+ assertClusteringNotAvailable(noClusteringCL);
+ tomcat.getEngine().setParentClassLoader(noClusteringCL);
+
+ Context ctx = tomcat.addContext("", null);
+ Tomcat.addServlet(ctx, "default",
+ new org.apache.catalina.servlets.DefaultServlet());
+ ctx.addServletMapping("/", "default");
+
+ tomcat.start();
+
+ SimpleHttpClient client = new SimpleHttpClient() {
+ @Override
+ public boolean isResponseBodyOK() {
+ return true;
+ }
+ };
+ client.setPort(getPort());
+
+ // @formatter:off
+ client.setRequest(new String[] {
+ "GET / HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: Close" + CRLF +
+ CRLF
+ });
+ // @formatter:on
+ client.connect();
+ client.processRequest(true);
+ // DefaultServlet returns 404 for root with no welcome file, but the
+ // key assertion is that Tomcat started successfully and can serve
+ // requests - it did not fail during startup due to missing clustering.
+ Assert.assertTrue("Server should respond, got: " +
+ client.getStatusCode(),
+ client.getStatusCode() == HttpServletResponse.SC_OK ||
+ client.getStatusCode() ==
+ HttpServletResponse.SC_NOT_FOUND);
+
+ Assert.assertNull("No cluster should be configured",
+ tomcat.getEngine().getCluster());
+ }
+
+ /**
+ * Verify that a servlet running inside a web application cannot load
+ * clustering classes via the webapp classloader.
+ */
+ @Test
+ public void testServletCannotLoadClusteringClasses() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+ tomcat.setAddDefaultWebXmlToWebapp(false);
+ ClassLoader noClusteringCL =
+ new NoClusteringClassLoader(getClass().getClassLoader());
+ assertClusteringNotAvailable(noClusteringCL);
+ tomcat.getEngine().setParentClassLoader(noClusteringCL);
+
+ Context ctx = tomcat.addContext("", null);
+ Tomcat.addServlet(ctx, "clusterCheck",
+ new ClusteringVisibilityServlet());
+ ctx.addServletMapping("/clusterCheck", "clusterCheck");
+
+ tomcat.start();
+
+ SimpleHttpClient client = new SimpleHttpClient() {
+ @Override
+ public boolean isResponseBodyOK() {
+ return true;
+ }
+ };
+ client.setPort(getPort());
+
+ // @formatter:off
+ client.setRequest(new String[] {
+ "GET /clusterCheck HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: Close" + CRLF +
+ CRLF
+ });
+ // @formatter:on
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK,
+ client.getStatusCode());
+ String body = client.getResponseBody();
+ Assert.assertTrue(
+ "Expected NOT_FOUND for CatalinaCluster: " + body,
+ body.contains("NOT_FOUND: " +
+ "org.apache.catalina.ha.CatalinaCluster"));
+ Assert.assertTrue(
+ "Expected NOT_FOUND for Channel: " + body,
+ body.contains("NOT_FOUND: " +
+ "org.apache.catalina.tribes.Channel"));
+ Assert.assertTrue(
+ "Expected ALL_HIDDEN result: " + body,
+ body.contains("RESULT: ALL_HIDDEN"));
+ }
+
+ /**
+ * Verify that sessionsList.jsp compiles and renders when clustering
+ * classes are not available. The JSP uses reflection to load DeltaSession
+ * so it should gracefully fall back.
+ */
+ @Test
+ public void testSessionsListJspWithoutClustering() throws Exception {
+ ignoreTearDown = true;
+ Tomcat tomcat = getTomcatInstance();
+ tomcat.addUser("admin", "sekr3t");
+ tomcat.addRole("admin", "manager-gui");
+
+ File webappDir = new File(getBuildDirectory(), "webapps");
+ File appDir = new File(webappDir, "manager");
+ Context managerCtx = tomcat.addWebapp(null, "/manager",
+ appDir.getAbsolutePath());
+ ClassLoader noClusteringCL =
+ new NoClusteringClassLoader(getClass().getClassLoader());
+ assertClusteringNotAvailable(noClusteringCL);
+ managerCtx.setParentClassLoader(noClusteringCL);
+
+ Context ctx = tomcat.addContext("/testapp", null);
+ Tomcat.addServlet(ctx, "default",
+ new org.apache.catalina.servlets.DefaultServlet());
+ ctx.addServletMapping("/", "default");
+
+ tomcat.start();
+
+ SimpleHttpClient client = new SimpleHttpClient() {
+ @Override
+ public boolean isResponseBodyOK() {
+ return true;
+ }
+ };
+ client.setPort(getPort());
+ String basicHeader = (new BasicAuthHeader("Basic", "admin",
+ "sekr3t")).getHeader().toString();
+
+ // Hit the HTML manager entry point to get a session and CSRF nonce
+ // @formatter:off
+ client.setRequest(new String[] {
+ "GET /manager/html HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF +
+ CRLF
+ });
+ // @formatter:on
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+
+ String body = client.getResponseBody();
+ Pattern noncePattern = Pattern.compile(
+ Pattern.quote(Constants.CSRF_NONCE_REQUEST_PARAM)
+ + "=([A-F0-9]+)");
+ Matcher m = noncePattern.matcher(body);
+ Assert.assertTrue(
+ "CSRF nonce not found in manager HTML response", m.find());
+ String nonce = m.group(1);
+
+ String sessionCookie = null;
+ for (String header : client.getResponseHeaders()) {
+ if (header.startsWith("Set-Cookie:")) {
+ String cookieValue =
+ header.substring("Set-Cookie:".length()).trim();
+ sessionCookie = cookieValue.split(";")[0];
+ break;
+ }
+ }
+ Assert.assertNotNull("Session cookie not found", sessionCookie);
+
+ // Access sessions list page with the CSRF nonce
+ // @formatter:off
+ client.setRequest(new String[] {
+ "GET /manager/html/sessions?path=/testapp&" +
+ Constants.CSRF_NONCE_REQUEST_PARAM + "=" + nonce +
+ " HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Cookie: " + sessionCookie + CRLF +
+ "Connection: Close" + CRLF +
+ CRLF
+ });
+ // @formatter:on
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody()
+ .contains("Sessions Administration"));
+ Assert.assertTrue(client.getResponseBody()
+ .contains("active Sessions"));
+ }
+
+ /**
+ * Verify that StandardEngineSF loads without error when clustering
+ * classes are not available. The clusterValveClass field should be null.
+ */
+ @Test
+ public void testStandardEngineSFWithoutClustering() throws Exception {
+ String classDir = System.getProperty("tomcat.test.classpath",
+ "output/classes");
+
+ ClassLoader cl = new StoreConfigIsolatingClassLoader(
+ getClass().getClassLoader(), classDir);
+ assertClusteringNotAvailable(cl);
+ Class<?> engineSF = cl.loadClass(
+ "org.apache.catalina.storeconfig.StandardEngineSF");
+
+ Field f = engineSF.getDeclaredField("clusterValveClass");
+ f.setAccessible(true);
+ Assert.assertNull("clusterValveClass should be null without " +
+ "clustering classes", f.get(null));
+ }
+
+ /**
+ * Verify that StandardHostSF loads without error when clustering
+ * classes are not available. The clusterValveClass field should be null.
+ */
+ @Test
+ public void testStandardHostSFWithoutClustering() throws Exception {
+ String classDir = System.getProperty("tomcat.test.classpath",
+ "output/classes");
+
+ ClassLoader cl = new StoreConfigIsolatingClassLoader(
+ getClass().getClassLoader(), classDir);
+ assertClusteringNotAvailable(cl);
+ Class<?> hostSF = cl.loadClass(
+ "org.apache.catalina.storeconfig.StandardHostSF");
+
+ Field f = hostSF.getDeclaredField("clusterValveClass");
+ f.setAccessible(true);
+ Assert.assertNull("clusterValveClass should be null without " +
+ "clustering classes", f.get(null));
+ }
+
+ /**
+ * Verify that StoreRegistry.getInterfaces() returns only the 10
+ * core interfaces when clustering classes are not available.
+ */
+ @Test
+ public void testStoreRegistryWithoutClustering() throws Exception {
+ String classDir = System.getProperty("tomcat.test.classpath",
+ "output/classes");
+
+ ClassLoader cl = new StoreConfigIsolatingClassLoader(
+ getClass().getClassLoader(), classDir);
+ assertClusteringNotAvailable(cl);
+ Class<?> registryClass = cl.loadClass(
+ "org.apache.catalina.storeconfig.StoreRegistry");
+
+ Object registry = registryClass.getDeclaredConstructor().newInstance();
+
+ // getInterfaces() is private static, access via reflection
+ java.lang.reflect.Method getInterfaces =
+ registryClass.getDeclaredMethod("getInterfaces");
+ getInterfaces.setAccessible(true);
+ Class<?>[] result = (Class<?>[]) getInterfaces.invoke(registry);
+
+ Assert.assertEquals("Should have exactly 10 core interfaces " +
+ "when clustering is absent", 10, result.length);
+
+ for (Class<?> iface : result) {
+ Assert.assertFalse("No clustering interface should be present: " +
+ iface.getName(),
+ iface.getName().startsWith("org.apache.catalina.ha.") ||
+ iface.getName().startsWith(
+ "org.apache.catalina.tribes."));
+ }
+
+ }
+
+ /**
+ * Servlet that checks whether clustering classes are visible via the
+ * webapp classloader (TCCL). Uses the TCCL rather than Class.forName()
+ * because the servlet class itself is loaded by the system classloader
+ * which has clustering on the test classpath.
+ */
+ public static class ClusteringVisibilityServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String[] CLUSTERING_CLASSES = {
+ "org.apache.catalina.ha.CatalinaCluster",
+ "org.apache.catalina.tribes.Channel"
+ };
+
+ @Override
+ protected void doGet(HttpServletRequest req,
+ HttpServletResponse resp)
+ throws ServletException, IOException {
+ resp.setContentType("text/plain");
+ ClassLoader webappCL =
+ Thread.currentThread().getContextClassLoader();
+ StringBuilder sb = new StringBuilder();
+ boolean allHidden = true;
+ for (String className : CLUSTERING_CLASSES) {
+ try {
+ webappCL.loadClass(className);
+ sb.append("FOUND: ").append(className).append('\n');
+ allHidden = false;
+ } catch (ClassNotFoundException |
+ NoClassDefFoundError e) {
+ sb.append("NOT_FOUND: ").append(className)
+ .append('\n');
+ }
+ }
+ sb.append(allHidden ? "RESULT: ALL_HIDDEN" :
+ "RESULT: SOME_VISIBLE");
+ resp.getWriter().print(sb.toString());
+ }
+ }
+
+ /**
+ * A classloader that loads storeconfig classes in isolation (child-first)
+ * while blocking clustering packages. This causes
+ * SomeClass.class.getClassLoader() to return this classloader, so
+ * Class.forName calls in static initializers go through us.
+ */
+ private static class StoreConfigIsolatingClassLoader
+ extends ClassLoader {
+
+ private final String classDir;
+
+ StoreConfigIsolatingClassLoader(ClassLoader parent,
+ String classDir) {
+ super(parent);
+ this.classDir = classDir;
+ }
+
+ @Override
+ public Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ if (name.startsWith("org.apache.catalina.ha.") ||
+ name.startsWith("org.apache.catalina.tribes.")) {
+ throw new ClassNotFoundException(name);
+ }
+
+ // Load storeconfig classes child-first so their
+ // getClassLoader() returns this instance
+ if (name.startsWith(
+ "org.apache.catalina.storeconfig.")) {
+ Class<?> c = findLoadedClass(name);
+ if (c != null) {
+ return c;
+ }
+ String path = classDir + "/" +
+ name.replace('.', '/') + ".class";
+ try {
+ byte[] bytes = Files.readAllBytes(
+ Paths.get(path));
+ c = defineClass(name, bytes, 0, bytes.length);
+ if (resolve) {
+ resolveClass(c);
+ }
+ return c;
+ } catch (IOException e) {
+ throw new ClassNotFoundException(name, e);
+ }
+ }
+
+ return super.loadClass(name, resolve);
+ }
+ }
+
+ /**
+ * A classloader that hides clustering packages to simulate a deployment
+ * without catalina-ha.jar and catalina-tribes.jar.
+ */
+ private static class NoClusteringClassLoader extends ClassLoader {
+
+ NoClusteringClassLoader(ClassLoader parent) {
+ super(parent);
+ }
+
+ @Override
+ public Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ if (name.startsWith("org.apache.catalina.ha.") ||
+ name.startsWith("org.apache.catalina.tribes.")) {
+ throw new ClassNotFoundException(name);
+ }
+ return super.loadClass(name, resolve);
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
