Make sure that the port is accessible

Author: thijslemmens

tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/share/tomcat/ShareTomcatFactoryHelper.java

@@ -57,15 +57,17 @@ private static String replaceWithEnvironmentVariables(String input, ShareConfigu
         while (matcher.find()) {
             String match = matcher.group();
             String envProp = match.substring(2, match.length() - 1);
-            String replacement = match; // default replacement is the match itself
+            String replacement;
 
             if (!envProp.isEmpty()) {
                 String env = shareConfiguration.getValueOf(envProp);
                 if (env != null && !env.isEmpty()) {
                     replacement = env; // use the environment variable value as replacement
                 } else {
-                    replacement = "\\$\\{" + match.substring(2);
+                    replacement = match; // retain original pattern
                 }
+            } else {
+                replacement = match; // retain original pattern if envProp is empty
             }
 
             matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
@@ -74,4 +76,5 @@ private static String replaceWithEnvironmentVariables(String input, ShareConfigu
 
         return result.toString();
     }
+
 }

tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/tomcat/TomcatFactory.java

@@ -11,13 +11,16 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Stream;
+import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Service;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.coyote.http11.Http11Protocol;
 import org.apache.naming.resources.VirtualDirContext;
 
 public class TomcatFactory {
@@ -51,10 +54,12 @@ private TomcatConfiguration getConfiguration() {
 
     public Tomcat getTomcat() throws IOException {
         Tomcat tomcat = new Tomcat();
+        Host host = tomcat.getHost();
+        host.setName("localhost");
         tomcat.setBaseDir(getConfiguration().getTomcatBaseDir());
         tomcat.setPort(getConfiguration().getTomcatPort());
         tomcat.getServer().setPort(getConfiguration().getTomcatServerPort());
-        createDefaultConnector(tomcat);
+        configureDefaultConnector(tomcat);
         addUserWithRole(tomcat, "CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repoclient");
         addUserWithRole(tomcat, "CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repository");
         Path webapps = Paths.get(getConfiguration().getWebappsPath());
@@ -121,19 +126,15 @@ private void addWebapp(Tomcat tomcat, Path path) {
         }
     }
 
-    private void createDefaultConnector(Tomcat tomcat) {
-        Connector connector = getConnector(tomcat,
-                "HTTP/1.1",
-                getConfiguration().getTomcatPort(),
-                false,
-                "http",
-                getConfiguration().getTomcatMaxThreads(),
-                getConfiguration().getTomcatMaxHttpHeaderSize(),
-                getConfiguration().getTomcatRelaxedPathChars(),
-                getConfiguration().getTomcatRelaxedQueryChars()
-        );
-        connector.setRedirectPort(getConfiguration().getTomcatSslPort());
-        tomcat.setConnector(connector);
+    private void configureDefaultConnector(Tomcat tomcat) {
+        Connector connector = tomcat.getConnector();
+        connector.setProperty("connectionTimeout", "240000");
+        connector.setURIEncoding(StandardCharsets.UTF_8.name());
+        Http11Protocol protocol = (Http11Protocol) connector.getProtocolHandler();
+        protocol.setMaxThreads(getConfiguration().getTomcatMaxThreads());
+        protocol.setMaxHttpHeaderSize(getConfiguration().getTomcatMaxHttpHeaderSize());
+        protocol.setRelaxedPathChars(getConfiguration().getTomcatRelaxedPathChars());
+        protocol.setRelaxedQueryChars(getConfiguration().getTomcatRelaxedQueryChars());
     }
 
     private void addUserWithRole(Tomcat tomcat, String username, String password, String role) {

tomcat-base/src/shared/test/java/eu/xenit/alfresco/tomcat/embedded/tomcat/TomcatFactoryTest.java

@@ -0,0 +1,58 @@
+package eu.xenit.alfresco.tomcat.embedded.tomcat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import eu.xenit.alfresco.tomcat.embedded.config.DefaultConfigurationProvider;
+import eu.xenit.alfresco.tomcat.embedded.config.TomcatConfiguration;
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.http11.Http11Protocol;
+import org.junit.jupiter.api.Test;
+
+public class TomcatFactoryTest {
+
+    @Test
+    void testConnection() throws LifecycleException, IOException {
+        TomcatConfiguration configuration = new DefaultConfigurationProvider().getConfiguration();
+        String resourcePath = "emptywebapps";
+        URL resourceUrl = getClass().getClassLoader().getResource(resourcePath);
+
+        if (resourceUrl == null) {
+            throw new IllegalStateException("Resource not found: " + resourcePath);
+        }
+
+        // Convert URL to a File object and get the absolute path
+        String webappsPath = new File(resourceUrl.getFile()).getAbsolutePath();
+        configuration.setWebappsPath(webappsPath);
+        TomcatFactory tomcatFactory = new TomcatFactory(configuration);
+        Tomcat tomcat = tomcatFactory.getTomcat();
+        try {
+            tomcat.start();
+
+            // URL pointing to your Tomcat server
+            URL url = new URL("http://localhost:8080");
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+
+            // Check if response code is 404
+            int responseCode = connection.getResponseCode();
+            assertEquals(404, responseCode);
+
+            connection.disconnect();
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail("Exception occurred: " + e.getMessage());
+        } finally {
+            // Ensure Tomcat is stopped even if an exception occurs
+            tomcat.stop();
+        }
+    }
+}