DOCKER-462 Added environment variables to set tomcat context parameters AllowCasualMultipartParsing, AllowMultipleLeadingForwardSlashInPath and CrossContext

Author: kpiot123

2repository/build.gradle

@@ -120,7 +120,7 @@ subprojects {
             def composeDir = "${project.parent.projectDir}/src/integrationTest/resources";
 
             useComposeFiles = ["$composeDir/docker-compose-alfresco-minimal.yml",
-                               "$composeDir/docker-compose-solr.yml", "$composeDir/docker-compose-db.yml"];
+                               "$composeDir/docker-compose-solr.yml", "$composeDir/docker-compose-db.yml", "$composeDir/docker-compose-share.yml"];
 
             changedPorts {
                 isRequiredBy(project.tasks.integrationTestChangedPorts)

README.md

@@ -19,6 +19,9 @@ public TomcatConfiguration getConfiguration(TomcatConfiguration baseConfiguratio
         baseConfiguration.setGeneratedClasspathDir("/dev/shm/classpath");
         baseConfiguration.setSharedClasspathDir("/usr/local/tomcat/shared/classes");
         baseConfiguration.setTomcatCacheMaxSize(100000);
+        baseConfiguration.setAllowCasualMultipartParsing(false);
+        baseConfiguration.setAllowMultipleLeadingForwardSlashInPath(true);
+        baseConfiguration.setCrossContext(true);
         return baseConfiguration;
     }
 }

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

@@ -9,8 +9,11 @@
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.SHARED_CLASSPATH_DIR;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.SHARED_LIB_DIR;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.SHARE_ENABLED;
+import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING;
+import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_BASE_DIR;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_CACHE_MAX_SIZE;
+import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_CROSS_CONTEXT;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_MAX_HTTP_HEADER_SIZE;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_MAX_THREADS;
 import static eu.xenit.alfresco.tomcat.embedded.config.EnvironmentVariables.TOMCAT_PORT;
@@ -44,6 +47,9 @@ public TomcatConfiguration getConfiguration(TomcatConfiguration baseConfiguratio
         setPropertyFromEnv(ALFRESCO_ENABLED, value -> baseConfiguration.setAlfrescoEnabled(Boolean.parseBoolean(value)));
         setPropertyFromEnv(SHARE_ENABLED, value -> baseConfiguration.setShareEnabled(Boolean.parseBoolean(value)));
         setPropertyFromEnv(TOMCAT_CACHE_MAX_SIZE, value -> baseConfiguration.setTomcatCacheMaxSize(Long.parseLong(value)));
+        setPropertyFromEnv(TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING, value -> baseConfiguration.setAllowCasualMultipartParsing(Boolean.parseBoolean(value)));
+        setPropertyFromEnv(TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH, value -> baseConfiguration.setAllowMultipleLeadingForwardSlashInPath(Boolean.parseBoolean(value)));
+        setPropertyFromEnv(TOMCAT_CROSS_CONTEXT, value -> baseConfiguration.setCrossContext(Boolean.parseBoolean(value)));
         return baseConfiguration;
     }
 }

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

@@ -19,6 +19,9 @@ public class EnvironmentVariables {
     public static final String GENERATED_CLASSPATH_DIR = "GENERATED_CLASSPATH_DIR";
     public static final String SHARED_LIB_DIR = "SHARED_LIB_DIR";
     public static final String TOMCAT_CACHE_MAX_SIZE = "TOMCAT_CACHE_MAX_SIZE";
+    public static final String TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING = "TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING";
+    public static final String TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH = "TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH";
+    public static final String TOMCAT_CROSS_CONTEXT = "TOMCAT_CROSS_CONTEXT";
     private EnvironmentVariables() {
     }
 

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

@@ -28,4 +28,7 @@ public class TomcatConfiguration {
     protected boolean shareEnabled;
     protected String generatedClasspathDir;
     protected long tomcatCacheMaxSize;
+    protected boolean allowCasualMultipartParsing;
+    protected boolean allowMultipleLeadingForwardSlashInPath;
+    protected boolean crossContext;
 }

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

@@ -25,6 +25,9 @@ void testGetConfiguration() {
         expected.setGeneratedClasspathDir("/dev/shm/classpath");
         expected.setSharedClasspathDir("/usr/local/tomcat/shared/classes");
         expected.setTomcatCacheMaxSize(100000);
+        expected.setAllowCasualMultipartParsing(false);
+        expected.setAllowMultipleLeadingForwardSlashInPath(true);
+        expected.setCrossContext(true);
         assertEquals(configuration, expected);
     }
 

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

@@ -132,9 +132,9 @@ private void addWebapp(Tomcat tomcat, Path path) {
                 ctx.getAccessLog();
             }
 
-            ctx.setAllowCasualMultipartParsing(true);
-            ctx.setAllowMultipleLeadingForwardSlashInPath(true);
-            ctx.setCrossContext(true);
+            ctx.setAllowCasualMultipartParsing(getConfiguration().isAllowCasualMultipartParsing());
+            ctx.setAllowMultipleLeadingForwardSlashInPath(getConfiguration().isAllowMultipleLeadingForwardSlashInPath());
+            ctx.setCrossContext(getConfiguration().isCrossContext());
         }
     }