This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
commit 8f696bed27f0fbcfc63d05c1771c9fbdd2d275ac Author: Mark Thomas <[email protected]> AuthorDate: Tue Jan 27 10:10:55 2026 +0000 Disable secretRequired for all instances of the AJP connector Set property in consistent manner to other properties --- .../maven/plugin/tomcat7/run/AbstractRunMojo.java | 11 +++++----- .../apache/tomcat/maven/runner/Tomcat7Runner.java | 25 +++++++++++----------- .../maven/plugin/tomcat8/run/AbstractRunMojo.java | 1 + .../apache/tomcat/maven/runner/Tomcat8Runner.java | 1 + 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java index c195e30..7509faf 100644 --- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java +++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java @@ -33,7 +33,6 @@ import org.apache.catalina.startup.Tomcat; import org.apache.catalina.valves.AccessLogValve; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.apache.coyote.ajp.AbstractAjpProtocol; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -727,10 +726,10 @@ public abstract class AbstractRunMojo // https://issues.apache.org/jira/browse/MTOMCAT-255 if(context instanceof StandardContext) - { - ((StandardContext) context).setAddWebinfClassesResources(true); - ((StandardContext) context).setAliases( "/WEB-INF/classes=" + project.getBuild().getOutputDirectory()); - } + { + ((StandardContext) context).setAddWebinfClassesResources(true); + ((StandardContext) context).setAliases( "/WEB-INF/classes=" + project.getBuild().getOutputDirectory()); + } return context; @@ -1233,7 +1232,7 @@ public abstract class AbstractRunMojo { ajpConnector.setAttribute( "address", address ); } - ((AbstractAjpProtocol<?>) ajpConnector.getProtocolHandler()).setSecretRequired(false); + ajpConnector.setProperty("secretRequired", "false"); embeddedTomcat.getEngine().getService().addConnector( ajpConnector ); } diff --git a/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java b/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java index 59adea2..994bf9b 100644 --- a/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java +++ b/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java @@ -71,7 +71,7 @@ public class Tomcat7Runner public static final String ENABLE_NAMING_KEY = "enableNaming"; public static final String ENABLE_REMOTE_IP_VALVE = "enableRemoteIpValve"; - + public static final String ACCESS_LOG_VALVE_FORMAT_KEY = "accessLogValveFormat"; public static final String CODE_SOURCE_CONTEXT_PATH = "codeSourceContextPath"; @@ -114,7 +114,7 @@ public class Tomcat7Runner public String extractDirectory = ".extract"; public File extractDirectoryFile; - + public String sessionManagerFactoryClassName = null; public String codeSourceContextPath = null; @@ -280,7 +280,7 @@ public class Tomcat7Runner { host.addChild( ctx ); } - + if (sessionManagerFactoryClassName != null) { boolean cookies = true; constructSessionManager(ctx, sessionManagerFactoryClassName, cookies); @@ -333,15 +333,15 @@ public class Tomcat7Runner tomcat.setConnector( connector ); } - boolean enableRemoteIpValve = + boolean enableRemoteIpValve = Boolean.parseBoolean(runtimeProperties.getProperty( Tomcat7Runner.ENABLE_REMOTE_IP_VALVE, Boolean.TRUE.toString())); - + if (enableRemoteIpValve) { debugMessage("Adding RemoteIpValve"); RemoteIpValve riv = new RemoteIpValve(); tomcat.getHost().getPipeline().addValve(riv); } - + // add a default access log valve AccessLogValve alv = new AccessLogValve(); alv.setDirectory( new File( extractDirectory, "logs" ).getAbsolutePath() ); @@ -403,6 +403,7 @@ public class Tomcat7Runner Connector ajpConnector = new Connector( "org.apache.coyote.ajp.AjpProtocol" ); ajpConnector.setPort( ajpPort ); ajpConnector.setURIEncoding( uriEncoding ); + ajpConnector.setProperty("secretRequired", "false"); tomcat.getService().addConnector( ajpConnector ); } @@ -483,26 +484,26 @@ public class Tomcat7Runner } } } - + private void constructSessionManager(Context ctx, String sessionManagerFactoryClassName, boolean cookies) { try { debugMessage("Constructing session manager with factory " + sessionManagerFactoryClassName); Class sessionManagerClass = Class.forName(sessionManagerFactoryClassName); - + Object managerFactory = (Object) sessionManagerClass.newInstance(); - + Method method = managerFactory.getClass().getMethod("createSessionManager"); if (method != null) { Manager manager = (Manager) method.invoke(managerFactory, null); - + ctx.setManager(manager); ctx.setCookies(cookies); - + } else { System.out.print(sessionManagerFactoryClassName + " does not have a method createSessionManager()"); } } catch (Exception e) { - System.err.println("Unable to construct specified session manager '" + + System.err.println("Unable to construct specified session manager '" + sessionManagerFactoryClassName + "': " + e.getLocalizedMessage()); e.printStackTrace(); } diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java index 225b3f7..7171fe4 100644 --- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java +++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java @@ -1303,6 +1303,7 @@ public abstract class AbstractRunMojo { ajpConnector.setAttribute( "address", address ); } + ajpConnector.setProperty("secretRequired", "false"); embeddedTomcat.getEngine().getService().addConnector( ajpConnector ); } diff --git a/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java b/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java index 48f7ffd..39ddcb5 100644 --- a/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java +++ b/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java @@ -372,6 +372,7 @@ public class Tomcat8Runner Connector ajpConnector = new Connector( "org.apache.coyote.ajp.AjpProtocol" ); ajpConnector.setPort( ajpPort ); ajpConnector.setURIEncoding( uriEncoding ); + ajpConnector.setProperty("secretRequired", "false"); tomcat.getService().addConnector( ajpConnector ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
